Merge branch 'localcode' into test

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

@@ -171,6 +171,24 @@ public class IotOperationPlanJob implements JobHandler {
                         deal(planDO, lastdate,devIdList,orderList);
                     }
 
+                    if(planDO.getDeptId()==287){
+                        //筛选日报工单
+                        List<IotOpeationFillOrderDO> virOrderList = new ArrayList<>();
+
+                        IotOpeationFillOrderDO fillDO = new IotOpeationFillOrderDO();
+
+                        fillDO.setOrderName("50010队"+"/"+LocalDate.now()+"运行记录填报");
+                        fillDO.setDeptId(293L);
+                        fillDO.setOrderStatus(0);
+                        fillDO.setCreateTime(LocalDateTime.now());
+                        fillDO.setUserName("李小虎");
+                        fillDO.setUserId(486);
+                        fillDO.setMobile(String.valueOf(17723897643L));
+                        virOrderList.add(fillDO);
+                        List<Long> devIdList = new ArrayList<>();
+                        deal(planDO, lastdate,devIdList,virOrderList);
+                    }
+
                 }
             }
 
@@ -246,27 +264,15 @@ public class IotOperationPlanJob implements JobHandler {
             //瑞鹰SCP项目部50010队伍临时创建
             if(plan.getDeptId()==287){
                 //筛选日报工单
-                List<IotOpeationFillOrderDO> virOrderList = new ArrayList<>();
-
-                IotOpeationFillOrderDO fillDO = new IotOpeationFillOrderDO();
-
-                fillDO.setOrderName("50010队"+"/"+LocalDate.now()+"运行记录填报");
-                fillDO.setDeptId(293L);
-                fillDO.setOrderStatus(0);
-                fillDO.setCreateTime(LocalDateTime.now());
-                fillDO.setUserName("李小虎");
-                fillDO.setUserId(486);
-                fillDO.setMobile(String.valueOf(17723897643L));
-                virOrderList.add(fillDO);
-
-                orderList1.addAll(virOrderList);
+                List<IotOpeationFillOrderDO> virOrderList = orderList.stream().filter(e->e.getDeptId()==293).collect(Collectors.toList());
                 iotOpeationFillOrderMapper.insertBatch(virOrderList);
+                orderList1.addAll(virOrderList);
                 //创建日报设备
                 List <IotOpeationFillDO> devList = opeationFillService.reportMethod(virOrderList);
-                //插入日报设备
-                iotOpeationFillMapper.insertFill(devList);
 
 
+                //插入日报设备
+                iotOpeationFillMapper.insertFill(devList);
             }
 
             boolean rhContain = rhIdList.contains(plan.getDeptId());
@@ -328,7 +334,7 @@ public class IotOperationPlanJob implements JobHandler {
 
 
 
-        //发送钉钉通知
+        /*//发送钉钉通知
         pmsThreadPoolTaskExecutor.execute(()->{
             try{
                 for (IotOpeationFillOrderDO order:orderList1) {
@@ -337,7 +343,7 @@ public class IotOperationPlanJob implements JobHandler {
             }catch (Exception e){
                 e.printStackTrace();
             }
-        });
+        });*/
 
 
         //正常工单设备