1.提交设备巡检计划相关代码

src/main/java/com/glxp/api/common/util/ResultVOUtils.java

@@ -72,6 +72,17 @@ public class ResultVOUtils {
         return error(ResultEnum.PARAM_VERIFY_FALL);
     }
 
+    /**
+     * 返回带参数校验失败错误信息的异常
+     *
+     * @param message
+     * @return
+     */
+    public static BaseResponse paramVerifyFail(String message) {
+        return error(ResultEnum.PARAM_VERIFY_FALL, message);
+    }
+
+
     /**
      * 错误时返回
      *

src/main/java/com/glxp/api/dao/inv/DeviceInspectPlanDao.java

@@ -2,6 +2,18 @@ package com.glxp.api.dao.inv;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.inv.DeviceInspectPlanEntity;
+import org.apache.ibatis.annotations.Param;
 
+/**
+ * 科室设备巡检计划Dao
+ */
 public interface DeviceInspectPlanDao extends BaseMapper<DeviceInspectPlanEntity> {
+
+    /**
+     * 根据单号查询巡检计划
+     *
+     * @param orderId
+     * @return
+     */
+    DeviceInspectPlanEntity selectByOrderId(@Param("orderId") String orderId);
 }

src/main/java/com/glxp/api/dao/inv/DeviceInspectSetDao.java

@@ -2,6 +2,16 @@ package com.glxp.api.dao.inv;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.inv.DeviceInspectSetEntity;
+import com.glxp.api.res.inv.DeviceInspectSetResponse;
+import org.apache.ibatis.annotations.Param;
 
 public interface DeviceInspectSetDao extends BaseMapper<DeviceInspectSetEntity> {
+
+    /**
+     * 查询设备巡检设置
+     *
+     * @param code 资产编码
+     * @return
+     */
+    DeviceInspectSetResponse selectInspectSet(@Param("code") String code);
 }

src/main/java/com/glxp/api/entity/inv/DeviceInspectOrderEntity.java

