运行记录优化3

yudao-module-pms/yudao-module-pms-biz/pom.xml

@@ -112,6 +112,14 @@
             <version>2.4.2-jdk8-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>cn.com.kingbase</groupId>
+            <artifactId>kingbase8</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.liquibase</groupId>
+            <artifactId>liquibase-core</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotopeationfill/IotOpeationFillOrderMapper.java

@@ -36,7 +36,7 @@ public interface IotOpeationFillOrderMapper extends BaseMapperX<IotOpeationFillO
                 .orderByDesc(IotOpeationFillOrderDO::getId));
     }
     @TenantIgnore
-    default PageResult<IotOpeationFillOrderDO> selectPage1(IotOpeationFillPageReqVO reqVO,
+    default PageResult<IotOpeationFillOrderDO>  selectPage1(IotOpeationFillPageReqVO reqVO,
                                                            Collection<Long> deptIds,
                                                            Collection<Long> orderIds
                                                            ) {

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

@@ -17,6 +17,7 @@ import cn.iocoder.yudao.module.pms.dal.mysql.iotopeationfill.IotOpeationFillOrde
 import cn.iocoder.yudao.module.pms.dal.mysql.iotoperationplan.IotOperationPlanMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotoperationplandev.IotOperationPlanDevMapper;
 import cn.iocoder.yudao.module.pms.message.PmsMessage;
+import cn.iocoder.yudao.module.pms.service.iotopeationfill.IotOpeationFillService;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -59,6 +60,8 @@ public class IotOperationPlanJob implements JobHandler {
     private IotOperationPlanDevMapper planDevMapper;
     @Resource
     private DeptService deptService;
+    @Resource
+    private IotOpeationFillService opeationFillService;
 
     /**
      * 1、查询开启状态运行计划
@@ -258,11 +261,24 @@ public class IotOperationPlanJob implements JobHandler {
 
         for (IotOpeationFillDO re:deviceList) {
             re.setDeviceId(re.getId());
+            re.setIsReport(0);
         }
         iotOpeationFillMapper.insertFill(deviceList);
 
 
-        System.out.println("*****************插入运行记录设备表完成***********************");
-    }
+        Set<Long> idList1 = new HashSet<>();
+        idList1 =  deptService.getChildDeptIdListFromCache(157L);
+        idList1.add(157L);
+
+        List<Long> oDeptList = orderList1.stream().map(IotOpeationFillOrderDO::getDeptId).collect(Collectors.toList());
+
+        boolean exist = idList1.containsAll(oDeptList);
 
+        if(exist){
+            //插入虚拟设备
+            List <IotOpeationFillDO> devList = opeationFillService.reportMethod(orderList1);
+            iotOpeationFillMapper.insertFill(devList);
+        }
+
+}
 }

yudao-module-supplier/yudao-module-supplier-biz/pom.xml

@@ -60,6 +60,16 @@
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-excel</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-biz-data-permission</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-system-biz</artifactId>
+            <version>2.4.2-jdk8-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

yudao-server/src/main/resources/application-test.yaml

@@ -78,7 +78,7 @@ spring:
     host: localhost # 地址
     port: 6379 # 端口
     database: 0  # 数据库索引
-    password: 123456
+
 
 --- #################### 定时任务相关配置 ####################