设备调拨修改巡检计划，设置部门id

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/IotDeviceController.java

@@ -194,6 +194,14 @@ public class IotDeviceController {
     public CommonResult<List<ThingsModelDTO>> getIotDeviceTdGateway(@RequestParam("id") Long id) {
         IotDeviceDO iotDevice = iotDeviceService.getIotDevice(id);
         List<ThingsModelDTO> tdParams = iotDeviceService.getTdGatewayParams(iotDevice);
+        List<IotAlarmSettingDO> settings = iotAlarmSettingMapper.selectList("device_id", id);
+        tdParams.forEach(e ->{
+            settings.stream().filter(f -> f.getPropertyCode().equals(e.getIdentifier())).findFirst().ifPresent(g ->{
+                e.setAlarmSettingId(g.getId());
+                e.setMaxValue(g.getMaxValue());
+                e.setMinValue(g.getMinValue());
+            });
+        });
         return success(tdParams);
     }
 
@@ -204,14 +212,6 @@ public class IotDeviceController {
     public CommonResult<List<ThingsModelDTO>> getIotDeviceTdZhbd(@RequestParam("id") Long id) {
         IotDeviceDO iotDevice = iotDeviceService.getIotDevice(id);
         List<ThingsModelDTO> tdParams = iotDeviceService.getTdZhbdParams(iotDevice);
-        List<IotAlarmSettingDO> settings = iotAlarmSettingMapper.selectList("device_id", id);
-        tdParams.forEach(e ->{
-            settings.stream().filter(f -> f.getPropertyCode().equals(e.getIdentifier())).findFirst().ifPresent(g ->{
-                e.setAlarmSettingId(g.getId());
-                e.setMaxValue(g.getMaxValue());
-                e.setMinValue(g.getMinValue());
-            });
-        });
         return success(tdParams);
     }
 

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

@@ -10,6 +10,8 @@ import cn.iocoder.yudao.module.pms.controller.admin.inspect.route.vo.IotInspectR
 import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectPlanDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectPlanMapper;
 import cn.iocoder.yudao.module.pms.service.IotDeviceService;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import com.alibaba.fastjson.JSON;
@@ -42,6 +44,8 @@ public class IotInspectPlanServiceImpl implements IotInspectPlanService {
     private DeptService deptService;
     @Autowired
     private IotDeviceService iotDeviceService;
+    @Autowired
+    private DeptApi deptApi;
 
     @Override
     public void updateInspectPlanStatus(Long id, Integer status) {
@@ -138,7 +142,13 @@ public class IotInspectPlanServiceImpl implements IotInspectPlanService {
                         IotInspectPlanDO iotInspectPlanDO = targetPlan.get(0);
                         List<IotInspectRouteRespVO> routeDOS = JSON.parseArray(iotInspectPlanDO.getDeviceIds(), IotInspectRouteRespVO.class);
                         if (Objects.nonNull(iotInspectRouteDO.get())){
-                            routeDOS.add(iotInspectRouteDO.get());
+                            IotInspectRouteRespVO iotInspectRouteRespVO = iotInspectRouteDO.get();
+                            iotInspectRouteRespVO.setDeptId(deptId);
+                            DeptRespDTO dept = deptApi.getDept(deptId);
+                            if (Objects.nonNull(dept)){
+                                iotInspectRouteRespVO.setDeptName(dept.getName());
+                            }
+                            routeDOS.add(iotInspectRouteRespVO);
                         }
                         //更新巡检计划的巡检明细
                         iotInspectPlanDO.setDeviceIds(JSON.toJSONString(routeDOS));