@@ -18,6 +18,12 @@ public class DeviceInspectOrderEntity {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    /**
+     * 维保单号
+     */
+    @TableField(value = "orderId")
+    private String orderId;
+
     /**
      * 部门编码
      */
@@ -49,7 +55,7 @@ public class DeviceInspectOrderEntity {
     private Integer type;
 
     /**
-     * 状态（1：新增；2：未审核；3：已审核）
+     * 状态（0：新增；1：未审核；2：已审核）
      */
     @TableField(value = "`status`")
     private Integer status;

src/main/java/com/glxp/api/entity/inv/DeviceInspectPlanEntity.java

@@ -18,6 +18,12 @@ public class DeviceInspectPlanEntity {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    /**
+     * 巡检计划单号
+     */
+    @TableField(value = "orderId")
+    private String orderId;
+
     /**
      * 部门编码
      */
@@ -43,7 +49,7 @@ public class DeviceInspectPlanEntity {
     private Integer level;
 
     /**
-     * 状态（1：新增；2：未审核；3：已审核）
+     * 状态（0：新增；1：未审核；2：已审核）
      */
     @TableField(value = "`status`")
     private Integer status;

src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderEntity.java

@@ -18,6 +18,12 @@ public class DeviceRepairOrderEntity {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    /**
+     * 报修单号
+     */
+    @TableField(value = "orderId")
+    private String orderId;
+
     /**
      * 部门编码
      */
@@ -37,7 +43,7 @@ public class DeviceRepairOrderEntity {
     private String code;
 
     /**
-     * 状态（1：新增；2：未审核；3：已审核）
+     * 状态（0：新增；1：未审核；2：已审核）
      */
     @TableField(value = "`status`")
     private Integer status;

src/main/java/com/glxp/api/req/inv/AddDeviceInspectOrderRequest.java

@@ -0,0 +1,46 @@
+package com.glxp.api.req.inv;
+
+import lombok.Data;
+
+/**
+ * 添加设备维保单参数
+ */
+@Data
+public class AddDeviceInspectOrderRequest {
+
+    /**
+     * 部门编码
+     */
+    private String deptCode;
+
+    /**
+     * 仓库编码
+     */
+    private String invCode;
+
+    /**
+     * 资产编码
+     */
+    private String code;
+
+    /**
+     * 上级单号，计划或报修单号
+     */
+    private String lastOrderId;
+
+    /**
+     * 维保类型（1：报修；2：计划）
+     */
+    private Integer type;
+
+    /**
+     * 状态（1：新增；2：未审核；3：已审核）
+     */
+    private Integer status;
+
+    /**
+     * 设备状态（0：异常；2：正常）
+     */
+    private String deviceStatus;
+
+}

src/main/java/com/glxp/api/req/inv/AddDeviceInspectPlanRequest.java

@@ -0,0 +1,41 @@
+package com.glxp.api.req.inv;
+
+import lombok.Data;
+
+/**
+ * 添加部门设备巡检计划参数
+ */
+@Data
+public class AddDeviceInspectPlanRequest {
+
+    /**
+     * 部门编码
+     */
+    private String deptCode;
+
+    /**
+     * 仓库编码
+     */
+    private String invCode;
+
+    /**
+     * 资产编码
+     */
+    private String code;
+
+    /**
+     * 计划级别（1：低级；2：中级；3：高级）
+     */
+    private Integer level;
+
+    /**
+     * 状态（1：新增；2：未审核；3：已审核）
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

src/main/java/com/glxp/api/req/inv/AddDeviceInspectSetRequest.java

@@ -0,0 +1,48 @@
+package com.glxp.api.req.inv;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 添加科室设备巡检设置参数
+ */
+@Data
+public class AddDeviceInspectSetRequest {
+
+    /**
+     * 资产编码
+     */
+    private String code;
+
+    /**
+     * 时间频率
+     */
+    private String frequency;
+
+    /**
+     * 时间频率单位（1：年；2：月：3：日；4：小时；5：分钟： 6：秒）
+     */
+    private Integer frequencyUnit;
+
+    /**
+     * 状态（1：启用；2：禁用）
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

src/main/java/com/glxp/api/req/inv/AddDeviceRepairOrderRequest.java

@@ -0,0 +1,41 @@
+package com.glxp.api.req.inv;
+
+import lombok.Data;
+
+/**
+ * 添加设备报修单参数
+ */
+@Data
+public class AddDeviceRepairOrderRequest {
+
+    /**
+     * 部门编码
+     */
+    private String deptCode;
+
+    /**
+     * 仓库编码
+     */
+    private String invCode;
+
+    /**
+     * 资产编码
+     */
+    private String code;
+
+    /**
+     * 状态（1：新增；2：未审核；3：已审核）
+     */
+    private Integer status;
+
+    /**
+     * 报修说明
+     */
+    private String msg;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

src/main/java/com/glxp/api/req/inv/FilterDeviceInspectOrderRequest.java

@@ -0,0 +1,54 @@
+package com.glxp.api.req.inv;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+/**
+ * 查询部门设备维保单接口参数
+ */
+@Data
+public class FilterDeviceInspectOrderRequest extends ListPageRequest {
+
+    private Integer id;
+
+    /**
+     * 单号
+     */
+    private String orderId;
+
+    /**
+     * 部门编码
+     */
+    private String deptCode;
+
+    /**
+     * 仓库编码
+     */
+    private String invCode;
+
+    /**
+     * 资产编码
+     */
+    private String code;
+
+    /**
+     * 上级单号，计划或报修单号
+     */
+    private String lastOrderId;
+
+    /**
+     * 维保类型（1：报修；2：计划）
+     */
+    private Integer type;
+
+    /**
+     * 状态（1：新增；2：未审核；3：已审核）
+     */
+    private Integer status;
+
+    /**
+     * 设备状态（0：异常；2：正常）
+     */
+    private String deviceStatus;
+
+}

src/main/java/com/glxp/api/req/inv/FilterDeviceInspectPlanRequest.java

@@ -0,0 +1,44 @@
+package com.glxp.api.req.inv;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+/**
+ * 查询设备设备巡检计划接口参数
+ */
+@Data
+public class FilterDeviceInspectPlanRequest extends ListPageRequest {
+
+    private Integer id;
+
+    /**
+     * 单号
+     */
+    private String orderId;
+
+    /**
+     * 部门编码
+     */
+    private String deptCode;
+
+    /**
+     * 仓库编码
+     */
+    private String invCode;
+
+    /**
+     * 资产编码
+     */
+    private String code;
+
+    /**
+     * 计划级别（1：低级；2：中级；3：高级）
+     */
+    private Integer level;
+
+    /**
+     * 状态（1：新增；2：未审核；3：已审核）
+     */
+    private Integer status;
+
+}

src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderRequest.java

@@ -0,0 +1,39 @@
+package com.glxp.api.req.inv;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+/**
+ * 查询部门设备报修单接口参数
+ */
+@Data
+public class FilterDeviceRepairOrderRequest extends ListPageRequest {
+
+    private Integer id;
+
+    /**
+     * 单号
+     */
+    private String orderId;
+
+    /**
+     * 部门编码
+     */
+    private String deptCode;
+
+    /**
+     * 仓库编码
+     */
+    private String invCode;
+
+    /**
+     * 资产编码
+     */
+    private String code;
+
+    /**
+     * 状态（1：新增；2：未审核；3：已审核）
+     */
+    private Integer status;
+
+}

src/main/java/com/glxp/api/res/inv/DeviceInspectOrderResponse.java

@@ -0,0 +1,120 @@
+package com.glxp.api.res.inv;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 设备维保单VO
+ */
+@Data
+public class DeviceInspectOrderResponse {
+
+    private Integer id;
+
+    /**
+     * 单号
+     */
+    private String orderId;
+
+    /**
+     * 部门编码
+     */
+    private String deptCode;
+
+    /**
+     * 仓库编码
+     */
+    private String invCode;
+
+    /**
+     * 资产编码
+     */
+    private String code;
+
+    /**
+     * 上级单号，计划或报修单号
+     */
+    private String lastOrderId;
+
+    /**
+     * 维保类型（1：报修；2：计划）
+     */
+    private Integer type;
+
+    /**
+     * 状态（0：新增；1：未审核；2：已审核）
+     */
+    private Integer status;
+
+    /**
+     * 设备状态（0：异常；2：正常）
+     */
+    private String deviceStatus;
+
+    /**
+     * 创建人
+     */
+    private String createUser;
+
+    /**
+     * 审核人
+     */
+    private String auditUser;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 审核时间
+     */
+    private Date auditTime;
+
+    /**
+     * 审核时间
+     */
+    private Date updateTime;
+
+    /**
+     * 养护说明
+     */
+    private String remark;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 仓库名称
+     */
+    private String invName;
+
+    /**
+     * 创建人名称
+     */
+    private String createUserName;
+
+    /**
+     * 审核人名称
+     */
+    private String auditUserName;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 规格型号
+     */
+    private String ggxh;
+
+    /**
+     * 批次号
+     */
+    private String batchNo;
+
+}

src/main/java/com/glxp/api/res/inv/DeviceInspectPlanResponse.java

@@ -0,0 +1,97 @@
+package com.glxp.api.res.inv;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 设备巡检计划VO
+ */
+@Data
+public class DeviceInspectPlanResponse {
+
+    private Integer id;
+
+    /**
+     * 单号
+     */
+    private String orderId;
+
+    /**
+     * 部门编码
+     */
+    private String deptCode;
+
+    /**
+     * 仓库编码
+     */
+    private String invCode;
+
+    /**
+     * 资产编码
+     */
+    private String code;
+
+    /**
+     * 计划级别（1：低级；2：中级；3：高级）
+     */
+    private Integer level;
+
+    /**
+     * 状态（0：新增；1：未审核；2：已审核）
+     */
+    private Integer status;
+
+    /**
+     * 创建人
+     */
+    private String createUser;
+
+    /**
+     * 审核人
+     */
+    private String auditUser;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 审核时间
+     */
+    @TableField(value = "auditTime")
+    private Date auditTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 仓库名称
+     */
+    private String invName;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 规格型号
+     */
+    private String ggxh;
+
+    /**
+     * 批次号
+     */
+    private String batchNo;
+
+}

src/main/java/com/glxp/api/res/inv/DeviceInspectSetResponse.java

@@ -0,0 +1,51 @@
+package com.glxp.api.res.inv;
+
+import lombok.Data;
+
+/**
+ * 科室设备巡检设置参数
+ */
+@Data
+public class DeviceInspectSetResponse {
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 资产编码
+     */
+    private String code;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 仓库名称
+     */
+    private String invName;
+
+    /**
+     * 时间频率
+     */
+    private String frequency;
+
+    /**
+     * 时间频率单位（1：年；2：月：3：日；4：小时；5：分钟： 6：秒）
+     */
+    private Integer frequencyUnit;
+
+    /**
+     * 状态（1：启用；2：禁用）
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

src/main/java/com/glxp/api/res/inv/DeviceRepairOrderResponse.java

@@ -0,0 +1,105 @@
+package com.glxp.api.res.inv;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 设备报修单VO
+ */
+@Data
+public class DeviceRepairOrderResponse {
+
+    private Integer id;
+
+    /**
+     * 单号
+     */
+    private String orderId;
+
+    /**
+     * 部门编码
+     */
+    private String deptCode;
+
+    /**
+     * 仓库编码
+     */
+    private String invCode;
+
+    /**
+     * 资产编码
+     */
+    private String code;
+
+    /**
+     * 状态（0：新增；1：未审核；2：已审核）
+     */
+    private Integer status;
+
+    /**
+     * 创建人
+     */
+    private String createUser;
+
+    /**
+     * 审核人
+     */
+    private String auditUser;
+
+    /**
+     * 报修说明
+     */
+    private String msg;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 审核时间
+     */
+    private Date auditTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 仓库名称
+     */
+    private String invName;
+
+    /**
+     * 创建人名称
+     */
+    private String createUserName;
+
+    /**
+     * 审核人名称
+     */
+    private String auditUserName;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 规格型号
+     */
+    private String ggxh;
+
+    /**
+     * 批次号
+     */
+    private String batchNo;
+
+}

src/main/java/com/glxp/api/service/inv/DeviceInspectPlanService.java

@@ -0,0 +1,65 @@
+package com.glxp.api.service.inv;
+
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.entity.inv.DeviceInspectPlanEntity;
+import com.glxp.api.req.inv.AddDeviceInspectOrderRequest;
+import com.glxp.api.req.inv.FilterDeviceInspectPlanRequest;
+import com.glxp.api.res.inv.DeviceInspectPlanResponse;
+
+import java.util.List;
+
+/**
+ * 设备巡检计划Service
+ */
+public interface DeviceInspectPlanService {
+
+    /**
+     * 查询巡检计划列表
+     *
+     * @param filterDeviceInspectPlanRequest
+     * @return
+     */
+    List<DeviceInspectPlanResponse> filterList(FilterDeviceInspectPlanRequest filterDeviceInspectPlanRequest);
+
+    /**
+     * 添加巡检计划
+     *
+     * @param addDeviceInspectOrderRequest
+     * @return
+     */
+    BaseResponse addDeviceInspectPlan(AddDeviceInspectOrderRequest addDeviceInspectOrderRequest);
+
+    /**
+     * 更新巡检计划
+     *
+     * @param deviceInspectPlanEntity
+     * @return
+     */
+    BaseResponse updateDeviceInspectPlan(DeviceInspectPlanEntity deviceInspectPlanEntity);
+
+    /**
+     * 提交审核
+     *
+     * @param orderId
+     * @return
+     */
+    BaseResponse submitAudit(String orderId);
+
+    /**
+     * 更新状态
+     *
+     * @param orderId
+     * @param status
+     * @return
+     */
+    BaseResponse updateStatus(String orderId, Integer status);
+
+    /**
+     * 删除巡检计划
+     *
+     * @param id
+     * @return
+     */
+    BaseResponse deletePlan(String id);
+
+}

src/main/java/com/glxp/api/service/inv/DeviceInspectSetService.java

@@ -0,0 +1,35 @@
+package com.glxp.api.service.inv;
+
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.entity.inv.DeviceInspectSetEntity;
+import com.glxp.api.req.inv.AddDeviceInspectSetRequest;
+import com.glxp.api.res.inv.DeviceInspectSetResponse;
+
+/**
+ * 设备巡检设置Service
+ */
+public interface DeviceInspectSetService {
+
+    /**
+     * 查询设备巡检设置信息
+     *
+     * @param code 资产编号
+     * @return
+     */
+    DeviceInspectSetResponse findInspectSet(String code);
+
+    /**
+     * 更新设备巡检设置信息
+     * @param deviceInspectSetEntity
+     * @return
+     */
+    BaseResponse updateInspectSet(DeviceInspectSetEntity deviceInspectSetEntity);
+
+    /**
+     * 添加设备巡检设置
+     * @param addDeviceInspectSetRequest
+     * @return
+     */
+    BaseResponse addDeviceInspect(AddDeviceInspectSetRequest addDeviceInspectSetRequest);
+
+}

src/main/java/com/glxp/api/service/inv/impl/DeviceInspectPlanServiceImpl.java

@@ -0,0 +1,91 @@
+package com.glxp.api.service.inv.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.dao.inv.DeviceInspectPlanDao;
+import com.glxp.api.entity.inv.DeviceInspectPlanEntity;
+import com.glxp.api.req.inv.AddDeviceInspectOrderRequest;
+import com.glxp.api.req.inv.FilterDeviceInspectPlanRequest;
+import com.glxp.api.res.inv.DeviceInspectPlanResponse;
+import com.glxp.api.service.auth.CustomerService;
+import com.glxp.api.service.inv.DeviceInspectPlanService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@Slf4j
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class DeviceInspectPlanServiceImpl implements DeviceInspectPlanService {
+
+    @Resource
+    private DeviceInspectPlanDao deviceInspectPlanDao;
+    @Resource
+    private CustomerService customerService;
+
+    @Override
+    public List<DeviceInspectPlanResponse> filterList(FilterDeviceInspectPlanRequest filterDeviceInspectPlanRequest) {
+        return null;
+    }
+
+    @Override
+    public BaseResponse addDeviceInspectPlan(AddDeviceInspectOrderRequest addDeviceInspectOrderRequest) {
+
+        return null;
+    }
+
+    @Override
+    public BaseResponse updateDeviceInspectPlan(DeviceInspectPlanEntity deviceInspectPlanEntity) {
+        DeviceInspectPlanEntity deviceInspectPlan = deviceInspectPlanDao.selectById(deviceInspectPlanEntity.getId());
+        BeanUtil.copyProperties(deviceInspectPlanEntity, deviceInspectPlan, "createTime", "createUser");
+        deviceInspectPlan.setUpdateTime(new Date());
+        deviceInspectPlanDao.updateById(deviceInspectPlan);
+        return ResultVOUtils.success();
+    }
+
+    @Override
+    public BaseResponse submitAudit(String orderId) {
+        if (StrUtil.isBlank(orderId)) {
+            return ResultVOUtils.paramVerifyFail();
+        }
+        DeviceInspectPlanEntity deviceInspectPlanEntity = deviceInspectPlanDao.selectByOrderId(orderId);
+        deviceInspectPlanEntity.setStatus(1);
+        deviceInspectPlanEntity.setUpdateTime(new Date());
+        deviceInspectPlanDao.updateById(deviceInspectPlanEntity);
+        return ResultVOUtils.success();
+    }
+
+    @Override
+    public BaseResponse updateStatus(String orderId, Integer status) {
+        if (StrUtil.isBlank(orderId) || null == status) {
+            return ResultVOUtils.paramVerifyFail();
+        }
+        DeviceInspectPlanEntity deviceInspectPlanEntity = deviceInspectPlanDao.selectByOrderId(orderId);
+        deviceInspectPlanEntity.setStatus(status);
+        deviceInspectPlanEntity.setUpdateTime(new Date());
+        if (status == 2) {
+            //TODO 审核通过后生成设备维保单
+            //审核通过
+            deviceInspectPlanEntity.setAuditTime(new Date());
+            deviceInspectPlanEntity.setAuditUser(customerService.getUserIdStr());
+        }
+        deviceInspectPlanDao.updateById(deviceInspectPlanEntity);
+        return ResultVOUtils.success();
+    }
+
+    @Override
+    public BaseResponse deletePlan(String id) {
+        if (StrUtil.isBlank(id)) {
+            return ResultVOUtils.paramVerifyFail();
+        }
+        deviceInspectPlanDao.deleteById(id);
+        return ResultVOUtils.success();
+    }
+
+}

src/main/java/com/glxp/api/service/inv/impl/DeviceInspectSetServiceImpl.java

@@ -0,0 +1,67 @@
+package com.glxp.api.service.inv.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.dao.inv.DeptDeviceDetailDao;
+import com.glxp.api.dao.inv.DeviceInspectSetDao;
+import com.glxp.api.entity.inv.DeptDeviceDetailEntity;
+import com.glxp.api.entity.inv.DeviceInspectSetEntity;
+import com.glxp.api.req.inv.AddDeviceInspectSetRequest;
+import com.glxp.api.res.inv.DeviceInspectSetResponse;
+import com.glxp.api.service.inv.DeviceInspectSetService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+@Slf4j
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class DeviceInspectSetServiceImpl implements DeviceInspectSetService {
+
+    @Resource
+    private DeviceInspectSetDao deviceInspectSetDao;
+    @Resource
+    private DeptDeviceDetailDao deptDeviceDetailDao;
+
+    @Override
+    public DeviceInspectSetResponse findInspectSet(String code) {
+        if (StrUtil.isBlank(code)) {
+            return null;
+        }
+        return deviceInspectSetDao.selectInspectSet(code);
+    }
+
+    @Override
+    public BaseResponse updateInspectSet(DeviceInspectSetEntity deviceInspectSetEntity) {
+        DeviceInspectSetEntity inspectSetEntity = deviceInspectSetDao.selectById(deviceInspectSetEntity.getId());
+        BeanUtil.copyProperties(deviceInspectSetEntity, inspectSetEntity, "createUser", "createTime");
+        inspectSetEntity.setUpdateTime(new Date());
+        deviceInspectSetDao.updateById(inspectSetEntity);
+        return ResultVOUtils.success();
+    }
+
+    @Override
+    public BaseResponse addDeviceInspect(AddDeviceInspectSetRequest addDeviceInspectSetRequest) {
+        if (null == addDeviceInspectSetRequest || StrUtil.isBlank(addDeviceInspectSetRequest.getCode())) {
+            return ResultVOUtils.paramVerifyFail();
+        }
+        Long count = deptDeviceDetailDao.selectCount(new QueryWrapper<DeptDeviceDetailEntity>().eq("code", addDeviceInspectSetRequest.getCode()));
+        if (count == 0) {
+            return ResultVOUtils.paramVerifyFail("此设备不存在");
+        }
+
+        DeviceInspectSetEntity deviceInspectSetEntity = new DeviceInspectSetEntity();
+        BeanUtil.copyProperties(addDeviceInspectSetRequest, deviceInspectSetEntity);
+        deviceInspectSetEntity.setStatus(1);
+        deviceInspectSetEntity.setCreateTime(new Date());
+        deviceInspectSetEntity.setUpdateTime(new Date());
+        deviceInspectSetDao.insert(deviceInspectSetEntity);
+        return ResultVOUtils.success();
+    }
+}

src/main/resources/mybatis/mapper/inv/DeviceInspectPlanDao.xml

@@ -1,25 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inv.DeviceInspectPlanDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.inv.DeviceInspectPlanEntity">
-    <!--@mbg.generated-->
-    <!--@Table device_inspect_plan-->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="deptCode" jdbcType="VARCHAR" property="deptCode" />
-    <result column="invCode" jdbcType="VARCHAR" property="invCode" />
-    <result column="code" jdbcType="VARCHAR" property="code" />
-    <result column="level" jdbcType="TINYINT" property="level" />
-    <result column="status" jdbcType="TINYINT" property="status" />
-    <result column="createUser" jdbcType="VARCHAR" property="createUser" />
-    <result column="auditUser" jdbcType="VARCHAR" property="auditUser" />
-    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="auditTime" jdbcType="TIMESTAMP" property="auditTime" />
-    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, deptCode, invCode, code, `level`, `status`, `createUser`, auditUser, createTime, 
-    auditTime, updateTime, remark
-  </sql>
+    <select id="selectByOrderId" resultType="com.glxp.api.entity.inv.DeviceInspectPlanEntity">
+        select *
+        from device_inspect_plan
+        where orderId = #{orderId}
+    </select>
+
 </mapper>

src/main/resources/mybatis/mapper/inv/DeviceInspectSetDao.xml

@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inv.DeviceInspectSetDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.inv.DeviceInspectSetEntity">
-    <!--@mbg.generated-->
-    <!--@Table device_inspect_set-->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="code" jdbcType="VARCHAR" property="code" />
-    <result column="frequency" jdbcType="VARCHAR" property="frequency" />
-    <result column="frequencyUnit" jdbcType="TINYINT" property="frequencyUnit" />
-    <result column="status" jdbcType="TINYINT" property="status" />
-    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, code, frequency, frequencyUnit, `status`, createTime, updateTime, remark
-  </sql>
+    <select id="selectInspectSet" resultType="com.glxp.api.res.inv.DeviceInspectSetResponse">
+        select t.code,
+               t.frequency,
+               t.frequency,
+               t.frequencyUnit,
+               t.remark,
+               d.deviceName,
+               (select name from auth_dept where code = d.deptCode)     deptName,
+               (select name from auth_warehouse where code = d.invCode) invName
+        from device_inspect_set t
+                 left join dept_device_detail d on t.code = d.code
+        <where>
+            <if test="code != null and code != ''">
+                t.code = #{code}
+            </if>
+        </where>
+    </select>
 </mapper>