巡检项添加字段，路线处理

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/item/IotInspectItemController.java

@@ -9,20 +9,25 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.inspect.item.vo.IotInspectItemPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.inspect.item.vo.IotInspectItemRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.inspect.item.vo.IotInspectItemSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectItemDO;
+import cn.iocoder.yudao.module.pms.service.IotDeviceService;
 import cn.iocoder.yudao.module.pms.service.inspect.IotInspectItemService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.annotation.security.PermitAll;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -36,6 +41,8 @@ public class IotInspectItemController {
 
     @Resource
     private IotInspectItemService iotInspectItemService;
+    @Autowired
+    private IotDeviceService iotDeviceService;
 
     @PostMapping("/create")
     @Operation(summary = "创建巡检项")
@@ -91,4 +98,22 @@ public class IotInspectItemController {
                         BeanUtils.toBean(list, IotInspectItemRespVO.class));
     }
 
+    @GetMapping("/init/item")
+    @PermitAll
+    public void initCode(){
+        IotInspectItemPageReqVO iotInspectItemPageReqVO = new IotInspectItemPageReqVO();
+        iotInspectItemPageReqVO.setPageNo(1);
+        iotInspectItemPageReqVO.setPageSize(2000);
+        PageResult<IotInspectItemDO> iotInspectItemPage = iotInspectItemService.getIotInspectItemPage(iotInspectItemPageReqVO);
+        List<IotInspectItemDO> list = iotInspectItemPage.getList();
+        list.stream().filter(e-> Objects.nonNull(e.getDeviceId())).forEach(f->{
+            IotDeviceDO iotDevice = iotDeviceService.getIotDevice(f.getDeviceId());
+            if (Objects.nonNull(iotDevice)) {
+                f.setDeviceCode(iotDevice.getDeviceCode());
+                IotInspectItemSaveReqVO bean = BeanUtils.toBean(f, IotInspectItemSaveReqVO.class);
+                iotInspectItemService.updateIotInspectItem(bean);
+
+            }
+        });
+    }
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/item/vo/IotInspectItemPageReqVO.java

@@ -41,4 +41,6 @@ public class IotInspectItemPageReqVO extends PageParam {
     private String deviceClassifyName;
     @Schema(description = "设备名称")
     private String deviceName;
+    @Schema(description = "设备编码")
+    private String deviceCode;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/item/vo/IotInspectItemRespVO.java

@@ -60,4 +60,6 @@ public class IotInspectItemRespVO {
     private String deviceName;
 
     private String urls;
+    @Schema(description = "设备编码")
+    private String deviceCode;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/item/vo/IotInspectItemSaveReqVO.java

@@ -51,4 +51,5 @@ public class IotInspectItemSaveReqVO {
     private String deviceName;
 
     private String urls;
+    private String deviceCode;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/order/IotInspectOrderController.java

@@ -101,7 +101,7 @@ public class IotInspectOrderController {
             OrderDetail orderDetail = new OrderDetail();
             orderDetail.setDeviceId(k);
             if (Objects.nonNull(iotDevice)) {
-                orderDetail.setDeviceName(iotDevice.getDeviceName());
+                orderDetail.setDeviceName(iotDevice.getDeviceCode() + iotDevice.getDeviceName());
                 orderDetail.setDeviceCode(iotDevice.getDeviceCode());
                 orderDetail.setOrderDetails(v);
                 orderDetails.add(orderDetail);

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/route/IotInspectRouteController.java

@@ -9,6 +9,9 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectItemDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectRouteDO;
 import cn.iocoder.yudao.module.pms.service.inspect.IotInspectItemService;
 import cn.iocoder.yudao.module.pms.service.inspect.IotInspectRouteService;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -45,6 +48,8 @@ public class IotInspectRouteController {
     private IotInspectRouteService iotInspectRouteService;
     @Resource
     private IotInspectItemService iotInspectItemService;
+    @Autowired
+    private DeptApi deptApi;
 
     @GetMapping("/items")
     @Operation(summary = "获得巡检项分页")
@@ -99,7 +104,14 @@ public class IotInspectRouteController {
     @PreAuthorize("@ss.hasPermission('rq:iot-inspect-route:query')")
     public CommonResult<PageResult<IotInspectRouteRespVO>> getDeviceIotInspectRoutePage(@Valid IotInspectRoutePageReqVO pageReqVO) {
         PageResult<IotInspectRouteDO> pageResult = iotInspectRouteService.getRoute(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, IotInspectRouteRespVO.class));
+        PageResult<IotInspectRouteRespVO> bean = BeanUtils.toBean(pageResult, IotInspectRouteRespVO.class);
+        for (IotInspectRouteRespVO iotInspectRouteRespVO : bean.getList()) {
+            DeptRespDTO dept = deptApi.getDept(iotInspectRouteRespVO.getDeptId());
+            if (Objects.nonNull(dept)) {
+                iotInspectRouteRespVO.setDeptName(dept.getName());
+            }
+        }
+        return success(bean);
     }
 
     @GetMapping("/export-excel")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/route/vo/IotInspectRouteRespVO.java

@@ -54,4 +54,7 @@ public class IotInspectRouteRespVO {
 
     @Schema(description = "资产编码")
     private String deviceCode;
+
+    @Schema(description = "部门名称")
+    private String deptName;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/inspect/IotInspectItemDO.java

@@ -69,4 +69,5 @@ public class IotInspectItemDO extends BaseDO {
     private String deviceName;
 
     private String urls;
+    private String deviceCode;
 }

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

@@ -10,9 +10,9 @@
      -->
     <select id="getRoute"
             resultType="cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectRouteDO">
-        select* from (select * from (select route.route_name, device.device_name, device.id device_id,route.id, route.item_json,route.create_time,device.dept_id, device.device_code from (select * from rq_iot_inspect_route where device_id is null) route
+        select* from (select * from (select route.route_name, device.device_name, device.id device_id,route.id, route.item_json,route.create_time,device.dept_id, device.device_code from
+            (select * from rq_iot_inspect_route where device_id is null) route
         left join rq_iot_device device on route.device_classify = device.asset_class)a where a.device_id not in (select device_id from rq_iot_inspect_route where device_id is not null)
-
         union all
         select route_name, device_name, device_id,id,item_json,create_time,dept_id,device_code from rq_iot_inspect_route where device_id is not null)fin
         <where>