Jelajahi Sumber

fix:“优化删除分组标签、修改分组标签接口“

soobin 1 tahun lalu
induk
melakukan
dc7848fe20
1 mengubah file dengan 48 tambahan dan 47 penghapusan
  1. 48 47
      src/main/java/com/szwl/controller/TLabelController.java

+ 48 - 47
src/main/java/com/szwl/controller/TLabelController.java

@@ -95,20 +95,20 @@ public class TLabelController {
             return R.fail(ResponseCodesEnum.A0001);
         }
     }
-    @ApiOperation(value = "添加标签")
-    @GetMapping("/delete")
-    public ResponseModel<?> delete(String id,String adminId) {
-        if(StringUtils.isNotEmpty(id)&&StringUtils.isNotEmpty(adminId)){
-            TLabel label = labelService.getById(id);
-            if(label!=null&&label.getAdminId()!=null){
-                if(adminId.equals(label.getAdminId().toString())){
-                    labelService.removeById(id);
-                    return R.ok();
-                }
+    @ApiOperation(value = "批量删除分组标签")
+    @PostMapping("/delete")
+    public ResponseModel<?> delete(@RequestBody Long[] ids) {
+        if(ids==null){
+            return R.fail(ResponseCodesEnum.A0001);
+        }
+        if(ids.length > 0){
+            ArrayList<Long> idList = new ArrayList<>();
+            for(int i = 0;i < ids.length; i++){
+                idList.add(ids[i]);
             }
+            labelService.removeByIds(idList);
         }
-
-        return R.fail("删除失败");
+        return R.ok();
 
     }
     @ApiOperation(value = "获取标签列表")
@@ -159,42 +159,43 @@ public class TLabelController {
     public ResponseModel<?> update(@RequestBody TLabel label) {
         if(StringUtils.isNotEmpty(label.getName())&&StringUtils.isNotEmpty(label.getType())&&label.getAdminId()!=null){
             label.setModifyDate(new Date());
-            List<String> ids = new ArrayList<>();
-            if(label.getType().equals("0")){
-                String adminNames = label.getAdminNames();
-                if(StringUtils.isNotEmpty(adminNames)){
-                    List<String> adminNamelist = JSON.parseArray(adminNames, String.class);
-                    for(String username:adminNamelist){
-                        LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
-                        query.like(TAdmin::getUsername,username);
-                        List<TAdmin> list = adminService.list(query);
-                        TAdmin tAdmin = list.get(0);
-                        ids.add(String.valueOf(tAdmin.getId()));
-                    }
-                }
-            }
-            if(label.getType().equals("1")){
-                String equipmentNames = label.getEquipmentNames();
-                if(StringUtils.isNotEmpty(equipmentNames)){
-                    List<String> equipmentNamelist = JSON.parseArray(equipmentNames, String.class);
-                    for(String name:equipmentNamelist){
-                        LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
-                        query.like(TEquipment::getName,name);
-                        List<TEquipment> list = equipmentService.list(query);
-                        TEquipment equipment = list.get(0);
-                        ids.add(String.valueOf(equipment.getId()));
-                    }
+            labelService.updateById(label);
+//            List<String> ids = new ArrayList<>();
+//            if(label.getType().equals("0")){
+//                String adminNames = label.getAdminNames();
+//                if(StringUtils.isNotEmpty(adminNames)){
+//                    List<String> adminNamelist = JSON.parseArray(adminNames, String.class);
+//                    for(String username:adminNamelist){
+//                        LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
+//                        query.like(TAdmin::getUsername,username);
+//                        List<TAdmin> list = adminService.list(query);
+//                        TAdmin tAdmin = list.get(0);
+//                        ids.add(String.valueOf(tAdmin.getId()));
+//                    }
+//                }
+//            }
+//            if(label.getType().equals("1")){
+//                String equipmentNames = label.getEquipmentNames();
+//                if(StringUtils.isNotEmpty(equipmentNames)){
+//                    List<String> equipmentNamelist = JSON.parseArray(equipmentNames, String.class);
+//                    for(String name:equipmentNamelist){
+//                        LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
+//                        query.like(TEquipment::getName,name);
+//                        List<TEquipment> list = equipmentService.list(query);
+//                        TEquipment equipment = list.get(0);
+//                        ids.add(String.valueOf(equipment.getId()));
+//                    }
+//                }
 
-                }
-            }
-            if(ids.size()>0){
-                if(label.getType().equals("0")){
-                    label.setAdminIds(ids.toString());
-                }
-                if(label.getType().equals("1")){
-                    label.setEquipmentIds(ids.toString());
-                }
-            }
+//            }
+//            if(ids.size()>0){
+//                if(label.getType().equals("0")){
+//                    label.setAdminIds(ids.toString());
+//                }
+//                if(label.getType().equals("1")){
+//                    label.setEquipmentIds(ids.toString());
+//                }
+//            }
         }else {
             return R.fail(ResponseCodesEnum.A0001);
         }