网关 端口

huimv-env-admin/src/main/java/com/huimv/env/admin/controller/TerminalController.java

@@ -69,7 +69,6 @@ public class TerminalController {
         gateway.setTerminalNum(gateway.getTerminalNum()+1);
         gatewayService.updateById(gateway);
 
-
         List portList = new ArrayList();
         for (int i = 1; i < 9; i++){
             TerminalPort terminalPort = new TerminalPort();
@@ -87,6 +86,7 @@ public class TerminalController {
         List<Terminal> terminalList = terminalService.list(new QueryWrapper<Terminal>().lambda()
                 .eq(ObjectUtil.isNotEmpty(terminalListParam.getGatewayId()), Terminal::getGatewayId, terminalListParam.getGatewayId()));
         return new Result(ResultCode.SUCCESS,terminalList);
+
     }
 
     @PostMapping("/listByLocationId")

huimv-env-admin/src/main/java/com/huimv/env/admin/service/impl/AuthorizeServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.env.admin.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 
@@ -206,17 +207,15 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
             List<Menu> menus = menuMapper.selectList(new QueryWrapper<Menu>().orderByAsc("sort"));
             return menus;
         }
-        Farm farm = farmMapper.selectById(farmId);
-        String farmMenu = farm.getFarmMenu();
-        String[] farmMenus = farmMenu.split(",");
+        return menuMapper.getMyMenu(accountName,null);
+
+
 //        List<String> farmMenus = Arrays.asList(farmMenu);
-        return menuMapper.getMyMenu(accountName,farmMenus);
+
     }
 
     @Override
     public List<String> getMyButton(Integer userId, Integer farmId) {
-        Farm farm = farmMapper.selectById(farmId);
-        String farmMenu = farm.getFarmMenu();
         if (userId == 1){
             List<Menu> menus = menuMapper.selectList(null);
             List<String> list = new ArrayList<>();
@@ -225,8 +224,7 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
             }
             return list;
         }
-        String[] menus = farmMenu.split(",");
-        return menuMapper.getMyButton(userId,menus);
+        return menuMapper.getMyButton(userId,null);
     }
 
     @Override

huimv-env-admin/src/main/resources/mapper/MenuMapper.xml

@@ -8,10 +8,6 @@
         WHERE id IN
         (SELECT DISTINCT(menu_id) FROM sys_group_menu WHERE group_id IN
         (SELECT group_id FROM sys_account_group WHERE account_id=#{accountName} ))
-         AND id IN
-         <foreach collection="array"   item="farmMenu"  open="(" separator=","   close=")">
-            #{farmMenu}
-        </foreach>
         ORDER BY sort ASC
     </select>
 
@@ -22,10 +18,6 @@
         (SELECT DISTINCT(menu_id) FROM sys_group_menu WHERE group_id IN
         (SELECT group_id FROM sys_account_group WHERE
         account_id=#{userId}))
-        AND id IN
-        <foreach collection="array"   item="farmMenu"  open="(" separator=","   close=")">
-            #{farmMenu}
-        </foreach>
         and weight =2
         ORDER BY sort ASC
     </select>