From 98c291f740cd3b7fb78938205edf168689331e06 Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Tue, 15 Apr 2025 14:23:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=88=9B=E5=BB=BA=E5=B7=A1?= =?UTF-8?q?=E6=A3=80=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RoutineInspectionInfoController.java | 131 ++++++++++++++ .../platform/domain/InspectionPlanInfo.java | 14 ++ .../domain/RoutineInspectionInfo.java | 106 +++++++++++ .../domain/bo/RoutineInspectionInfoBo.java | 109 ++++++++++++ .../domain/dto/RoutineInspectionDto.java | 19 ++ .../domain/vo/RoutineInspectionInfoVo.java | 118 +++++++++++++ .../mapper/RoutineInspectionInfoMapper.java | 15 ++ .../IRoutineInspectionInfoService.java | 73 ++++++++ .../impl/InspectionPlanInfoServiceImpl.java | 3 + .../RoutineInspectionInfoServiceImpl.java | 167 ++++++++++++++++++ 10 files changed, 755 insertions(+) create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/RoutineInspectionInfoController.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/RoutineInspectionInfo.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/RoutineInspectionInfoBo.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/dto/RoutineInspectionDto.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/RoutineInspectionInfoVo.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/RoutineInspectionInfoMapper.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IRoutineInspectionInfoService.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/RoutineInspectionInfoServiceImpl.java diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/RoutineInspectionInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/RoutineInspectionInfoController.java new file mode 100644 index 0000000..7e30f27 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/RoutineInspectionInfoController.java @@ -0,0 +1,131 @@ +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.apache.ibatis.annotations.Param; +import org.dromara.platform.domain.InspectionPlanInfo; +import org.dromara.platform.domain.RoutineInspectionInfo; +import org.dromara.platform.domain.dto.RoutineInspectionDto; +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.RoutineInspectionInfoVo; +import org.dromara.platform.domain.bo.RoutineInspectionInfoBo; +import org.dromara.platform.service.IRoutineInspectionInfoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 日常巡检-计划 + * + * @author gejunhao + * @date 2025-04-15 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/platform/routineInspectionInfo") +public class RoutineInspectionInfoController extends BaseController { + + private final IRoutineInspectionInfoService routineInspectionInfoService; + + /** + * 查询日常巡检-计划列表 + */ + @SaCheckPermission("platform:routineInspectionInfo:list") + @GetMapping("/list") + public TableDataInfo list(RoutineInspectionInfoBo bo, PageQuery pageQuery) { + return routineInspectionInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出日常巡检-计划列表 + */ + @SaCheckPermission("platform:routineInspectionInfo:export") + @Log(title = "日常巡检-计划", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(RoutineInspectionInfoBo bo, HttpServletResponse response) { + List list = routineInspectionInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "日常巡检-计划", RoutineInspectionInfoVo.class, response); + } + + /** + * 获取日常巡检-计划详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("platform:routineInspectionInfo:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable String id) { + return R.ok(routineInspectionInfoService.queryById(id)); + } + + /** + * 新增日常巡检-计划 + */ + @SaCheckPermission("platform:routineInspectionInfo:add") + @Log(title = "日常巡检-计划", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody RoutineInspectionInfoBo bo) { + return toAjax(routineInspectionInfoService.insertByBo(bo)); + } + + /** + * 修改日常巡检-计划 + */ + @SaCheckPermission("platform:routineInspectionInfo:edit") + @Log(title = "日常巡检-计划", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody RoutineInspectionInfoBo bo) { + return toAjax(routineInspectionInfoService.updateByBo(bo)); + } + + /** + * 删除日常巡检-计划 + * + * @param ids 主键串 + */ + @SaCheckPermission("platform:routineInspectionInfo:remove") + @Log(title = "日常巡检-计划", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] ids) { + return toAjax(routineInspectionInfoService.deleteWithValidByIds(List.of(ids), true)); + } + + @SaCheckPermission("platform:routineInspectionInfo:createRoutineInspection") + @PostMapping("/createRoutineInspection") + public R createPlans(@RequestBody RoutineInspectionDto routineInspectionDto) { + List finishStatus = routineInspectionDto.getFinishStatus(); + String projectName = routineInspectionDto.getProjectName(); + String contractName = routineInspectionDto.getContractName(); + String description = routineInspectionDto.getDescription(); + String serviceProject = routineInspectionDto.getServiceProject(); + String ioCompany = routineInspectionDto.getIoCompany(); + String pointName = routineInspectionDto.getPointName(); + routineInspectionInfoService.createRoutineInspection(finishStatus, projectName, + contractName, + description, + serviceProject, + ioCompany, + pointName + ); + return R.ok("创建日常巡检任务成功!"); + } + +} + 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 index a750582..9aae63f 100644 --- 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 @@ -84,11 +84,25 @@ public class InspectionPlanInfo extends TenantEntity { */ private Date planDate; + /** + * 服务内容 + */ + private String serviceProject; + /** * 删除标志（0代表存在 2代表删除） */ @TableLogic private String delFlag; + /** + * 巡检部位 + */ + @TableField(exist = false) + private String inspectionPart; + /** + * 交付内容 + */ + private String deliverContent; } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/RoutineInspectionInfo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/RoutineInspectionInfo.java new file mode 100644 index 0000000..f0b35e4 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/RoutineInspectionInfo.java @@ -0,0 +1,106 @@ +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; + +/** + * 日常巡检-计划对象 routine_inspection_info + * + * @author gejunhao + * @date 2025-04-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("routine_inspection_info") +public class RoutineInspectionInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 记录唯一标识符 + */ + @TableId(value = "id") + private String id; + + /** + * 项目名称 + */ + private String projectName; + + /** + * 所属合同 + */ + private String contractName; + + /** + * 计划描述 + */ + private String description; + + /** + * 服务项目 + */ + private String serviceProject; + + /** + * 代码 + */ + private String code; + + /** + * 运维单位 + */ + private String ioCompany; + + /** + * 计划开始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date scheduleStartDate; + + /** + * 计划结束时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date scheduleEndDate; + + /** + * 实际完成时间 + */ + private Date finishDate; + + /** + * 巡检点位 + */ + private String pointName; + + /** + * 当前状态 + */ + private Long status; + + /** + * 处理人 + */ + private String handler; + + /** + * 审批人 + */ + private String approver; + + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/RoutineInspectionInfoBo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/RoutineInspectionInfoBo.java new file mode 100644 index 0000000..24ed2ef --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/RoutineInspectionInfoBo.java @@ -0,0 +1,109 @@ +package org.dromara.platform.domain.bo; + +import org.dromara.platform.domain.RoutineInspectionInfo; +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; + +/** + * 日常巡检-计划业务对象 routine_inspection_info + * + * @author gejunhao + * @date 2025-04-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = RoutineInspectionInfo.class, reverseConvertGenerate = false) +public class RoutineInspectionInfoBo extends BaseEntity { + + /** + * 记录唯一标识符 + */ + @NotBlank(message = "记录唯一标识符不能为空", groups = { EditGroup.class }) + private String id; + + /** + * 项目名称 + */ + @NotBlank(message = "项目名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String projectName; + + /** + * 所属合同 + */ + @NotBlank(message = "所属合同不能为空", groups = { AddGroup.class, EditGroup.class }) + private String contractName; + + /** + * 计划描述 + */ + @NotBlank(message = "计划描述不能为空", groups = { AddGroup.class, EditGroup.class }) + private String description; + + /** + * 服务项目 + */ + @NotNull(message = "服务项目不能为空", groups = { AddGroup.class, EditGroup.class }) + private String serviceProject; + + /** + * 代码 + */ + @NotBlank(message = "代码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String code; + + /** + * 运维单位 + */ + @NotBlank(message = "运维单位不能为空", groups = { AddGroup.class, EditGroup.class }) + private String ioCompany; + + /** + * 计划开始时间 + */ + @NotNull(message = "计划开始时间不能为空", groups = { AddGroup.class, EditGroup.class }) + @JsonFormat(pattern = "yyyy-MM-dd") + private Date scheduleStartDate; + + /** + * 计划结束时间 + */ + @NotNull(message = "计划结束时间不能为空", groups = { AddGroup.class, EditGroup.class }) + @JsonFormat(pattern = "yyyy-MM-dd") + private Date scheduleEndDate; + + /** + * 实际完成时间 + */ + private Date finishDate; + + /** + * 巡检点位 + */ + private String pointName; + + /** + * 当前状态 + */ + //@NotNull(message = "当前状态不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long status; + + /** + * 处理人 + */ + private String handler; + + /** + * 审批人 + */ + //@NotBlank(message = "审批人不能为空", groups = { AddGroup.class, EditGroup.class }) + private String approver; + + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/dto/RoutineInspectionDto.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/dto/RoutineInspectionDto.java new file mode 100644 index 0000000..dfc3798 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/dto/RoutineInspectionDto.java @@ -0,0 +1,19 @@ +package org.dromara.platform.domain.dto; + +import lombok.Data; +import org.apache.ibatis.annotations.Param; +import org.dromara.platform.domain.InspectionPlanInfo; +import org.dromara.platform.domain.bo.RoutineInspectionInfoBo; + +import java.util.List; + +@Data +public class RoutineInspectionDto { + private String projectName; + private String contractName; + private String description; + private String serviceProject; + private String ioCompany; + private String pointName; + private List finishStatus; +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/RoutineInspectionInfoVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/RoutineInspectionInfoVo.java new file mode 100644 index 0000000..0669848 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/RoutineInspectionInfoVo.java @@ -0,0 +1,118 @@ +package org.dromara.platform.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.platform.domain.RoutineInspectionInfo; +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; + + + +/** + * 日常巡检-计划视图对象 routine_inspection_info + * + * @author gejunhao + * @date 2025-04-15 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = RoutineInspectionInfo.class) +public class RoutineInspectionInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 记录唯一标识符 + */ + @ExcelProperty(value = "记录唯一标识符") + private String id; + + /** + * 项目名称 + */ + @ExcelProperty(value = "项目名称") + private String projectName; + + /** + * 所属合同 + */ + @ExcelProperty(value = "所属合同") + private String contractName; + + /** + * 计划描述 + */ + @ExcelProperty(value = "计划描述") + private String description; + + /** + * 服务项目 + */ + @ExcelProperty(value = "服务项目") + private String serviceProject; + + /** + * 代码 + */ + @ExcelProperty(value = "代码") + private String code; + + /** + * 运维单位 + */ + @ExcelProperty(value = "运维单位") + private String ioCompany; + + /** + * 计划开始时间 + */ + @ExcelProperty(value = "计划开始时间") + private Date scheduleStartDate; + + /** + * 计划结束时间 + */ + @ExcelProperty(value = "计划结束时间") + private Date scheduleEndDate; + + /** + * 实际完成时间 + */ + @ExcelProperty(value = "实际完成时间") + private Date finishDate; + + /** + * 巡检点位 + */ + @ExcelProperty(value = "巡检点位") + private String pointName; + + /** + * 当前状态 + */ + @ExcelProperty(value = "当前状态") + private Long status; + + /** + * 处理人 + */ + @ExcelProperty(value = "处理人") + private String handler; + + /** + * 审批人 + */ + @ExcelProperty(value = "审批人") + private String approver; + + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/RoutineInspectionInfoMapper.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/RoutineInspectionInfoMapper.java new file mode 100644 index 0000000..5b0a726 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/RoutineInspectionInfoMapper.java @@ -0,0 +1,15 @@ +package org.dromara.platform.mapper; + +import org.dromara.platform.domain.RoutineInspectionInfo; +import org.dromara.platform.domain.vo.RoutineInspectionInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 日常巡检-计划Mapper接口 + * + * @author gejunhao + * @date 2025-04-15 + */ +public interface RoutineInspectionInfoMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IRoutineInspectionInfoService.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IRoutineInspectionInfoService.java new file mode 100644 index 0000000..5c736f6 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IRoutineInspectionInfoService.java @@ -0,0 +1,73 @@ +package org.dromara.platform.service; + +import org.dromara.platform.domain.InspectionPlanInfo; +import org.dromara.platform.domain.vo.RoutineInspectionInfoVo; +import org.dromara.platform.domain.bo.RoutineInspectionInfoBo; +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-04-15 + */ +public interface IRoutineInspectionInfoService { + + /** + * 查询日常巡检-计划 + * + * @param id 主键 + * @return 日常巡检-计划 + */ + RoutineInspectionInfoVo queryById(String id); + + /** + * 分页查询日常巡检-计划列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 日常巡检-计划分页列表 + */ + TableDataInfo queryPageList(RoutineInspectionInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的日常巡检-计划列表 + * + * @param bo 查询条件 + * @return 日常巡检-计划列表 + */ + List queryList(RoutineInspectionInfoBo bo); + + /** + * 新增日常巡检-计划 + * + * @param bo 日常巡检-计划 + * @return 是否新增成功 + */ + Boolean insertByBo(RoutineInspectionInfoBo bo); + + /** + * 修改日常巡检-计划 + * + * @param bo 日常巡检-计划 + * @return 是否修改成功 + */ + Boolean updateByBo(RoutineInspectionInfoBo bo); + + /** + * 校验并批量删除日常巡检-计划信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + void createRoutineInspection(List finishStatus,String projectName, + String contractName,String description,String serviceProject, + String ioCompany,String pointName); +} 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 index 2dea545..6df2ec6 100644 --- 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 @@ -200,7 +200,10 @@ public class InspectionPlanInfoServiceImpl implements IInspectionPlanInfoService inspectionPlanInfo.setEndDate(endDate); inspectionPlanInfo.setDescription(agreementInfo.getServiceContent()); inspectionPlanInfo.setFrequency(agreementInfo.getFrequency()); + inspectionPlanInfo.setServiceProject(agreementInfo.getServiceProject()); inspectionPlanInfo.setIoCompany(partyB); + inspectionPlanInfo.setDeliverContent(agreementInfo.getDeliverContent()); + // 0未开始 1进行中 2已完成 inspectionPlanInfo.setStatus(0L); baseMapper.insert(inspectionPlanInfo); diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/RoutineInspectionInfoServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/RoutineInspectionInfoServiceImpl.java new file mode 100644 index 0000000..aa0b779 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/RoutineInspectionInfoServiceImpl.java @@ -0,0 +1,167 @@ +package org.dromara.platform.service.impl; + +import lombok.extern.slf4j.Slf4j; +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.dromara.platform.domain.InspectionPlanInfo; +import org.springframework.stereotype.Service; +import org.dromara.platform.domain.bo.RoutineInspectionInfoBo; +import org.dromara.platform.domain.vo.RoutineInspectionInfoVo; +import org.dromara.platform.domain.RoutineInspectionInfo; +import org.dromara.platform.mapper.RoutineInspectionInfoMapper; +import org.dromara.platform.service.IRoutineInspectionInfoService; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 日常巡检-计划Service业务层处理 + * + * @author gejunhao + * @date 2025-04-15 + */ +@RequiredArgsConstructor +@Service +@Slf4j +public class RoutineInspectionInfoServiceImpl implements IRoutineInspectionInfoService { + + private final RoutineInspectionInfoMapper baseMapper; + + /** + * 查询日常巡检-计划 + * + * @param id 主键 + * @return 日常巡检-计划 + */ + @Override + public RoutineInspectionInfoVo queryById(String id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询日常巡检-计划列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 日常巡检-计划分页列表 + */ + @Override + public TableDataInfo queryPageList(RoutineInspectionInfoBo 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(RoutineInspectionInfoBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(RoutineInspectionInfoBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getProjectName()), RoutineInspectionInfo::getProjectName, bo.getProjectName()); + lqw.like(StringUtils.isNotBlank(bo.getContractName()), RoutineInspectionInfo::getContractName, bo.getContractName()); + lqw.eq(StringUtils.isNotBlank(bo.getDescription()), RoutineInspectionInfo::getDescription, bo.getDescription()); + lqw.eq(bo.getServiceProject() != null, RoutineInspectionInfo::getServiceProject, bo.getServiceProject()); + lqw.eq(StringUtils.isNotBlank(bo.getCode()), RoutineInspectionInfo::getCode, bo.getCode()); + lqw.eq(StringUtils.isNotBlank(bo.getIoCompany()), RoutineInspectionInfo::getIoCompany, bo.getIoCompany()); + lqw.eq(bo.getScheduleStartDate() != null, RoutineInspectionInfo::getScheduleStartDate, bo.getScheduleStartDate()); + lqw.eq(bo.getScheduleEndDate() != null, RoutineInspectionInfo::getScheduleEndDate, bo.getScheduleEndDate()); + lqw.eq(bo.getFinishDate() != null, RoutineInspectionInfo::getFinishDate, bo.getFinishDate()); + lqw.eq(StringUtils.isNotBlank(bo.getPointName()), RoutineInspectionInfo::getPointName, bo.getPointName()); + lqw.eq(bo.getStatus() != null, RoutineInspectionInfo::getStatus, bo.getStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getHandler()), RoutineInspectionInfo::getHandler, bo.getHandler()); + lqw.eq(StringUtils.isNotBlank(bo.getApprover()), RoutineInspectionInfo::getApprover, bo.getApprover()); + return lqw; + } + + /** + * 新增日常巡检-计划 + * + * @param bo 日常巡检-计划 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(RoutineInspectionInfoBo bo) { + RoutineInspectionInfo add = MapstructUtils.convert(bo, RoutineInspectionInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改日常巡检-计划 + * + * @param bo 日常巡检-计划 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(RoutineInspectionInfoBo bo) { + RoutineInspectionInfo update = MapstructUtils.convert(bo, RoutineInspectionInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(RoutineInspectionInfo 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 void createRoutineInspection(List finishStatus,String projectName, + String contractName,String description,String serviceProject,String ioCompany,String pointName) { + List addList = new ArrayList<>(); + + for (RoutineInspectionInfoBo item : finishStatus) { + RoutineInspectionInfo routineInspectionInfo = new RoutineInspectionInfo(); + routineInspectionInfo.setProjectName(projectName); + routineInspectionInfo.setContractName(contractName); + routineInspectionInfo.setDescription(description); + routineInspectionInfo.setServiceProject(serviceProject); + routineInspectionInfo.setIoCompany(ioCompany); + routineInspectionInfo.setPointName(pointName); + routineInspectionInfo.setScheduleStartDate(item.getScheduleStartDate()); + routineInspectionInfo.setScheduleEndDate(item.getScheduleEndDate()); + routineInspectionInfo.setStatus(item.getStatus()); + addList.add(routineInspectionInfo); + } + baseMapper.insert(addList); + log.info("添加日常巡检-任务成功!"); + } +}