Przeglądaj źródła

故障上报负责人泛微

lipenghui 1 miesiąc temu
rodzic
commit
486d4b8055

+ 3 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/failure/vo/IotFailureReportPageReqVO.java

@@ -75,4 +75,7 @@ public class IotFailureReportPageReqVO extends PageParam {
 
     @Schema(description = "维修类型内外")
     private String type;
+
+    @Schema(description = "设备编码")
+    private String deviceCode;
 }

+ 3 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/failure/vo/IotFailureReportRespVO.java

@@ -96,4 +96,7 @@ public class IotFailureReportRespVO {
 
     @Schema(description = "维修类型内外")
     private String type;
+
+    @Schema(description = "设备编码")
+    private String deviceCode;
 }

+ 3 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/failure/vo/IotFailureReportSaveReqVO.java

@@ -70,4 +70,7 @@ public class IotFailureReportSaveReqVO {
 
     @Schema(description = "维修类型内外")
     private String type;
+
+    @Schema(description = "设备编码")
+    private String deviceCode;
 }

+ 10 - 10
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/maintain/IotMaintainController.java

@@ -113,16 +113,16 @@ public class IotMaintainController {
     @PreAuthorize("@ss.hasPermission('rq:iot-maintain:query')")
     public CommonResult<PageResult<IotMaintainRespVO>> getIotMaintainPage(@Valid IotMaintainPageReqVO pageReqVO) {
         PageResult<IotMaintainDO> pageResult = iotMaintainService.getIotMaintainPage(pageReqVO);
-        for (IotMaintainDO iotMaintainDO : pageResult.getList()) {
-            Long deviceId = iotMaintainDO.getDeviceId();
-            if (Objects.nonNull(deviceId)) {
-                IotDeviceDO iotDevice = iotDeviceService.getIotDevice(deviceId);
-                if (Objects.nonNull(iotDevice)) {
-                    iotMaintainDO.setDeviceCode(iotDevice.getDeviceCode());
-                }
-            }
-
-        }
+//        for (IotMaintainDO iotMaintainDO : pageResult.getList()) {
+//            Long deviceId = iotMaintainDO.getDeviceId();
+//            if (Objects.nonNull(deviceId)) {
+//                IotDeviceDO iotDevice = iotDeviceService.getIotDevice(deviceId);
+//                if (Objects.nonNull(iotDevice)) {
+//                    iotMaintainDO.setDeviceCode(iotDevice.getDeviceCode());
+//                }
+//            }
+//
+//        }
         return success(BeanUtils.toBean(pageResult, IotMaintainRespVO.class));
     }
 

+ 2 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/maintain/vo/IotMaintainSaveReqVO.java

@@ -99,4 +99,6 @@ public class IotMaintainSaveReqVO {
      * 维修工单类型
      */
     private String maintainType;
+
+    private String deviceCode;
 }

+ 1 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/failure/IotFailureReportDO.java

@@ -107,4 +107,5 @@ public class IotFailureReportDO extends BaseDO {
 
     private String type;
 
+    private String deviceCode;
 }