新增终端状态管理

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Device.java

@@ -38,7 +38,7 @@ public class Device implements Serializable{
     private Integer devDataType;
 
     /**
-     * 终端运行状态（0：投运；1：热备用；2：停运）
+     * 终端运行状态（0：运行；1：检修；2：停运；3：调试；4：退运）
      */
     private Integer runFlag;
 

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/QuitRunningDeviceParam.java

@@ -76,6 +76,18 @@ public class QuitRunningDeviceParam  implements Serializable {
     @ApiModelProperty("发起人自选审批人 Map")
     private Map<String, List<String>> startUserSelectAssignees;
 
+    /**
+     * 设备目标状态（0：运行；1：检修；2：停运；3：调试；4：退运）
+     */
+    @ApiModelProperty(value = "设备目标状态")
+    private Integer devStatus;
+
+    /**
+     * 设备当前状态（0：运行；1：检修；2：停运；3：调试；4：退运）
+     */
+    @ApiModelProperty(value = "设备当前状态")
+    private Integer devOriginalStatus;
+
 
     @Data
     @EqualsAndHashCode(callSuper = true)

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/QuitRunningDevice.java

@@ -38,6 +38,17 @@ public class QuitRunningDevice extends BaseEntity implements Serializable{
      */
     private Integer deviceType;
 
+    /**
+     * 设备目标状态（0：运行；1：检修；2：停运；3：调试；4：退运）
+     */
+    private Integer devStatus;
+
+    /**
+     * 设备当前状态（0：运行；1：检修；2：停运；3：调试；4：退运）
+     */
+    private Integer devOriginalStatus;
+
+
     /**
      * 资产编号
      */

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/QuitRunningDeviceVO.java

@@ -51,6 +51,18 @@ public class QuitRunningDeviceVO extends BaseEntity implements Serializable{
     @ApiModelProperty(value = "设备类型")
     private Integer deviceType;
 
+    /**
+     * 设备目标状态（0：运行；1：检修；2：停运；3：调试；4：退运）
+     */
+    @ApiModelProperty(value = "设备目标状态")
+    private Integer devStatus;
+
+    /**
+     * 设备当前状态（0：运行；1：检修；2：停运；3：调试；4：退运）
+     */
+    @ApiModelProperty(value = "设备当前状态")
+    private Integer devOriginalStatus;
+
     /**
      * 设备状态
      */

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/QuitRunningDeviceMapper.xml

@@ -12,6 +12,9 @@
             supervision_quit_running_device.process_instance_id,
             supervision_quit_running_device.history_instance_id,
             supervision_quit_running_device.create_time,
+            supervision_quit_running_device.create_by,
+            supervision_quit_running_device.dev_status,
+            supervision_quit_running_device.dev_original_status,
             supervision_quit_running_device.status
         FROM supervision_quit_running_device supervision_quit_running_device
         WHERE ${ew.sqlSegment}

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java

@@ -68,10 +68,13 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl<QuitRunningDeviceM
     @Transactional(rollbackFor = Exception.class)
     public String addRunningDevice(QuitRunningDeviceParam quitRunningDeviceParam) {
         //判断该设备是否已经有在申请的
-        checkQuitRunningDevice(quitRunningDeviceParam, false);
+//        checkQuitRunningDevice(quitRunningDeviceParam, false);
-
         QuitRunningDevice quitRunningDevice = new QuitRunningDevice();
         BeanUtils.copyProperties(quitRunningDeviceParam, quitRunningDevice);
+        //监测点只有退运，终端由前端选择了指定状态
+        if(quitRunningDevice.getDeviceType() == 2){
+            quitRunningDevice.setDevStatus(4);
+        }
         quitRunningDevice.setState(DataStateEnum.ENABLE.getCode());
         quitRunningDevice.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
         this.save(quitRunningDevice);
@@ -94,8 +97,11 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl<QuitRunningDeviceM
     public String updateQuitRunningDevice(QuitRunningDeviceParam.QuitRunningDeviceUpdateParam quitRunningDeviceUpdateParam) {
         QuitRunningDevice quitRunningDevice = this.baseMapper.selectById(quitRunningDeviceUpdateParam.getId());
         //判断是否有权限操作
-        InstanceUtil.judgeUserPower(RequestUtil.getUserIndex(),quitRunningDevice.getCreateBy());
+        InstanceUtil.judgeUserPower(RequestUtil.getUserIndex(), quitRunningDevice.getCreateBy());
-        quitRunningDeviceUpdateParam.setStatus(quitRunningDevice.getStatus());
+        //监测点只有退运，终端由前端选择了指定状态
+        if(quitRunningDevice.getDeviceType() == 2){
+            quitRunningDevice.setDevStatus(4);
+        }
         quitRunningDeviceUpdateParam.setProcessInstanceId(quitRunningDevice.getProcessInstanceId());
         quitRunningDeviceUpdateParam.setHistoryInstanceId(quitRunningDevice.getHistoryInstanceId());
         BeanUtils.copyProperties(quitRunningDeviceUpdateParam, quitRunningDevice);
@@ -124,14 +130,18 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl<QuitRunningDeviceM
         QueryWrapper<QuitRunningDeviceVO> quitRunningDeviceVOQueryWrapper = new QueryWrapper<>();
         if (Objects.nonNull(quitRunningDeviceQueryParam)) {
             //判断监测点/设备的选择
-            if (Objects.nonNull(quitRunningDeviceQueryParam.getDeviceType()) && Objects.nonNull(quitRunningDeviceQueryParam.getDeviceId())) {
+//            if (Objects.nonNull(quitRunningDeviceQueryParam.getDeviceType()) && Objects.nonNull(quitRunningDeviceQueryParam.getDeviceId())) {
-                quitRunningDeviceVOQueryWrapper.eq("supervision_quit_running_device.device_type", quitRunningDeviceQueryParam.getDeviceType());
+//                quitRunningDeviceVOQueryWrapper.eq("supervision_quit_running_device.device_type", quitRunningDeviceQueryParam.getDeviceType());
-                quitRunningDeviceVOQueryWrapper.eq("supervision_quit_running_device.device_id", quitRunningDeviceQueryParam.getDeviceId());
+//                quitRunningDeviceVOQueryWrapper.eq("supervision_quit_running_device.device_id", quitRunningDeviceQueryParam.getDeviceId());
-            }
+//            }
             //添加上时间范围
             quitRunningDeviceVOQueryWrapper.between("supervision_quit_running_device.Create_Time",
                     DateUtil.beginOfDay(DateUtil.parse(quitRunningDeviceQueryParam.getSearchBeginTime())),
                     DateUtil.endOfDay(DateUtil.parse(quitRunningDeviceQueryParam.getSearchEndTime())));
+
+            //判断监测点/设备的选择
+            quitRunningDeviceVOQueryWrapper.eq("supervision_quit_running_device.device_type", quitRunningDeviceQueryParam.getDeviceType());
+
         }
 
         //获取当前用户部门所有同事的id，查看该部门下所有的数据
@@ -176,12 +186,10 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl<QuitRunningDeviceM
             //通过，则需要远程将该装置调整为退运
             if (quitRunningDevice.getDeviceType() == 1) {
                 //修改装置
-                lineFeignClient.updateDeviceRunFlag(quitRunningDevice.getDeviceId(), RunFlagEnum.QUIT.getStatus());
+                lineFeignClient.updateDeviceRunFlag(quitRunningDevice.getDeviceId(), quitRunningDevice.getDevStatus());
-
-
             } else if (quitRunningDevice.getDeviceType() == 2) {
                 //修改监测点
-                lineFeignClient.updateLineRunFlag(quitRunningDevice.getDeviceId(), RunFlagEnum.QUIT.getStatus());
+                lineFeignClient.updateLineRunFlag(quitRunningDevice.getDeviceId(), quitRunningDevice.getDevStatus());
                 userReportPOService.updateUserStatus(businessKey, SupervisionUserStatusEnum.QUIT.getCode());
             }
         }
@@ -219,7 +227,7 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl<QuitRunningDeviceM
         //准备取消该流程，需要远程调用接口
         QuitRunningDevice quitRunningDevice = this.baseMapper.selectById(cancelReqVO.getId());
         //判断是否有权限操作
-        InstanceUtil.judgeUserPower(RequestUtil.getUserIndex(),quitRunningDevice.getCreateBy());
+        InstanceUtil.judgeUserPower(RequestUtil.getUserIndex(), quitRunningDevice.getCreateBy());
         //取消流程
         bpmProcessFeignClient.cancelProcessInstanceByStartUser(cancelReqVO);
         //更新状态