角色

src/main/java/com/szwl/aspect/MyWebMvcConfigurer.java

@@ -21,7 +21,8 @@ public class MyWebMvcConfigurer extends WebMvcConfigurationSupport {
         // 自定义去除的路径
         String[] myExcludes= {"/tAdmin/login","/tAdmin/save","/tAdmin/updatePassword","/tMessageCode/**","/tJoinpayMch/**","/tLogo/**",
                 "/tProportion/**","/tProduct/**","/tPromoCode/**", "/tProportionCheck/**", "/tProduct/selectProductList",  "/rabbitMqController/**","/tJoinpayMchCheck/**","/indexController/**","/sysRoleMenu/**",
-                "/tEquipmentApply/**","/tEquipment/**","/api/**","/tAdmin/**","/tNotice/**","/tArea/**","/error"};
+                "/tEquipmentApply/**","/tEquipment/**","/api/**","/tAdmin/**","/tNotice/**",
+                "/tLabel/**","/tArea/**","/error"};
         registry.addInterceptor(headTokenInterceptor).addPathPatterns("/**")
                 // swagger
                 .excludePathPatterns(swaggerExcludes)

src/main/java/com/szwl/controller/SysRoleMenuController.java

@@ -44,8 +44,13 @@ public class SysRoleMenuController {
 
     @GetMapping("/listRoleOption")
     @ApiOperation("获取所有角色下拉框")
-    public ResponseModel<List<OptionDTO>> listRoleOption() {
-        List<OptionDTO> list = sysRoleService.list()
+    public ResponseModel<List<OptionDTO>> listRoleOption(String adminId) {
+        if(org.apache.commons.lang.StringUtils.isEmpty(adminId)){
+            return R.fail(ResponseCodesEnum.A0100);
+        }
+        LambdaQueryWrapper<SysRole> query = Wrappers.lambdaQuery();
+        query.eq(SysRole::getAdminId,adminId);
+        List<OptionDTO> list = sysRoleService.list(query)
                 .stream()
                 .map(e -> new OptionDTO()
                         .setLabel(e.getRoleName())
@@ -61,7 +66,10 @@ public class SysRoleMenuController {
         }
         LambdaQueryWrapper<SysRole> query = Wrappers.lambdaQuery();
         query.eq(SysRole::getAdminId,adminId);
-        List<SysRole> list = sysRoleService.list();
+        if(!adminId.equals("1")){
+            query.ne(SysRole::getRoleName,"商家");
+        }
+        List<SysRole> list = sysRoleService.list(query);
         return R.ok(list);
     }
     @GetMapping("/deleteRoleOption")
@@ -85,6 +93,9 @@ public class SysRoleMenuController {
     @ApiOperation("新增角色及权限菜单")
     @Audit(type = AuditEnum.INSERT,content = "#loginUser.name + '新增角色及权限菜单'")
     public ResponseModel<?> addSysRole(@RequestBody @Valid AddSysRoleParam param) {
+        if(param.getRoleName().equals("商家")&&param.getAdminId().equals("1")){
+            return R.fail(ResponseCodesEnum.A0001,"不能起商家这个名称");
+        }
         sysRoleService.addSysRole(param);
         return R.ok();
     }

src/main/java/com/szwl/controller/TAdminController.java

@@ -735,5 +735,19 @@ public class TAdminController {
 
         return R.ok();
     }
+    @ApiOperation(value = "批量设置账户的关联上级")
+    @GetMapping("/setRelation")
+    public ResponseModel<?> setRelation() {
+        List<TAdmin> list = tAdminService.list();
+        if(list.size()>0){
+            for(TAdmin admin:list){
+                if(admin.getParentId()!=null){
+                    admin.setRelationAdminId(admin.getParentId().toString());
+                    tAdminService.updateById(admin);
+                }
+            }
+        }
+        return R.ok();
+    }
 }
 

src/main/java/com/szwl/controller/TLabelController.java

@@ -230,35 +230,86 @@ public class TLabelController {
                         label.setModifyDate(new Date());
                         label.setEquipmentIds(JSON.toJSON(list).toString());
                         String equipmentNames = label.getEquipmentNames();
-//                        char a = equipmentNames.charAt(1);
                         List<String> stringList = new ArrayList<>();
-//                        if(a!= 34){
-//                            equipmentNames=equipmentNames.substring(1,equipmentNames.length()-1);
-//                            String[] split1 = equipmentNames.split(",");
-//                            stringList = new ArrayList<>(Arrays.asList(split1));
-//                            String name = tEquipment.getName();
-//                            if(StringUtils.isNotEmpty(name)){
-//                                stringList.add(name);
-//                            }
-//
-//                        }else {
-//                            stringList = JSON.parseArray(equipmentNames, String.class);
-//                            if(StringUtils.isNotEmpty(tEquipment.getName())){
-//                                stringList.add(tEquipment.getName());
-//                            }
-//                        }
-                        stringList = JSON.parseArray(equipmentNames, String.class);
-                        if(StringUtils.isNotEmpty(tEquipment.getName())){
-                            stringList.add(tEquipment.getName());
+//                        stringList = JSON.parseArray(equipmentNames, String.class);
+                        for(String eid:list){
+                            TEquipment byId = equipmentService.getById(eid);
+                            stringList.add(byId.getName());
                         }
+//                        if(StringUtils.isNotEmpty(tEquipment.getName())){
+//                            stringList.add(tEquipment.getName());
+//                        }
                         label.setEquipmentNames(JSON.toJSON(stringList).toString());
                         labelService.updateById(label);
                     }
-
+                    List<String> stringList = new ArrayList<>();
+                    for(String eid:list){
+                        TEquipment byId = equipmentService.getById(eid);
+                        stringList.add(byId.getName());
+                    }
+                    label.setEquipmentNames(JSON.toJSON(stringList).toString());
+                    labelService.updateById(label);
                 }
             }
         }
-        return R.ok();
+        //清空没有的标签
+        LambdaQueryWrapper<TLabel> query = Wrappers.lambdaQuery();
+        query.eq(TLabel::getAdminId,tEquipment.getAdminId());
+        query.eq(TLabel::getType,1);
+        List<TLabel> list = labelService.list(query);
+        List<TLabel> returnList = new ArrayList<>();
+        if(list.size()>0){
+            for(TLabel tLabel:list){
+                int i = 0;
+                String equipmentIds = tLabel.getEquipmentIds();
+                equipmentIds = equipmentIds.replace("\"", "").replace("[","").replace("]","");
+                String[] split1 = equipmentIds.split(",");
+                if(split1.length>0){
+                    for(int j=0;j<split1.length;j++){
+                        if(split1[j].equals(equipmentId)){
+                            i++;
+                        }
+                    }
+                }
+                returnList.add(tLabel);
+            }
+        }
+        if(returnList.size()>0){
+            if(labelIdList.size()!=returnList.size()){
+                for(TLabel tLabel:list){
+                    int i = 0;
+                    for(String id:labelIdList){
+                        if(id.equals(tLabel.getId().toString())){
+                            i++;
+                        }
+                    }
+                    if(i==0){
+                        String equipmentIds = tLabel.getEquipmentIds();
+                        equipmentIds = equipmentIds.replace("\"", "").replace("[","").replace("]","");
+                        String[] split1 = equipmentIds.split(",");
+                        List<String> stringList = new ArrayList<>();
+                        for(int j=0;j<split1.length;j++){
+                            if(!split1[j].equals(equipmentId)){
+                                stringList.add(split1[j]);
+                            }
+                        }
+                        List<String> newNames = new ArrayList<>();
+                        List<String> nameList = new ArrayList<>();
+                        String equipmentNames = tLabel.getEquipmentNames();
+                        nameList = JSON.parseArray(equipmentNames, String.class);
+                        for(String name : nameList){
+                            if(!name.equals(tEquipment.getName())){
+                                newNames.add(name);
+                            }
+                        }
+                        tLabel.setEquipmentNames(JSON.toJSON(newNames).toString());
+                        tLabel.setEquipmentIds(JSON.toJSON(stringList).toString());
+                        labelService.updateById(tLabel);
+                    }
+                }
+            }
+        }
+        return R.ok(null,"绑定成功");
     }
     @ApiOperation(value = "单个机器标签")
     @GetMapping("/getEquipmentToLabel")
@@ -276,6 +327,7 @@ public class TLabelController {
             for(TLabel tLabel:list){
                 int i = 0;
                 String equipmentIds = tLabel.getEquipmentIds();
+                equipmentIds = equipmentIds.replace("\"", "").replace("[","").replace("]","");
                 String[] split = equipmentIds.split(",");
                 if(split.length>0){
                     for(int j=0;j<split.length;j++){

src/main/java/com/szwl/controller/TPromoCodeController.java

@@ -178,7 +178,7 @@ public class TPromoCodeController {
             query.eq(TPromoCode::getType,"2");
             List<TPromoCode> list = promoCodeService.list(query);
             if(list.size()>0){
-                return R.fail(A0202,"已领取");
+                return R.ok(1,"此券每人限领一张，您已领取过，不能再领！");
             }
         }
         String code = orderService.initSn(Long.valueOf(wxId));