1.调整科室设备明细，设备巡检设置接口

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.inv.DeptDeviceDetailEntity;
 import com.glxp.api.req.inv.FilterDeptDeviceRequest;
 import com.glxp.api.res.inv.DeptDeviceDetailResponse;
+import com.glxp.api.res.inv.DeviceInspectSetResponse;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -21,8 +23,17 @@ public interface DeptDeviceDetailDao extends BaseMapper<DeptDeviceDetailEntity>
 
     /**
      * 查询
+     *
      * @param filterDeptDeviceRequest
      * @return
      */
     List<DeptDeviceDetailResponse> filterList(FilterDeptDeviceRequest filterDeptDeviceRequest);
+
+    /**
+     * 根据资产编码查询巡检设置信息
+     *
+     * @param code
+     * @return
+     */
+    DeviceInspectSetResponse selectInspectSet(@Param("code") String code);
 }

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

@@ -2,9 +2,153 @@ package com.glxp.api.res.inv;
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 部门设备明细VO
  */
 @Data
 public class DeptDeviceDetailResponse {
+
+    private Integer id;
+
+    /**
+     * 科室编码
+     */
+    private String deptCode;
+
+    /**
+     * 仓库编码
+     */
+    private String invCode;
+
+    /**
+     * 原始码
+     */
+    private String originCode;
+
+    /**
+     * 资产编码
+     */
+    private String code;
+
+    /**
+     * 耗材字典编码
+     */
+    private String relId;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 规格型号
+     */
+    private String ggxh;
+
+    /**
+     * 批次号
+     */
+    private String batchNo;
+
+    /**
+     * 序列号
+     */
+    private String serialNo;
+
+    /**
+     * 生产日期
+     */
+    private String productionDate;
+
+    /**
+     * 失效日期
+     */
+    private String expireDate;
+
+    /**
+     * 生产厂家
+     */
+    private String manufactory;
+
+    /**
+     * 计量单位
+     */
+    private String measname;
+
+    /**
+     * 注册/备案凭证号
+     */
+    private String zczbhhzbapzbh;
+
+    /**
+     * 供应商ID
+     */
+    private String supId;
+
+    /**
+     * 供应商名称
+     */
+    private String supName;
+
+    /**
+     * 状态（1：正常；2：报修；3：养护中；4：已养护；5：已报废）
+     */
+    private Integer status;
+
+    /**
+     * 添加方式（1：领用添加；2：手动添加）
+     */
+    private Integer addType;
+
+    /**
+     * 添加人
+     */
+    private String createUser;
+
+    /**
+     * 负责人
+     */
+    private String manager;
+
+    /**
+     * 最后养护时间
+     */
+    private Date maTime;
+
+    /**
+     * 添加时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 添加人名称
+     */
+    private String createUserName;
+
+    /**
+     * 管理人名称
+     */
+    private String managerName;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 仓库名称
+     */
+    private String invName;
 }

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

