Forráskód Böngészése

运行监控排序处理,字典类型只有admin有所有处理权限

lipenghui 1 hónapja
szülő
commit
5ac02b97d8

+ 3 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/job/TdCronJob.java

@@ -41,6 +41,9 @@ public class TdCronJob implements JobHandler {
         for (IotDeviceDO device : devices) {
         for (IotDeviceDO device : devices) {
             String deviceCode = device.getDeviceCode();
             String deviceCode = device.getDeviceCode();
             allDevice.stream().filter(e -> e.getSerialNumber().equals(deviceCode)).findFirst().ifPresent(e -> {
             allDevice.stream().filter(e -> e.getSerialNumber().equals(deviceCode)).findFirst().ifPresent(e -> {
+                if (e.getStatus()==1) {
+                    device.setIfInline(5);
+                }
                 device.setIfInline(e.getStatus());
                 device.setIfInline(e.getStatus());
                 device.setYfDeviceId(e.getDeviceId());
                 device.setYfDeviceId(e.getDeviceId());
                 Integer i = deviceMapper.tableIfExist(e.getSerialNumber().toLowerCase());
                 Integer i = deviceMapper.tableIfExist(e.getSerialNumber().toLowerCase());

+ 18 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictTypeController.java

@@ -1,11 +1,17 @@
 package cn.iocoder.yudao.module.system.controller.admin.dict;
 package cn.iocoder.yudao.module.system.controller.admin.dict;
 
 
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+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.controller.admin.dict.vo.type.DictTypePageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypePageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeRespVO;
 import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeRespVO;
 import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeSaveReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeSaveReqVO;
@@ -15,6 +21,8 @@ import cn.iocoder.yudao.module.system.service.dict.DictTypeService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.apache.catalina.security.SecurityUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
@@ -24,6 +32,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.io.IOException;
 import java.util.List;
 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.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -36,6 +45,8 @@ public class DictTypeController {
 
 
     @Resource
     @Resource
     private DictTypeService dictTypeService;
     private DictTypeService dictTypeService;
+    @Autowired
+    private AdminUserApi adminUserApi;
 
 
     @PostMapping("/create")
     @PostMapping("/create")
     @Operation(summary = "创建字典类型")
     @Operation(summary = "创建字典类型")
@@ -66,6 +77,13 @@ public class DictTypeController {
     @Operation(summary = "获得字典类型的分页列表")
     @Operation(summary = "获得字典类型的分页列表")
     @PreAuthorize("@ss.hasPermission('system:dict:query')")
     @PreAuthorize("@ss.hasPermission('system:dict:query')")
     public CommonResult<PageResult<DictTypeRespVO>> pageDictTypes(@Valid DictTypePageReqVO pageReqVO) {
     public CommonResult<PageResult<DictTypeRespVO>> pageDictTypes(@Valid DictTypePageReqVO pageReqVO) {
+        Long userId = SecurityFrameworkUtils.getLoginUserId();
+        if (Objects.isNull(userId)) throw new ServiceException(new ErrorCode(12, "未登录"));
+        AdminUserRespDTO user = adminUserApi.getUser(userId);
+        if (Objects.isNull(user)) throw new ServiceException(new ErrorCode(13, "用户不存在"));
+        if (!"admin".equals(user.getUsername())){
+            pageReqVO.setType("pms_device_brand");
+        }
         PageResult<DictTypeDO> pageResult = dictTypeService.getDictTypePage(pageReqVO);
         PageResult<DictTypeDO> pageResult = dictTypeService.getDictTypePage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, DictTypeRespVO.class));
         return success(BeanUtils.toBean(pageResult, DictTypeRespVO.class));
     }
     }