设备管理

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

@@ -5,7 +5,9 @@ import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDevicePageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceSaveReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.IotProductClassifyDO;
 import cn.iocoder.yudao.module.pms.service.IotDeviceService;
+import cn.iocoder.yudao.module.pms.service.IotProductClassifyService;
 import cn.iocoder.yudao.module.pms.util.IotDeviceConvert;
 import cn.iocoder.yudao.module.supplier.dal.dataobject.product.SupplierDO;
 import cn.iocoder.yudao.module.supplier.service.product.SupplierService;
@@ -56,6 +58,8 @@ public class IotDeviceController {
     private DictDataService dictDataService;
     @Resource
     private SupplierService supplierService;
+    @Resource
+    private IotProductClassifyService iotProductClassifyService;
 
     @PostMapping("/create")
     @Operation(summary = "创建设备台账")
@@ -95,6 +99,10 @@ public class IotDeviceController {
         iotDeviceRespVO.setSupplierName(Objects.nonNull(supplierDO)?supplierDO.getName():"");
         SupplierDO supplierDO1 = supplierService.get(iotDevice.getManufacturerId());
         iotDeviceRespVO.setZzName(Objects.nonNull(supplierDO1)?supplierDO1.getName():"");
+        DeptDO dept = deptService.getDept(iotDeviceRespVO.getOrgId());
+        iotDeviceRespVO.setDeptName(Objects.nonNull(dept)?dept.getName():"");
+        IotProductClassifyDO iotProductClassify = iotProductClassifyService.getIotProductClassify(iotDevice.getAssetClass());
+        iotDeviceRespVO.setAssetClassName(Objects.nonNull(iotProductClassify)?iotProductClassify.getName():"");
         return success(iotDeviceRespVO);
     }
 

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

@@ -103,7 +103,7 @@ public class IotDevicePageReqVO extends PageParam {
     private String templateJson;
 
     @Schema(description = "资产类别")
-    private String assetClass;
+    private Long assetClass;
     @Schema(description = "创建时间")
     private LocalDateTime createTime;
 }

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

@@ -127,7 +127,9 @@ public class IotDeviceRespVO {
 
     @Schema(description = "资产类别")
     @ExcelProperty("资产类别")
-    private String assetClass;
+    private Long assetClass;
+    @Schema(description = "资产类别名称")
+    private String assetClassName;
     @Schema(description = "创建时间")
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;

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

@@ -105,5 +105,5 @@ public class IotDeviceSaveReqVO {
     private String templateJson;
 
     @Schema(description = "资产类别")
-    private String assetClass;
+    private Long assetClass;
 }

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

@@ -138,5 +138,5 @@ public class IotDeviceDO extends BaseDO {
      */
     private String templateJson;
 
-    private String assetClass;
+    private Long assetClass;
 }