@@ -8,6 +8,8 @@ import lombok.Data;
 @Data
 public class DeviceInspectSetResponse {
 
+    private Integer id;
+
     /**
      * 设备名称
      */

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

@@ -65,7 +65,7 @@ public class DeptDeviceDetailServiceImpl implements DeptDeviceDetailService {
             if (count == 0) {
                 DeptDeviceDetailEntity deviceDetail = new DeptDeviceDetailEntity();
                 deviceDetail.setDeptCode(receiveOrderEntity.getFromDeptCode());
-                deviceDetail.setInvCode(receiveOrderEntity.getInvCode());
+                deviceDetail.setInvCode(receiveOrderEntity.getFromInvCode());
                 deviceDetail.setOriginCode(receiveOrderDetailResponse.getCode());
                 deviceDetail.setCode(idUtil.getDeptDeviceCode()); //生成资产编号
                 deviceDetail.setRelId(receiveOrderDetailResponse.getRelId());
@@ -116,6 +116,7 @@ public class DeptDeviceDetailServiceImpl implements DeptDeviceDetailService {
         DeptDeviceDetailEntity deptDeviceDetail = new DeptDeviceDetailEntity();
         BeanUtil.copyProperties(addDeptDeviceRequest, deptDeviceDetail);
         deptDeviceDetail.setCode(idUtil.getDeptDeviceCode()); //资产编码
+        deptDeviceDetail.setStatus(1);
         deptDeviceDetail.setCreateUser(customerService.getUserIdStr());
         deptDeviceDetail.setCreateTime(new Date());
         deptDeviceDetail.setUpdateTime(new Date());

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

@@ -34,13 +34,19 @@ public class DeviceInspectSetServiceImpl implements DeviceInspectSetService {
         if (StrUtil.isBlank(code)) {
             return null;
         }
-        return deviceInspectSetDao.selectInspectSet(code);
+
+        DeviceInspectSetResponse deviceInspectSetResponse = deviceInspectSetDao.selectInspectSet(code);
+        if (null == deviceInspectSetResponse) {
+            //此设备未配置巡检设置，查询此设备的信息
+            deviceInspectSetResponse = deptDeviceDetailDao.selectInspectSet(code);
+        }
+        return deviceInspectSetResponse;
     }
 
     @Override
     public BaseResponse updateInspectSet(DeviceInspectSetEntity deviceInspectSetEntity) {
         DeviceInspectSetEntity inspectSetEntity = deviceInspectSetDao.selectById(deviceInspectSetEntity.getId());
-        BeanUtil.copyProperties(deviceInspectSetEntity, inspectSetEntity, "id","createUser", "createTime");
+        BeanUtil.copyProperties(deviceInspectSetEntity, inspectSetEntity, "id", "createUser", "createTime");
         inspectSetEntity.setUpdateTime(new Date());
         deviceInspectSetDao.updateById(inspectSetEntity);
         return ResultVOUtils.success();
@@ -57,7 +63,7 @@ public class DeviceInspectSetServiceImpl implements DeviceInspectSetService {
         }
 
         DeviceInspectSetEntity deviceInspectSetEntity = new DeviceInspectSetEntity();
-        BeanUtil.copyProperties(addDeviceInspectSetRequest, deviceInspectSetEntity);
+        BeanUtil.copyProperties(addDeviceInspectSetRequest, deviceInspectSetEntity, "id");
         deviceInspectSetEntity.setStatus(1);
         deviceInspectSetEntity.setCreateTime(new Date());
         deviceInspectSetEntity.setUpdateTime(new Date());

src/main/java/com/glxp/api/util/IdUtil.java

@@ -23,10 +23,10 @@ public class IdUtil {
      * @return
      */
     public String getDeptDeviceCode() {
-        long code = redisUtil.incr(Constant.DEPT_CACHE_CODE, 1);
+        Long code = redisUtil.incr(Constant.DEPT_CACHE_CODE, 1);
         if (code == 1) {
             //redis中的key不存在，重新缓存当前最大的key进去
-            redisUtil.set(Constant.DEPT_CACHE_CODE, deptDeviceDetailDao.selectMaxCode());
+            redisUtil.set(Constant.DEPT_CACHE_CODE, Long.valueOf(deptDeviceDetailDao.selectMaxCode()));
             //重新获取最新的编码
             code = redisUtil.incr(Constant.DEPT_CACHE_CODE, 1);
         }

src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml

@@ -362,6 +362,9 @@
             <if test="advanceType != null">
                 AND auth_warehouse.advanceType = #{advanceType}
             </if>
+            <if test="deptCode != null and deptCode != ''">
+                AND auth_warehouse.parentId = #{deptCode}
+            </if>
         </where>
     </select>
 

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

@@ -29,7 +29,9 @@
                t.maTime,
                t.remark,
                (select employeeName from auth_user where id = t.createUser) creatUserName,
-               (select employeeName from auth_user where id = t.manager)    managerName
+               (select employeeName from auth_user where id = t.manager)    managerName,
+               (select `name` from auth_dept where code = t.deptCode)       deptName,
+               (select `name` from auth_warehouse where code = t.invCode)   invName
         from dept_device_detail t
         <where>
             <if test="deptCode != null and deptCode != ''">
@@ -62,4 +64,13 @@
         </where>
         order by t.updateTime desc
     </select>
+
+    <select id="selectInspectSet" resultType="com.glxp.api.res.inv.DeviceInspectSetResponse">
+        select (select `name` from auth_dept where code = t.deptCode)     deptName,
+               (select `name` from auth_warehouse where code = t.invCode) invName,
+               t.deviceName,
+               t.code
+        from dept_device_detail t
+        where t.code = #{code}
+    </select>
 </mapper>

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

@@ -2,7 +2,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">
     <select id="selectInspectSet" resultType="com.glxp.api.res.inv.DeviceInspectSetResponse">
-        select t.code,
+        select t.id,
+               t.code,
                t.frequency,
                t.frequency,
                t.frequencyUnit,