后台登录

admin/src/main/java/com/huimv/farm/damsubsidy/controller/AuthorizeController.java

@@ -38,7 +38,8 @@ public class AuthorizeController {
          */
         String groupId = map.get("groupId");
         String menuIds = map.get("menuIds");
-        return iAuthorizeService.saveGroupMenu(groupId,menuIds);
+        String isAll = map.get("isAll");
+        return iAuthorizeService.saveGroupMenu(groupId,menuIds, isAll);
     }
 
     @RequestMapping("/getGroupByAccount")
@@ -66,7 +67,7 @@ public class AuthorizeController {
         List<Map> list = iMenuService.optimizeListUtil(0,myMenu);
         return new Result(ResultCode.SUCCESS,list);
     }
-//    //获取菜单-多级
+    //获取菜单-多级
 //    @RequestMapping("/getMyMenuMultilevel")
 //    public Result getMyMenuMultilevel(@RequestParam(name = "userId", required = true) String userId){
 //        return new Result(ResultCode.SUCCESS,iAuthorizeService.getMyMenuMultilevel(userId));

admin/src/main/java/com/huimv/farm/damsubsidy/controller/SysGroupController.java

@@ -55,5 +55,7 @@ public class SysGroupController {
         Long userId = TokenSign.getMemberIdByJwtToken(request);
         List<Long> allChildId = sysUserService.getAllChildId(userId);
         return groupService.listGroup(map,allChildId);
+
+
     }
 }

admin/src/main/java/com/huimv/farm/damsubsidy/entity/GroupMenu.java

@@ -30,6 +30,7 @@ public class GroupMenu extends Model {
     private Integer groupId;
 
     private Integer menuId;
+    private Integer isAll;
 
 
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/IAuthorizeService.java

@@ -9,7 +9,7 @@ public interface IAuthorizeService {
 
     Result saveAccountGroup(String accountId, String groupIds);
 
-    Result saveGroupMenu(String groupId, String menuIds);
+    Result saveGroupMenu(String groupId, String menuIds,String isAll);
 
 
     Result getMenuByGroup(String groupId);

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/AuthorizeServiceImpl.java

@@ -11,6 +11,7 @@ import com.huimv.farm.damsubsidy.mapper.AccountGroupMapper;
 import com.huimv.farm.damsubsidy.mapper.GroupMenuMapper;
 import com.huimv.farm.damsubsidy.mapper.MenuMapper;
 import com.huimv.farm.damsubsidy.service.IAuthorizeService;
+import com.huimv.farm.damsubsidy.service.IGroupMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,6 +28,8 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
     GroupMenuMapper groupMenuMapper;
     @Autowired
     private MenuMapper menuMapper;
+    @Autowired
+    IGroupMenuService groupMenuService;
     
     @Override
     @Transactional
@@ -60,7 +63,7 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
 
     @Override
     @Transactional
-    public Result saveGroupMenu(String groupId, String menuIds) {
+    public Result saveGroupMenu(String groupId, String menuIds,String isAll) {
         /**
          * Step1:先删除原先的权限组关联菜单数据；
          * Step2:再添加新的账号权限组关联菜单数据；
@@ -68,18 +71,27 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
         groupMenuMapper.removeGroupMenu(groupId);
         if (StringUtils.isNotBlank(menuIds)){
             String[] menuIdsArray = menuIds.split(",");
-            for (int a = 0; a < menuIdsArray.length; a++) {
+            String[] split = isAll.split(",");
 
-                GroupMenu GroupMenu = new GroupMenu();
-                GroupMenu.setGroupId(Integer.parseInt(groupId));
-                GroupMenu.setMenuId(Integer.parseInt(menuIdsArray[a]));
-                groupMenuMapper.insert(GroupMenu);
+            List<GroupMenu> list = new ArrayList();
+            for (int a = 0; a < menuIdsArray.length; a++) {
+                GroupMenu groupMenu = new GroupMenu();
+                groupMenu.setGroupId(Integer.parseInt(groupId));
+                groupMenu.setMenuId(Integer.parseInt(menuIdsArray[a]));
+                list.add(groupMenu);
             }
-
+            if (StringUtils.isNotBlank(isAll)){
+                for (GroupMenu groupMenu : list) {
+                    for (String s : split) {
+                        if (groupMenu.getMenuId()== Integer.parseInt(s)){
+                            groupMenu.setIsAll(1);
+                        }
+                    }
+                }
+            }
+            groupMenuService.saveBatch(list);
         }
-
-
-        return new Result(10001, "保存权限组关联菜单成功", true);
+        return new Result(10000, "保存权限组关联菜单成功", true);
     }
 
 

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillIsolatedServiceImpl.java

@@ -97,7 +97,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                     if (end.length() != 3){
                         return new Result(10001,"耳标号格式错误",false);
                     }
-                    String substring1 = input.substring(start.length() - end.length(), end.length()+1);
+                    String substring1 = input.substring(start.length() - end.length(), start.length());
                     String substring = start.substring(0, start.length() - end.length());
                     System.out.println(substring);
                     List<String> eartagNos = new ArrayList<>();
@@ -196,6 +196,8 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
 
     }
 
+
+
     @Override
     public Result listIsolation(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String pageNum = paramsMap.get("pageNum");