创建项目

musk/src/main/java/com/huimv/farm/musk/controller/AuthorizeController.java

@@ -22,12 +22,12 @@ public class AuthorizeController {
     IMenuService iMenuService;
 
     @PostMapping("/saveAccountGroup")
-    public Result saveAccountGroup(@RequestBody Map<String, String> map){
+    public Result saveAccountGroup(@RequestBody Map<String, Integer> map){
         /*
          * 保存账号关联权限组数据
          */
-        String accountId = map.get("accountId");
-        String groupIds = map.get("groupIds");
+        Integer accountId = map.get("accountId");
+        Integer groupIds = map.get("groupIds");
         return iAuthorizeService.saveAccountGroup(accountId,groupIds);
     }
 

musk/src/main/java/com/huimv/farm/musk/mapper/AccountGroupMapper.java

@@ -16,5 +16,5 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface AccountGroupMapper extends BaseMapper<AccountGroup> {
 
-    void removeAccountGroup(@Param("accountId") String accountId);
+    void removeAccountGroup(@Param("accountId") Integer accountId);
 }

musk/src/main/java/com/huimv/farm/musk/mapper/MenuMapper.java

@@ -18,7 +18,7 @@ import java.util.List;
 @Repository
 public interface MenuMapper extends BaseMapper<Menu> {
 
-    List<Menu> getMyMenu(@Param("accountName") String accountName, String[] array);
+    List<Menu> getMyMenu(@Param("accountName") String accountName);
 
-    List<String> getMyButton(@Param("userId") Integer userId, String[] array);
+    List<String> getMyButton(@Param("userId") Integer userId);
 }

musk/src/main/java/com/huimv/farm/musk/service/IAuthorizeService.java

@@ -8,7 +8,7 @@ import java.util.Map;
 
 public interface IAuthorizeService {
 
-    Result saveAccountGroup(String accountId, String groupIds);
+    Result saveAccountGroup(Integer accountId, Integer groupIds);
 
     Result saveGroupMenu(String groupId, String menuIds, String isAll);
 

musk/src/main/java/com/huimv/farm/musk/service/impl/AuthorizeServiceImpl.java

@@ -41,7 +41,7 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
     
     @Override
     @Transactional
-    public Result saveAccountGroup(String accountId, String groupIds) {
+    public Result saveAccountGroup(Integer accountId, Integer groupIds) {
         /**
          * Step1:先删除原先的账号关联权限组数据；
          * Step2:再添加新的账号关联权限组数据；
@@ -51,18 +51,11 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
             accountGroupMapper.removeAccountGroup(groupIds);
             return new Result(10000, "保存账号关联权限组成功", true);
         }else {
-            String[] groupIdArray = accountId.split(",");
             accountGroupMapper.removeAccountGroup(accountId);
-//        for (int a = 0; a < groupIdArray.length; a++) {
-//            accountGroupMapper.removeAccountGroup(accountId,groupIdArray[a]);
-//        }
-            for (int a = 0; a < groupIdArray.length; a++) {
-                AccountGroup accountGroupEntity = new AccountGroup();
-                accountGroupEntity.setAccountId(Integer.parseInt(groupIdArray[a]));
-                accountGroupEntity.setGroupId(Integer.parseInt(groupIds));
-                accountGroupMapper.insert(accountGroupEntity);
-//            accountGroupMapper.insert(Integer.parseInt(accountId),Integer.parseInt(groupIdArray[a]));
-            }
+            AccountGroup accountGroupEntity = new AccountGroup();
+            accountGroupEntity.setAccountId(accountId);
+            accountGroupEntity.setGroupId(groupIds);
+            accountGroupMapper.insert(accountGroupEntity);
             return new Result(10000, "保存账号关联权限组成功", true);
         }
 
@@ -206,20 +199,17 @@ 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(",");
-//        List<String> farmMenus = Arrays.asList(farmMenu);
-        return menuMapper.getMyMenu(accountName,farmMenus);
+
+        return menuMapper.getMyMenu(accountName);
     }
 
     @Override
     public List<String> getMyButton(Integer userId, Integer farmId) {
-        Farm farm = farmMapper.selectById(farmId);
-        String farmMenu = "";
-        if (ObjectUtil.isNotEmpty(farm)) {
-            farmMenu = farm.getFarmMenu();
-        }
+//        Farm farm = farmMapper.selectById(farmId);
+//        String farmMenu = "";
+//        if (ObjectUtil.isNotEmpty(farm)) {
+//            farmMenu = farm.getFarmMenu();
+//        }
         if (userId == 1){
             List<Menu> menus = menuMapper.selectList(null);
             List<String> list = new ArrayList<>();
@@ -228,8 +218,8 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
             }
             return list;
         }
-        String[] menus = farmMenu.split(",");
-        return menuMapper.getMyButton(userId,menus);
+//        String[] menus = farmMenu.split(",");
+        return menuMapper.getMyButton(userId);
     }
 
     @Override

musk/src/main/java/com/huimv/farm/musk/service/impl/SysCameraServiceImpl.java

@@ -2,6 +2,7 @@ package com.huimv.farm.musk.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -9,6 +10,7 @@ import com.huimv.farm.musk.common.utils.Result;
 import com.huimv.farm.musk.common.utils.ResultCode;
 import com.huimv.farm.musk.entity.SysAccountMultilevel;
 import com.huimv.farm.musk.entity.SysCamera;
+import com.huimv.farm.musk.entity.SysCameraArea;
 import com.huimv.farm.musk.entity.SysCameraBrand;
 import com.huimv.farm.musk.entity.vo.*;
 import com.huimv.farm.musk.mapper.SysAccountMultilevelMapper;
@@ -19,9 +21,7 @@ import com.huimv.farm.musk.service.ISysCameraService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -43,6 +43,9 @@ public class SysCameraServiceImpl extends ServiceImpl<SysCameraMapper, SysCamera
     @Autowired
     private SysCameraBrandMapper cameraBrandMapper;
 
+    @Autowired
+    private SysCameraMapper cameraMapper;
+
 //    @Autowired
 //    private BaseScreenCameraAccountMapper cameraAccountMapper;
 
@@ -216,55 +219,32 @@ public class SysCameraServiceImpl extends ServiceImpl<SysCameraMapper, SysCamera
 
     @Override
     public Result listApp(CameraListVo cameraListVo, Integer userId) {
-        Integer current = cameraListVo.getCurrent();
-        String strchStr = cameraListVo.getStrchStr();
-        Integer size = cameraListVo.getSize();
-        Integer areaId = cameraListVo.getAreaId();
-        Integer brandId = cameraListVo.getBrandId();
-        Integer sort = cameraListVo.getSort();
-        Integer farmId = cameraListVo.getFarmId();
-        Integer isOnline = cameraListVo.getIsOnline();
-
-        QueryWrapper<SysCamera> wrapper = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(strchStr)) {
-            wrapper.and(i -> i.like("camera_name", strchStr)
-                    .or().like("camera_ip", strchStr));
-        }
+        List endList = new ArrayList();
+        List<SysCameraArea> cameraAreaList = cameraAreaMapper.selectList(new QueryWrapper<SysCameraArea>().eq("farm_id", cameraListVo.getFarmId()).eq("run_status",1).orderByAsc("sort"));
+        SysAccountMultilevel sysAccountMultilevel = sysAccountMultilevelMapper.selectById(userId);
         if (userId != 1){
-            SysAccountMultilevel sysAccountMultilevel = sysAccountMultilevelMapper.selectById(userId);
-            String cameraIds = sysAccountMultilevel.getCameraIds();
-            List<String> list = new ArrayList();
-            if (StringUtils.isNotBlank(cameraIds)){
-                list  = Arrays.asList(cameraIds);
+            for (SysCameraArea cameraArea : cameraAreaList) {
+                List<SysCamera> sysCameras = cameraMapper.selectList(new QueryWrapper<SysCamera>().eq("area_id", cameraArea.getId()).eq("run_status", 1).in("id", Arrays.asList(sysAccountMultilevel.getCameraIds())).orderByAsc("sort"));
+                if(ObjectUtils.isNotEmpty(sysCameras)){
+                    Map map = new HashMap();
+                    map.put("cameraName", cameraArea.getAreaName());
+                    map.put("id", cameraArea.getId());
+                    map.put("cameraList",sysCameras );
+                    endList.add(map);
+                }
             }
-            wrapper.in("id",list);
-        }
-
-        if (farmId != null) {
-            wrapper.eq("farm_id", farmId);
-        }
-
-        if (areaId != null) {
-            wrapper.eq("area_id", areaId);
-        }
-
-        if (brandId != null) {
-            wrapper.eq("brand_id", brandId);
-        }
-
-        if (isOnline != null) {
-            wrapper.eq("is_online", isOnline);
+            return new Result(ResultCode.SUCCESS, endList);
+        }else {
+            for (SysCameraArea cameraArea : cameraAreaList) {
+                Map map = new HashMap();
+                map.put("cameraName", cameraArea.getAreaName());
+                map.put("id", cameraArea.getId());
+                map.put("cameraList", cameraMapper.selectList(new QueryWrapper<SysCamera>().eq("area_id", cameraArea.getId()).eq("run_status",1).orderByAsc("sort")));
+                endList.add(map);
+            }
+            return new Result(ResultCode.SUCCESS, endList);
         }
 
-        if (sort == null) {
-            wrapper.orderByDesc("id");
-        } else if (sort == 1) {
-            wrapper.orderByDesc("sort");
-        } else {
-            wrapper.orderByAsc("sort");
-        }
-//        wrapper.orderByDesc("id");
-        return new Result(ResultCode.SUCCESS, page(new Page<>(current, size), wrapper));
     }
 
 //    @Override

musk/src/main/resources/com/huimv/farm/musk/mapper/MenuMapper.xml

@@ -8,10 +8,10 @@
         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>
+<!--         AND id IN-->
+<!--         <foreach collection="array"   item="farmMenu"  open="(" separator=","   close=")">-->
+<!--            #{farmMenu}-->
+<!--        </foreach>-->
         ORDER BY sort ASC
     </select>
 
@@ -22,10 +22,10 @@
         (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 id IN-->
+<!--        <foreach collection="array"   item="farmMenu"  open="(" separator=","   close=")">-->
+<!--            #{farmMenu}-->
+<!--        </foreach>-->
         and weight =2
         ORDER BY sort ASC
     </select>