故障上报负责人泛微

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/number/NumberUtils.java

@@ -23,6 +23,9 @@ public class NumberUtils {
     }
 
     public static int hexToDecimal(String hex) {
+        if (hex.matches("-?\\d+(\\.\\d+)?")){
+            return Integer.parseInt(hex);
+        }
         // 去除可能的前缀和空格
         hex = hex.trim().replaceFirst("0x", "").replaceFirst("#", "");
         // 使用Integer.parseInt转换

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

@@ -21,6 +21,9 @@ import cn.iocoder.yudao.module.pms.service.maintain.IotMaintainService;
 import cn.iocoder.yudao.module.pms.service.maintain.material.IotMaintainMaterialService;
 import cn.iocoder.yudao.module.supplier.dal.dataobject.product.SupplierDO;
 import cn.iocoder.yudao.module.supplier.service.product.SupplierService;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -33,6 +36,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -56,6 +60,8 @@ public class IotMaintainController {
     private IotDeviceService iotDeviceService;
     @Autowired
     private SupplierService supplierService;
+    @Autowired
+    private AdminUserApi adminUserApi;
 
     @PostMapping("/create")
     @Operation(summary = "创建维修工单")
@@ -143,4 +149,22 @@ public class IotMaintainController {
         iotFailureReportProcessVO.setAssigneeUserId(Long.valueOf(assigneeUserId));
         return success(iotMaintainService.updateMaintainProcess(iotFailureReportProcessVO));
     }
+
+    @GetMapping("/maintain/users")
+    @PreAuthorize("@ss.hasPermission('system:user:query')")
+    public CommonResult<List<AdminUserRespDTO>> getMaintainUsers(Long userId, Long businessId) {
+        if (Objects.isNull(userId)&&Objects.isNull(businessId)) {
+            return success(new ArrayList<>());
+        }
+        AdminUserRespDTO user = adminUserApi.getUser(userId);
+        List<AdminUserRespDTO> userListByDept = adminUserApi.getUserListByDept(user.getDeptId());
+        IotMaintainDO iotMaintain = iotMaintainService.getIotMaintain(businessId);
+        if (Objects.isNull(iotMaintain)) {
+            return success(userListByDept);
+        }
+        List<AdminUserRespDTO> userListByDeptId = adminUserApi.getUserListByDeptId(iotMaintain.getDeptId());
+        userListByDept.addAll(userListByDeptId);
+        return success(userListByDept);
+
+    }
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java

@@ -202,5 +202,4 @@ public class UserController {
         List<AdminUserRespDTO> userListBySubordinate = adminUserApi.getUserListByDeptId(userId);
         return success(userListBySubordinate);
     }
-
 }