巡检工单设备中间表

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/inspect/IotInspectOrderServiceImpl.java

@@ -257,7 +257,7 @@ public class IotInspectOrderServiceImpl implements IotInspectOrderService {
     @Transactional(rollbackFor = Exception.class)
     public void createPlan(IotInspectPlanDO iotInspectPlan)  {
         Map<Long, List<IotInspectRouteRespVO>> generate = generate(iotInspectPlan.getDeviceIds());
-//        List<IotDeviceSimple> iotDeviceDOS = iotDeviceMapper.selectCodeAndNameList();
+        List<IotDeviceSimple> iotDeviceDOS = iotDeviceMapper.selectCodeAndNameList();
         generate.forEach((k, v)->{
             List<IotInspectOrderDetailDO> results = new ArrayList<>();
             //处理巡检项
@@ -345,19 +345,19 @@ public class IotInspectOrderServiceImpl implements IotInspectOrderService {
                 //发送消息
                 pmsMessage.sendMessage(iotInspectOrderDO.getId(), iotInspectOrderDO.getInspectOrderTitle(), PmsConstants.GENERATE_INSPECT, k, user.getMobile());
                 //写入子表
-//                Set<Long> collect = results.stream().map(IotInspectOrderDetailDO::getDeviceId).collect(Collectors.toSet());
-//                List<IotInspectOrderDeviceDO> inspectDevices = new ArrayList<>();
-//                collect.forEach(deviceId -> iotDeviceDOS.stream().filter(g -> deviceId.equals(g.getId())).findFirst().ifPresent(iotDeviceDO -> {
-//                    IotInspectOrderDeviceDO iotInspectOrderDeviceDO = new IotInspectOrderDeviceDO();
-//                    iotInspectOrderDeviceDO.setDeviceId(deviceId);
-//                    iotInspectOrderDeviceDO.setOrderId(iotInspectOrderDO.getId());
-//                    iotInspectOrderDeviceDO.setDeviceName(iotDeviceDO.getDeviceName());
-//                    iotInspectOrderDeviceDO.setDeptId(iotInspectOrderDO.getDeptId());
-//                    iotInspectOrderDeviceDO.setDeviceCode(iotDeviceDO.getDeviceCode());
-//                    iotInspectOrderDeviceDO.setDeleted(false);
-//                    inspectDevices.add(iotInspectOrderDeviceDO);
-//                }));
-//                TenantUtils.execute(1L, () -> iotInspectOrderDeviceMapper.insertBatch(inspectDevices));
+                Set<Long> collect = results.stream().map(IotInspectOrderDetailDO::getDeviceId).collect(Collectors.toSet());
+                List<IotInspectOrderDeviceDO> inspectDevices = new ArrayList<>();
+                collect.forEach(deviceId -> iotDeviceDOS.stream().filter(g -> deviceId.equals(g.getId())).findFirst().ifPresent(iotDeviceDO -> {
+                    IotInspectOrderDeviceDO iotInspectOrderDeviceDO = new IotInspectOrderDeviceDO();
+                    iotInspectOrderDeviceDO.setDeviceId(deviceId);
+                    iotInspectOrderDeviceDO.setOrderId(iotInspectOrderDO.getId());
+                    iotInspectOrderDeviceDO.setDeviceName(iotDeviceDO.getDeviceName());
+                    iotInspectOrderDeviceDO.setDeptId(iotInspectOrderDO.getDeptId());
+                    iotInspectOrderDeviceDO.setDeviceCode(iotDeviceDO.getDeviceCode());
+                    iotInspectOrderDeviceDO.setDeleted(false);
+                    inspectDevices.add(iotInspectOrderDeviceDO);
+                }));
+                TenantUtils.execute(1L, () -> iotInspectOrderDeviceMapper.insertBatch(inspectDevices));
             });
         });
     }