From f64027156dd36df46211f2705153a316cfbf8a95 Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Thu, 20 Feb 2025 17:17:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E8=AE=A1=E5=88=92=E8=A1=A8,?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF=E8=A1=A8=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InspectionPlanInfoController.java | 105 +++++++++++++ .../controller/ProjectInfoController.java | 116 ++++++++++++++ .../platform/domain/InspectionPlanInfo.java | 94 +++++++++++ .../dromara/platform/domain/ProjectInfo.java | 102 ++++++++++++ .../domain/bo/InspectionPlanInfoBo.java | 98 ++++++++++++ .../platform/domain/bo/ProjectInfoBo.java | 108 +++++++++++++ .../domain/vo/InspectionPlanInfoVo.java | 106 +++++++++++++ .../platform/domain/vo/ProjectInfoVo.java | 116 ++++++++++++++ .../mapper/InspectionPlanInfoMapper.java | 15 ++ .../platform/mapper/ProjectInfoMapper.java | 19 +++ .../service/IInspectionPlanInfoService.java | 68 ++++++++ .../platform/service/IProjectInfoService.java | 75 +++++++++ .../impl/InspectionPlanInfoServiceImpl.java | 139 +++++++++++++++++ .../service/impl/ProjectInfoServiceImpl.java | 146 ++++++++++++++++++ 14 files changed, 1307 insertions(+) create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/InspectionPlanInfoController.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ProjectInfoController.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/InspectionPlanInfo.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ProjectInfo.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/InspectionPlanInfoBo.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/ProjectInfoBo.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/InspectionPlanInfoVo.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/ProjectInfoVo.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/InspectionPlanInfoMapper.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/ProjectInfoMapper.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IInspectionPlanInfoService.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IProjectInfoService.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/InspectionPlanInfoServiceImpl.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ProjectInfoServiceImpl.java diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/InspectionPlanInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/InspectionPlanInfoController.java new file mode 100644 index 0000000..d6e0854 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/InspectionPlanInfoController.java @@ -0,0 +1,105 @@ +package org.dromara.platform.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.platform.domain.vo.InspectionPlanInfoVo; +import org.dromara.platform.domain.bo.InspectionPlanInfoBo; +import org.dromara.platform.service.IInspectionPlanInfoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 巡检计划 + * + * @author gejunhao + * @date 2025-02-20 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/platform/inspectPlanInfo") +public class InspectionPlanInfoController extends BaseController { + + private final IInspectionPlanInfoService inspectionPlanInfoService; + + /** + * 查询巡检计划列表 + */ + @SaCheckPermission("platform:inspectPlanInfo:list") + @GetMapping("/list") + public TableDataInfo list(InspectionPlanInfoBo bo, PageQuery pageQuery) { + return inspectionPlanInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出巡检计划列表 + */ + @SaCheckPermission("platform:inspectPlanInfo:export") + @Log(title = "巡检计划", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(InspectionPlanInfoBo bo, HttpServletResponse response) { + List list = inspectionPlanInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "巡检计划", InspectionPlanInfoVo.class, response); + } + + /** + * 获取巡检计划详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("platform:inspectPlanInfo:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable String id) { + return R.ok(inspectionPlanInfoService.queryById(id)); + } + + /** + * 新增巡检计划 + */ + @SaCheckPermission("platform:inspectPlanInfo:add") + @Log(title = "巡检计划", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody InspectionPlanInfoBo bo) { + return toAjax(inspectionPlanInfoService.insertByBo(bo)); + } + + /** + * 修改巡检计划 + */ + @SaCheckPermission("platform:inspectPlanInfo:edit") + @Log(title = "巡检计划", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody InspectionPlanInfoBo bo) { + return toAjax(inspectionPlanInfoService.updateByBo(bo)); + } + + /** + * 删除巡检计划 + * + * @param ids 主键串 + */ + @SaCheckPermission("platform:inspectPlanInfo:remove") + @Log(title = "巡检计划", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] ids) { + return toAjax(inspectionPlanInfoService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ProjectInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ProjectInfoController.java new file mode 100644 index 0000000..6e9fef4 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ProjectInfoController.java @@ -0,0 +1,116 @@ +package org.dromara.platform.controller; + +import java.util.List; +import java.util.Map; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.platform.domain.vo.ProjectInfoVo; +import org.dromara.platform.domain.bo.ProjectInfoBo; +import org.dromara.platform.service.IProjectInfoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 项目信息 + * + * @author gejunhao + * @date 2025-02-20 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/platform/projectInfo") +public class ProjectInfoController extends BaseController { + + private final IProjectInfoService projectInfoService; + + /** + * 查询项目信息列表 + */ + @SaCheckPermission("platform:projectInfo:list") + @GetMapping("/list") + public TableDataInfo list(ProjectInfoBo bo, PageQuery pageQuery) { + return projectInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出项目信息列表 + */ + @SaCheckPermission("platform:projectInfo:export") + @Log(title = "项目信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ProjectInfoBo bo, HttpServletResponse response) { + List list = projectInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "项目信息", ProjectInfoVo.class, response); + } + + /** + * 获取项目信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("platform:projectInfo:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable String id) { + return R.ok(projectInfoService.queryById(id)); + } + + /** + * 新增项目信息 + */ + @SaCheckPermission("platform:projectInfo:add") + @Log(title = "项目信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ProjectInfoBo bo) { + return toAjax(projectInfoService.insertByBo(bo)); + } + + /** + * 修改项目信息 + */ + @SaCheckPermission("platform:projectInfo:edit") + @Log(title = "项目信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ProjectInfoBo bo) { + return toAjax(projectInfoService.updateByBo(bo)); + } + + /** + * 删除项目信息 + * + * @param ids 主键串 + */ + @SaCheckPermission("platform:projectInfo:remove") + @Log(title = "项目信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] ids) { + return toAjax(projectInfoService.deleteWithValidByIds(List.of(ids), true)); + } + + + /** + * 查询项目名称列表 + */ + @SaCheckPermission("platform:projectInfo:projectNames") + @GetMapping("/projectNames") + public R> list() { + return R.ok(projectInfoService.queryProjectNames()); + } +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/InspectionPlanInfo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/InspectionPlanInfo.java new file mode 100644 index 0000000..d784f88 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/InspectionPlanInfo.java @@ -0,0 +1,94 @@ +package org.dromara.platform.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 巡检计划对象 inspection_plan_info + * + * @author gejunhao + * @date 2025-02-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("inspection_plan_info") +public class InspectionPlanInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private String id; + + /** + * 合同名称 + */ + private String contractName; + + /** + * 项目名称 + */ + private String projectName; + + /** + * 计划描述 + */ + private String description; + + /** + * 开始日期 + */ + private Date startDate; + + /** + * 结束日期 + */ + private Date endDate; + + /** + * 频次 + */ + private Long frequency; + + /** + * 当前状态 + */ + private Long status; + + /** + * 完成情况 + */ + private Long progress; + + /** + * 运维单位 + */ + private String ioCompany; + + /** + * 报修时间 + */ + private Date fixTime; + + /** + * 计划时间 + */ + private Date planDate; + + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ProjectInfo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ProjectInfo.java new file mode 100644 index 0000000..07e7a59 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ProjectInfo.java @@ -0,0 +1,102 @@ +package org.dromara.platform.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 项目信息对象 project_info + * + * @author gejunhao + * @date 2025-02-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("project_info") +public class ProjectInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private String id; + + /** + * 所属合同 + */ + private String associatedContract; + + /** + * 项目名称 + */ + private String projectName; + + /** + * 项目编号 + */ + private String projectId; + + /** + * 项目类别 + */ + private String projectCategory; + + /** + * 故障大类 + */ + private String faultCategory; + + /** + * 接单超期时间(小时) + */ + private String orderOvertimeHours; + + /** + * 接单超期扣款(元/小时) + */ + private String orderOvertimePenalty; + + /** + * 处理超期时间(小时) + */ + private String processingOvertimeHours; + + /** + * 处理超期扣款(元/小时) + */ + private String processingOvertimePenalty; + + /** + * 项目概要 + */ + private String projectSummary; + + /** + * 项目图标 + */ + private String projectIcon; + + /** + * 附件 + */ + private String attachments; + + /** + * 当前状态 + */ + private Long status; + + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/InspectionPlanInfoBo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/InspectionPlanInfoBo.java new file mode 100644 index 0000000..66bc38d --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/InspectionPlanInfoBo.java @@ -0,0 +1,98 @@ +package org.dromara.platform.domain.bo; + +import org.dromara.platform.domain.InspectionPlanInfo; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 巡检计划业务对象 inspection_plan_info + * + * @author gejunhao + * @date 2025-02-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = InspectionPlanInfo.class, reverseConvertGenerate = false) +public class InspectionPlanInfoBo extends BaseEntity { + + /** + * 主键ID + */ + @NotBlank(message = "主键ID不能为空", groups = { EditGroup.class }) + private String id; + + /** + * 合同名称 + */ + @NotBlank(message = "合同名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String contractName; + + /** + * 项目名称 + */ + @NotBlank(message = "项目名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String projectName; + + /** + * 计划描述 + */ + @NotBlank(message = "计划描述不能为空", groups = { AddGroup.class, EditGroup.class }) + private String description; + + /** + * 开始日期 + */ + @NotNull(message = "开始日期不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date startDate; + + /** + * 结束日期 + */ + @NotNull(message = "结束日期不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date endDate; + + /** + * 频次 + */ + @NotNull(message = "频次不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long frequency; + + /** + * 当前状态 + */ + @NotNull(message = "当前状态不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long status; + + /** + * 完成情况 + */ + @NotNull(message = "完成情况不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long progress; + + /** + * 运维单位 + */ + @NotBlank(message = "运维单位不能为空", groups = { AddGroup.class, EditGroup.class }) + private String ioCompany; + + /** + * 报修时间 + */ + @NotNull(message = "报修时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date fixTime; + + /** + * 计划时间 + */ + @NotNull(message = "计划时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date planDate; + + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/ProjectInfoBo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/ProjectInfoBo.java new file mode 100644 index 0000000..be59548 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/ProjectInfoBo.java @@ -0,0 +1,108 @@ +package org.dromara.platform.domain.bo; + +import org.dromara.platform.domain.ProjectInfo; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 项目信息业务对象 project_info + * + * @author gejunhao + * @date 2025-02-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ProjectInfo.class, reverseConvertGenerate = false) +public class ProjectInfoBo extends BaseEntity { + + /** + * 主键ID + */ + @NotBlank(message = "主键ID不能为空", groups = { EditGroup.class }) + private String id; + + /** + * 所属合同 + */ + @NotBlank(message = "所属合同不能为空", groups = { AddGroup.class, EditGroup.class }) + private String associatedContract; + + /** + * 项目名称 + */ + @NotBlank(message = "项目名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String projectName; + + /** + * 项目编号 + */ + @NotBlank(message = "项目编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String projectId; + + /** + * 项目类别 + */ + @NotBlank(message = "项目类别不能为空", groups = { AddGroup.class, EditGroup.class }) + private String projectCategory; + + /** + * 故障大类 + */ + @NotBlank(message = "故障大类不能为空", groups = { AddGroup.class, EditGroup.class }) + private String faultCategory; + + /** + * 接单超期时间(小时) + */ + @NotBlank(message = "接单超期时间(小时)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String orderOvertimeHours; + + /** + * 接单超期扣款(元/小时) + */ + @NotBlank(message = "接单超期扣款(元/小时)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String orderOvertimePenalty; + + /** + * 处理超期时间(小时) + */ + @NotBlank(message = "处理超期时间(小时)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String processingOvertimeHours; + + /** + * 处理超期扣款(元/小时) + */ + @NotBlank(message = "处理超期扣款(元/小时)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String processingOvertimePenalty; + + /** + * 项目概要 + */ + @NotBlank(message = "项目概要不能为空", groups = { AddGroup.class, EditGroup.class }) + private String projectSummary; + + /** + * 项目图标 + */ + @NotBlank(message = "项目图标不能为空", groups = { AddGroup.class, EditGroup.class }) + private String projectIcon; + + /** + * 附件 + */ + @NotBlank(message = "附件不能为空", groups = { AddGroup.class, EditGroup.class }) + private String attachments; + + /** + * 当前状态 + */ + @NotNull(message = "当前状态不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long status; + + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/InspectionPlanInfoVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/InspectionPlanInfoVo.java new file mode 100644 index 0000000..04ff353 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/InspectionPlanInfoVo.java @@ -0,0 +1,106 @@ +package org.dromara.platform.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.platform.domain.InspectionPlanInfo; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 巡检计划视图对象 inspection_plan_info + * + * @author gejunhao + * @date 2025-02-20 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = InspectionPlanInfo.class) +public class InspectionPlanInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private String id; + + /** + * 合同名称 + */ + @ExcelProperty(value = "合同名称") + private String contractName; + + /** + * 项目名称 + */ + @ExcelProperty(value = "项目名称") + private String projectName; + + /** + * 计划描述 + */ + @ExcelProperty(value = "计划描述") + private String description; + + /** + * 开始日期 + */ + @ExcelProperty(value = "开始日期") + private Date startDate; + + /** + * 结束日期 + */ + @ExcelProperty(value = "结束日期") + private Date endDate; + + /** + * 频次 + */ + @ExcelProperty(value = "频次") + private Long frequency; + + /** + * 当前状态 + */ + @ExcelProperty(value = "当前状态") + private Long status; + + /** + * 完成情况 + */ + @ExcelProperty(value = "完成情况") + private Long progress; + + /** + * 运维单位 + */ + @ExcelProperty(value = "运维单位") + private String ioCompany; + + /** + * 报修时间 + */ + @ExcelProperty(value = "报修时间") + private Date fixTime; + + /** + * 计划时间 + */ + @ExcelProperty(value = "计划时间") + private Date planDate; + + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/ProjectInfoVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/ProjectInfoVo.java new file mode 100644 index 0000000..c8199b2 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/ProjectInfoVo.java @@ -0,0 +1,116 @@ +package org.dromara.platform.domain.vo; + +import org.dromara.platform.domain.ProjectInfo; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 项目信息视图对象 project_info + * + * @author gejunhao + * @date 2025-02-20 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ProjectInfo.class) +public class ProjectInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private String id; + + /** + * 所属合同 + */ + @ExcelProperty(value = "所属合同") + private String associatedContract; + + /** + * 项目名称 + */ + @ExcelProperty(value = "项目名称") + private String projectName; + + /** + * 项目编号 + */ + @ExcelProperty(value = "项目编号") + private String projectId; + + /** + * 项目类别 + */ + @ExcelProperty(value = "项目类别") + private String projectCategory; + + /** + * 故障大类 + */ + @ExcelProperty(value = "故障大类") + private String faultCategory; + + /** + * 接单超期时间(小时) + */ + @ExcelProperty(value = "接单超期时间(小时)") + private String orderOvertimeHours; + + /** + * 接单超期扣款(元/小时) + */ + @ExcelProperty(value = "接单超期扣款(元/小时)") + private String orderOvertimePenalty; + + /** + * 处理超期时间(小时) + */ + @ExcelProperty(value = "处理超期时间(小时)") + private String processingOvertimeHours; + + /** + * 处理超期扣款(元/小时) + */ + @ExcelProperty(value = "处理超期扣款(元/小时)") + private String processingOvertimePenalty; + + /** + * 项目概要 + */ + @ExcelProperty(value = "项目概要") + private String projectSummary; + + /** + * 项目图标 + */ + @ExcelProperty(value = "项目图标") + private String projectIcon; + + /** + * 附件 + */ + @ExcelProperty(value = "附件") + private String attachments; + + /** + * 当前状态 + */ + @ExcelProperty(value = "当前状态") + private Long status; + + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/InspectionPlanInfoMapper.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/InspectionPlanInfoMapper.java new file mode 100644 index 0000000..d27d5f8 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/InspectionPlanInfoMapper.java @@ -0,0 +1,15 @@ +package org.dromara.platform.mapper; + +import org.dromara.platform.domain.InspectionPlanInfo; +import org.dromara.platform.domain.vo.InspectionPlanInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 巡检计划Mapper接口 + * + * @author gejunhao + * @date 2025-02-20 + */ +public interface InspectionPlanInfoMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/ProjectInfoMapper.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/ProjectInfoMapper.java new file mode 100644 index 0000000..c73e1cb --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/ProjectInfoMapper.java @@ -0,0 +1,19 @@ +package org.dromara.platform.mapper; + +import org.apache.ibatis.annotations.Select; +import org.dromara.platform.domain.ProjectInfo; +import org.dromara.platform.domain.vo.ProjectInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +import java.util.List; + +/** + * 项目信息Mapper接口 + * + * @author gejunhao + * @date 2025-02-20 + */ +public interface ProjectInfoMapper extends BaseMapperPlus { + @Select("SELECT project_name FROM project_info") + List queryProjectNames(); +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IInspectionPlanInfoService.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IInspectionPlanInfoService.java new file mode 100644 index 0000000..ee082b5 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IInspectionPlanInfoService.java @@ -0,0 +1,68 @@ +package org.dromara.platform.service; + +import org.dromara.platform.domain.vo.InspectionPlanInfoVo; +import org.dromara.platform.domain.bo.InspectionPlanInfoBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 巡检计划Service接口 + * + * @author gejunhao + * @date 2025-02-20 + */ +public interface IInspectionPlanInfoService { + + /** + * 查询巡检计划 + * + * @param id 主键 + * @return 巡检计划 + */ + InspectionPlanInfoVo queryById(String id); + + /** + * 分页查询巡检计划列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 巡检计划分页列表 + */ + TableDataInfo queryPageList(InspectionPlanInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的巡检计划列表 + * + * @param bo 查询条件 + * @return 巡检计划列表 + */ + List queryList(InspectionPlanInfoBo bo); + + /** + * 新增巡检计划 + * + * @param bo 巡检计划 + * @return 是否新增成功 + */ + Boolean insertByBo(InspectionPlanInfoBo bo); + + /** + * 修改巡检计划 + * + * @param bo 巡检计划 + * @return 是否修改成功 + */ + Boolean updateByBo(InspectionPlanInfoBo bo); + + /** + * 校验并批量删除巡检计划信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IProjectInfoService.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IProjectInfoService.java new file mode 100644 index 0000000..2ec4231 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IProjectInfoService.java @@ -0,0 +1,75 @@ +package org.dromara.platform.service; + +import org.dromara.platform.domain.vo.ProjectInfoVo; +import org.dromara.platform.domain.bo.ProjectInfoBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 项目信息Service接口 + * + * @author gejunhao + * @date 2025-02-20 + */ +public interface IProjectInfoService { + + /** + * 查询项目信息 + * + * @param id 主键 + * @return 项目信息 + */ + ProjectInfoVo queryById(String id); + + /** + * 分页查询项目信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 项目信息分页列表 + */ + TableDataInfo queryPageList(ProjectInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的项目信息列表 + * + * @param bo 查询条件 + * @return 项目信息列表 + */ + List queryList(ProjectInfoBo bo); + + /** + * 新增项目信息 + * + * @param bo 项目信息 + * @return 是否新增成功 + */ + Boolean insertByBo(ProjectInfoBo bo); + + /** + * 修改项目信息 + * + * @param bo 项目信息 + * @return 是否修改成功 + */ + Boolean updateByBo(ProjectInfoBo bo); + + /** + * 校验并批量删除项目信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 获取项目名称列表 (用于下拉框查询) + * @return + */ + List queryProjectNames(); +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/InspectionPlanInfoServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/InspectionPlanInfoServiceImpl.java new file mode 100644 index 0000000..e51cb3b --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/InspectionPlanInfoServiceImpl.java @@ -0,0 +1,139 @@ +package org.dromara.platform.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.platform.domain.bo.InspectionPlanInfoBo; +import org.dromara.platform.domain.vo.InspectionPlanInfoVo; +import org.dromara.platform.domain.InspectionPlanInfo; +import org.dromara.platform.mapper.InspectionPlanInfoMapper; +import org.dromara.platform.service.IInspectionPlanInfoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 巡检计划Service业务层处理 + * + * @author gejunhao + * @date 2025-02-20 + */ +@RequiredArgsConstructor +@Service +public class InspectionPlanInfoServiceImpl implements IInspectionPlanInfoService { + + private final InspectionPlanInfoMapper baseMapper; + + /** + * 查询巡检计划 + * + * @param id 主键 + * @return 巡检计划 + */ + @Override + public InspectionPlanInfoVo queryById(String id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询巡检计划列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 巡检计划分页列表 + */ + @Override + public TableDataInfo queryPageList(InspectionPlanInfoBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的巡检计划列表 + * + * @param bo 查询条件 + * @return 巡检计划列表 + */ + @Override + public List queryList(InspectionPlanInfoBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(InspectionPlanInfoBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getContractName()), InspectionPlanInfo::getContractName, bo.getContractName()); + lqw.like(StringUtils.isNotBlank(bo.getProjectName()), InspectionPlanInfo::getProjectName, bo.getProjectName()); + lqw.eq(StringUtils.isNotBlank(bo.getDescription()), InspectionPlanInfo::getDescription, bo.getDescription()); + lqw.eq(bo.getStartDate() != null, InspectionPlanInfo::getStartDate, bo.getStartDate()); + lqw.eq(bo.getEndDate() != null, InspectionPlanInfo::getEndDate, bo.getEndDate()); + lqw.eq(bo.getFrequency() != null, InspectionPlanInfo::getFrequency, bo.getFrequency()); + lqw.eq(bo.getStatus() != null, InspectionPlanInfo::getStatus, bo.getStatus()); + lqw.eq(bo.getProgress() != null, InspectionPlanInfo::getProgress, bo.getProgress()); + lqw.eq(StringUtils.isNotBlank(bo.getIoCompany()), InspectionPlanInfo::getIoCompany, bo.getIoCompany()); + lqw.eq(bo.getFixTime() != null, InspectionPlanInfo::getFixTime, bo.getFixTime()); + lqw.eq(bo.getPlanDate() != null, InspectionPlanInfo::getPlanDate, bo.getPlanDate()); + return lqw; + } + + /** + * 新增巡检计划 + * + * @param bo 巡检计划 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(InspectionPlanInfoBo bo) { + InspectionPlanInfo add = MapstructUtils.convert(bo, InspectionPlanInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改巡检计划 + * + * @param bo 巡检计划 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(InspectionPlanInfoBo bo) { + InspectionPlanInfo update = MapstructUtils.convert(bo, InspectionPlanInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(InspectionPlanInfo entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除巡检计划信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ProjectInfoServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ProjectInfoServiceImpl.java new file mode 100644 index 0000000..a7fbb68 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ProjectInfoServiceImpl.java @@ -0,0 +1,146 @@ +package org.dromara.platform.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.platform.domain.bo.ProjectInfoBo; +import org.dromara.platform.domain.vo.ProjectInfoVo; +import org.dromara.platform.domain.ProjectInfo; +import org.dromara.platform.mapper.ProjectInfoMapper; +import org.dromara.platform.service.IProjectInfoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 项目信息Service业务层处理 + * + * @author gejunhao + * @date 2025-02-20 + */ +@RequiredArgsConstructor +@Service +public class ProjectInfoServiceImpl implements IProjectInfoService { + + private final ProjectInfoMapper baseMapper; + + /** + * 查询项目信息 + * + * @param id 主键 + * @return 项目信息 + */ + @Override + public ProjectInfoVo queryById(String id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询项目信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 项目信息分页列表 + */ + @Override + public TableDataInfo queryPageList(ProjectInfoBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的项目信息列表 + * + * @param bo 查询条件 + * @return 项目信息列表 + */ + @Override + public List queryList(ProjectInfoBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(ProjectInfoBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getAssociatedContract()), ProjectInfo::getAssociatedContract, bo.getAssociatedContract()); + lqw.like(StringUtils.isNotBlank(bo.getProjectName()), ProjectInfo::getProjectName, bo.getProjectName()); + lqw.eq(StringUtils.isNotBlank(bo.getProjectId()), ProjectInfo::getProjectId, bo.getProjectId()); + lqw.eq(StringUtils.isNotBlank(bo.getProjectCategory()), ProjectInfo::getProjectCategory, bo.getProjectCategory()); + lqw.eq(StringUtils.isNotBlank(bo.getFaultCategory()), ProjectInfo::getFaultCategory, bo.getFaultCategory()); + lqw.eq(StringUtils.isNotBlank(bo.getOrderOvertimeHours()), ProjectInfo::getOrderOvertimeHours, bo.getOrderOvertimeHours()); + lqw.eq(StringUtils.isNotBlank(bo.getOrderOvertimePenalty()), ProjectInfo::getOrderOvertimePenalty, bo.getOrderOvertimePenalty()); + lqw.eq(StringUtils.isNotBlank(bo.getProcessingOvertimeHours()), ProjectInfo::getProcessingOvertimeHours, bo.getProcessingOvertimeHours()); + lqw.eq(StringUtils.isNotBlank(bo.getProcessingOvertimePenalty()), ProjectInfo::getProcessingOvertimePenalty, bo.getProcessingOvertimePenalty()); + lqw.eq(StringUtils.isNotBlank(bo.getProjectSummary()), ProjectInfo::getProjectSummary, bo.getProjectSummary()); + lqw.eq(StringUtils.isNotBlank(bo.getProjectIcon()), ProjectInfo::getProjectIcon, bo.getProjectIcon()); + lqw.eq(StringUtils.isNotBlank(bo.getAttachments()), ProjectInfo::getAttachments, bo.getAttachments()); + lqw.eq(bo.getStatus() != null, ProjectInfo::getStatus, bo.getStatus()); + return lqw; + } + + /** + * 新增项目信息 + * + * @param bo 项目信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(ProjectInfoBo bo) { + ProjectInfo add = MapstructUtils.convert(bo, ProjectInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改项目信息 + * + * @param bo 项目信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(ProjectInfoBo bo) { + ProjectInfo update = MapstructUtils.convert(bo, ProjectInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ProjectInfo entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除项目信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public List queryProjectNames() { + return baseMapper.queryProjectNames(); + } +}