运行记录调整

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/job/IotOperationPlanJob.java

@@ -201,7 +201,7 @@ public class IotOperationPlanJob implements JobHandler {
 
         Set<Long> ryIdList = new HashSet<>();
         if(plan.getIsReport()==1){
-
+            //瑞鹰
             ryIdList =  deptService.getChildDeptIdListFromCache(158L);
             ryIdList.add(158L);
 
@@ -256,11 +256,11 @@ public class IotOperationPlanJob implements JobHandler {
 
             //插入工单主表
             iotOpeationFillOrderMapper.insertBatch(orderList1);
-
+            //瑞都
             ryIdList =  deptService.getChildDeptIdListFromCache(163L);
             ryIdList.add(163L);
             Set<Long> rhIdList = new HashSet<>();
-            rhIdList =  deptService.getChildDeptIdListFromCache(157L);
+            rhIdList =  deptService.getChildDeptIdListFromCache(157L);//瑞恒
             rhIdList.add(157L);
             boolean exist = ryIdList.contains(plan.getDeptId());
             if(!exist){
@@ -356,7 +356,7 @@ public class IotOperationPlanJob implements JobHandler {
     private void rhReportInsert(IotOperationPlanDO plan, List<IotOpeationFillOrderDO> orderList1, boolean rhContain) {
         if(rhContain){
 
-            //创建日报设备
+            //创建瑞恒日报虚拟设备
             List <IotOpeationFillDO> devList = opeationFillService.reportMethod(orderList1);
             //插入日报设备
             iotOpeationFillMapper.insertFill(devList);
@@ -417,4 +417,4 @@ public class IotOperationPlanJob implements JobHandler {
         }
     }
 
-}
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotopeationfill/IotOpeationFillServiceImpl.java

@@ -343,7 +343,7 @@ public class IotOpeationFillServiceImpl implements IotOpeationFillService {
 
         //判断工单主数据是否有值
         if(orderList.size()>0){
-            //遍历工单主数据，根据dept_id查询是否为根节点
+            //遍历工单主数据，根据dept_id查询是否为小队
             for (IotOpeationFillOrderDO orderDO:orderList) {
 
                 IotDeviceRunLogDO runLogDO = new IotDeviceRunLogDO();
@@ -367,7 +367,7 @@ public class IotOpeationFillServiceImpl implements IotOpeationFillService {
                 } while (exitDev != null); // 如果存在则继续循环生成新的随机数
 
 
-                //如果是根节点，则证明该部门为小队并且属于瑞恒，创建对应日报虚拟设备
+                //如果是小队，则证明该部门为小队，创建对应日报虚拟设备
                 if(childList.size()==0){
                     IotOpeationFillDO devOrder = new IotOpeationFillDO();
                     devOrder.setDeviceCode("");
@@ -451,4 +451,4 @@ public class IotOpeationFillServiceImpl implements IotOpeationFillService {
         return iotOpeationFillMapper.getDesc(runLogDO);
     }
 
-}
+}

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/IotOpeationFillMapper.xml

@@ -26,7 +26,7 @@
         and
         c.id = d.device_id
         and
-        c.device_status in ('sg','dm')
+        c.device_status in ('sg')
         and
         a.deleted = 0
         and