报表服务器功能修改，增加配置： onlyReport: true

LN
Commit 14fc5f41 由 LN 编写于 2023-04-21 13:36:30 +0800
src/main/java/com/neotel/smfcore/core/message/util/DeviceMessageUtil.java
src/main/java/com/neotel/smfcore/core/storage/rest/StorageController.java
src/main/java/com/neotel/smfcore/security/rest/MenuController.java
--- a/src/main/java/com/neotel/smfcore/core/message/util/DeviceMessageUtil.java
查看文件 @14fc5f4
+++ b/src/main/java/com/neotel/smfcore/core/message/util/DeviceMessageUtil.java
查看文件 @14fc5f4
@@ -18,6 +18,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
@@ -36,6 +37,8 @@ public class DeviceMessageUtil {
    private static IMessageManager messageManager;
+    private static Boolean onlyReport = false;
    @Autowired
    public void setDataCache(DataCache dataCache) {
        DeviceMessageUtil.dataCache = dataCache;
@@ -48,6 +51,9 @@ public class DeviceMessageUtil {
    public void setMessageManager(IMessageManager messageManager) {
        DeviceMessageUtil.messageManager = messageManager;
    }
+    @Value("${menu.onlyReport:}")
+    public void setOnlyReport(Boolean onlyReport){DeviceMessageUtil.onlyReport=onlyReport;}
    /**
     * 流水线提示消息，只保存最后一条
@@ -165,6 +171,11 @@ public class DeviceMessageUtil {
    public static void processDeviceStatus() {
        try {
+            if(onlyReport){
+                log.info("processDeviceStatus : onlyReport=true,直接返回");
+                return;
+            }
            //获取所有料仓状态
            Map<String, Storage> allStorages = dataCache.getAllStorage();
            String[] msgCodes = new String[]{"smfcore.messages.online", "smfcore.messages.offline"};

--- a/src/main/java/com/neotel/smfcore/core/storage/rest/StorageController.java
查看文件 @14fc5f4
+++ b/src/main/java/com/neotel/smfcore/core/storage/rest/StorageController.java
查看文件 @14fc5f4
@@ -158,6 +158,9 @@ public class StorageController {
            User user = userManager.get(userId);
            mygroups = user.getGroups();
        }
+        if(mygroups==null){
+            mygroups=new HashSet<>();
+        }
        mygroups.add("");
        List<Storage> allStorages = storageManager.findAll();

--- a/src/main/java/com/neotel/smfcore/security/rest/MenuController.java
查看文件 @14fc5f4
+++ b/src/main/java/com/neotel/smfcore/security/rest/MenuController.java
查看文件 @14fc5f4
@@ -31,7 +31,9 @@ import com.neotel.smfcore.security.rest.bean.mapstruct.MenuMapper;
 import com.neotel.smfcore.security.rest.bean.query.MenuQueryCondition;
 import com.neotel.smfcore.security.rest.bean.vo.MenuVo;
 import com.neotel.smfcore.security.service.manager.IMenuManager;
+import com.neotel.smfcore.security.service.manager.IUserManager;
 import com.neotel.smfcore.security.service.po.Menu;
+import com.neotel.smfcore.security.service.po.User;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -39,6 +41,7 @@ import lombok.extern.log4j.Log4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.http.HttpStatus;
@@ -68,10 +71,13 @@ public class MenuController {
    private final IMenuManager menuManager;
    @Autowired
    private final MenuMapper menuMapper;
+    @Autowired
+    private final IUserManager userManager;
    @Autowired
    MenuInit menuInit;
+    @Value("${menu.onlyReport:}")
+    protected Boolean onlyReport = false;
    @RequestMapping(value = "/show")
    @AnonymousAccess
    public ResponseEntity<Object> show(@RequestParam String menuPath) {
@@ -94,17 +100,48 @@ public class MenuController {
    @ApiOperation("获取前端所需菜单")
    @AnonymousAccess
    public ResponseEntity<Object> buildMenus(HttpServletRequest servletRequest) {
-        String userId = "1";
+        if (onlyReport) {
-        try {
+            String userId = "1";
-            userId = SecurityUtils.getCurrentUserId();
+            try {
-        } catch (Exception ex) {
+                User user = userManager.findByUserName(Constants.SUPER_USERNAME);
-            log.error("获取当前用户出错：" + ex);
+                userId = user.getId();
-        }
+            } catch (Exception ex) {
-        List<Menu> menuList = menuManager.findByUserId(userId);
+                log.error("获取用户出错：" + ex);
-        List<Menu> buildMenuList=menuManager.buildTree(menuList);
+            }
+            List<Menu> menuList = menuManager.findByUserId(userId);
+            List<Menu> reportMenuList = new ArrayList<>();
+            Menu report = null;
+            for (Menu menu :
+                    menuList) {
+                if (menu.getPath().equals("report")) {
+                    report = menu;
+                    break;
+                }
+            }
+            reportMenuList.add(report);
+            for (Menu menu :
+                    menuList) {
+                if (menu.getPid() != null && menu.getPid().equals(report.getId())) {
+                    reportMenuList.add(menu);
+                }
+            }
+            List<Menu> buildMenuList = menuManager.buildTree(reportMenuList);
+//        List<MenuDto> menuDtoList = menuMapper.toDto(menuManager.buildTree(menuList));
+            List<MenuVo> vos = menuManager.buildMenus(buildMenuList, servletRequest.getLocale());
+            return new ResponseEntity<>(vos, HttpStatus.OK);
+        } else {
+            String userId = "1";
+            try {
+                userId = SecurityUtils.getCurrentUserId();
+            } catch (Exception ex) {
+                log.error("获取当前用户出错：" + ex);
+            }
+            List<Menu> menuList = menuManager.findByUserId(userId);
+            List<Menu> buildMenuList = menuManager.buildTree(menuList);
 //        List<MenuDto> menuDtoList = menuMapper.toDto(menuManager.buildTree(menuList));
-        List<MenuVo> vos = menuManager.buildMenus(buildMenuList,servletRequest.getLocale());
+            List<MenuVo> vos = menuManager.buildMenus(buildMenuList, servletRequest.getLocale());
-        return new ResponseEntity<>(vos, HttpStatus.OK);
+            return new ResponseEntity<>(vos, HttpStatus.OK);
+        }
    }
    @ApiOperation("导出菜单数据")