标签管理

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

@@ -534,19 +534,30 @@ public class TAdminController {
     @ApiOperation(value = "获取账号列表 分页")
     @GetMapping("/pageAdmin")
     public ResponseModel<IPage<?>> pageAdmin(String id,String name,String userName,String ifForeign,long current,long size ) {
+        if(StringUtils.isEmpty(id)){
+            return R.fail(ResponseCodesEnum.A0001,"null参数");
+        }
         LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
         if(StringUtils.isNotEmpty(name)){
             query.eq(TAdmin::getName,name);
         }
         if(StringUtils.isNotEmpty(userName)){
-            query.like(TAdmin::getUsername,userName);
+            query.eq(TAdmin::getUsername,userName);
         }
         if(StringUtils.isNotEmpty(ifForeign)){
-            query.like(TAdmin::getIfForeign,ifForeign);
+            query.eq(TAdmin::getIfForeign,ifForeign);
         }
         if(StringUtils.isNotEmpty(id)){
-            query.like(TAdmin::getRelationAdminId,id);
+            TAdmin byId = tAdminService.getById(id);
+            if(byId==null||byId.getId()==null){
+                return R.fail(ResponseCodesEnum.A0001,"没有找到商家");
+            }
+            if(byId.getType()<1){
+            }else {
+                query.eq(TAdmin::getRelationAdminId,id);
+            }
         }
+        query.orderByDesc(TAdmin::getCreateDate);
         Page<TAdmin> page = new Page<>(current, size, true);
         IPage<TAdmin> iPage = tAdminService.page(page, query);
         return R.ok(iPage);

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

@@ -57,7 +57,7 @@ public class TAreaController {
             }else {
                 String[] split = list.get(i).getTreePath().split(",");
                 if(split.length==2){
-                    if(i==1){
+                    if(i==0){
                         LambdaQueryWrapper<TArea> query1 = Wrappers.lambdaQuery();
                         query1.eq(TArea::getParent,list.get(i).getId());
                         List<TArea> list1 = areaService.list(query1);

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

@@ -260,5 +260,39 @@ public class TLabelController {
         }
         return R.ok();
     }
+    @ApiOperation(value = "单个机器标签")
+    @GetMapping("/getEquipmentToLabel")
+    public ResponseModel<?> getEquipmentToLabel(String equipmentId) {
+        TEquipment tEquipment = equipmentService.getById(equipmentId);
+        if(tEquipment==null||tEquipment.getId()==null){
+            return R.fail(ResponseCodesEnum.A0001);
+        }
+        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();
+                String[] split = equipmentIds.split(",");
+                if(split.length>0){
+                    for(int j=0;j<split.length;j++){
+                        if(split[j].equals(equipmentId)){
+                            i++;
+                        }
+                    }
+                }
+                if(i>0){
+                    returnList.add(tLabel);
+                }
+            }
+            return R.ok(returnList);
+        }else {
+            return R.ok(returnList);
+        }
+
+    }
 }