故障上报分配责任人列表与app首页超时提醒处理

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

@@ -12,10 +12,12 @@ import cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainPageR
 import cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainSaveVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.failure.IotFailureReportDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.maintain.IotMaintainBomDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.maintain.IotMaintainDO;
 import cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant;
 import cn.iocoder.yudao.module.pms.service.IotDeviceService;
+import cn.iocoder.yudao.module.pms.service.failure.IotFailureReportService;
 import cn.iocoder.yudao.module.pms.service.maintain.IotMaintainBomService;
 import cn.iocoder.yudao.module.pms.service.maintain.IotMaintainService;
 import cn.iocoder.yudao.module.pms.service.maintain.material.IotMaintainMaterialService;
@@ -62,6 +64,8 @@ public class IotMaintainController {
     private SupplierService supplierService;
     @Autowired
     private AdminUserApi adminUserApi;
+    @Autowired
+    private IotFailureReportService iotFailureReportService;
 
     @PostMapping("/create")
     @Operation(summary = "创建维修工单")
@@ -158,11 +162,11 @@ public class IotMaintainController {
         }
         AdminUserRespDTO user = adminUserApi.getUser(userId);
         List<AdminUserRespDTO> userListByDept = adminUserApi.getUserListByDept(user.getDeptId());
-        IotMaintainDO iotMaintain = iotMaintainService.getIotMaintain(businessId);
-        if (Objects.isNull(iotMaintain)) {
+        IotFailureReportDO iotFailureReportDO = iotFailureReportService.getIotFailureReport(businessId);
+        if (Objects.isNull(iotFailureReportDO)) {
             return success(userListByDept);
         }
-        List<AdminUserRespDTO> userListByDeptId = adminUserApi.getUserListByDeptId(iotMaintain.getDeptId());
+        List<AdminUserRespDTO> userListByDeptId = adminUserApi.getUserListByDeptId(iotFailureReportDO.getDeptId());
         userListByDept.addAll(userListByDeptId);
         return success(userListByDept);
 

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

@@ -50,6 +50,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
+import javax.annotation.security.PermitAll;
 import javax.validation.Valid;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -105,6 +106,7 @@ public class IotStaticController {
     }
 
     @GetMapping("/notice")
+    @PermitAll
     public CommonResult<PageResult<OrderVo>> getNotice(@Valid OrderVo pageReqVO) {
         PageResult<OrderVo> notice = iotMaintainService.getNotice(pageReqVO);
         if (CollUtil.isEmpty(notice.getList())) {
@@ -114,7 +116,9 @@ public class IotStaticController {
             if ("维修工单".equals(orderVo.getType())||"保养工单".equals(orderVo.getType())) {
                 if (Objects.nonNull(orderVo.getPerson())) {
                     AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(orderVo.getPerson()));
-                    orderVo.setPerson(user.getNickname());
+                    if (Objects.nonNull(user)) {
+                        orderVo.setPerson(user.getNickname());
+                    }
                 }
             }
         });