删除单警柜模块的无效方法

.gitignore

@@ -61,3 +61,4 @@ Thumbs.db
 /jyzb-boot/pom.xml
 /.idea/encodings.xml
 /jyzb-api/jyzb-api.iml
+/jyzb-boot/pom.xml

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/CabinetBoxReq.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -54,5 +55,7 @@ public class CabinetBoxReq extends BaseRequest {
     @ApiModelProperty(value = "警员id")
     private String policeId;
 
+
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/CabinetReq.java

@@ -85,7 +85,7 @@ public class CabinetReq extends BaseRequest {
 //    /**
 //     * 单警柜与箱门一对多关系
 //     */
-////    private List<CabinetBox> list;
+//    private List<CabinetBox> list;
 //     private List<CabinetBox> a ;
 
     private static final long serialVersionUID = 1L;

jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetController.java

@@ -32,19 +32,7 @@ public class CabinetController {
     @Resource
     private CabinetBoxService cabinetBoxService;
 
-    @PostMapping("/AddCabinet")
-    @ApiOperation("添加单警柜")
-    public ResponseResult addCabinet(@RequestBody Map<String,Object> msg) {
-        ResponseResult returnMsg = cabinetService.addCabinet(msg);
-        return returnMsg;
-    }
 
-    @PostMapping("/DeleteCabinet")
-    @ApiOperation("删除单警柜")
-    public ResponseResult deleteCabinet(@RequestBody Map<String,Object> msg) {
-        ResponseResult returnMsg = cabinetService.deleteCabinet(msg);
-        return returnMsg;
-    }
 
     @PostMapping("/ShowCabinet")
     @ApiOperation("查询单警柜")
@@ -53,12 +41,6 @@ public class CabinetController {
         return returnMsg;
     }
 
-    @PostMapping("/UpdateCabinet")
-    @ApiOperation("修改单警柜信息")
-    public ResponseResult updateCabinet(@RequestBody Map<String,Object> msg) {
-        ResponseResult returnMsg =cabinetService.updateCabinet(msg);
-        return returnMsg;
-    }
 
     @PostMapping("/ErrorState")
     @ApiOperation("单警柜状态变更")

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/CabinetMapper.java

@@ -20,7 +20,6 @@ public interface CabinetMapper extends BaseMapper<Cabinet> {
 
     Map<String, Object> getOneCabinet(String id);
 
-    void deleteCabinet(String id);
 
     void updateCabinet(Cabinet cabinet);
 
@@ -30,7 +29,7 @@ public interface CabinetMapper extends BaseMapper<Cabinet> {
 
     List<String> getAllCabinetBoxId(String id);
 
-    Map<String, Object> getCabinetByCabinetNum(String cabinetNum);
+
 
     List<String> getAllCabinetIdByHighest();
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/CabinetService.java

@@ -12,15 +12,13 @@ import java.util.Map;
 
 public interface CabinetService extends IService<Cabinet> {
 
-    ResponseResult addCabinet(Map<String, Object> msg);
 
-    ResponseResult deleteCabinet(Map<String, Object> msg);
+
 
     List<String> getAllCabinetId(Map<String, Object> orgId);
 
     Map<String, Object> getOneCabinet(String cabinetId);
 
-    ResponseResult updateCabinet(Map<String, Object> msg);
 
     ResponseResult changeCabinetState(Map<String, Object> msg);
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/CabinetServiceImpl.java

@@ -57,71 +57,7 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
 
     private static final String REDIS_CABINET = "Cabinet_";
 
-    @Override
-    public ResponseResult addCabinet(Map<String, Object> msg) {
-        // 进行参数校验
-        try {
-            checkNotBlank(msg.get("orgId"), "orgId不能为空");
-            checkNotBlank(msg.get("name"), "name不能为空");
-            //checkNotBlank(msg.get("location"), "location不能为空");
-            checkNotBlank(msg.get("num"), "num不能为空");
-            checkNotBlank(msg.get("cabinetNum"), "cabinetNum不能为空");
-        } catch (IllegalArgumentException e) {
-            return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, e.getMessage());
-        }
-
-        String cabinetNum = msg.get("cabinetNum").toString();
-
-        //查询传入的组织机构id是否存在
-        Long onePubOrg = pubOrgMapper.getOnePubOrg(msg.get("orgId").toString());
-        if (onePubOrg == null || onePubOrg.equals("")) {
-            return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, "该组织机构不存在");
-        }
-        //查询是否有重复的cabinetNum
-        Map<String, Object> hashCabinetNum = cabinetMapper.getCabinetByCabinetNum(cabinetNum);
-        if (hashCabinetNum != null) {
-            return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, "主柜编号重复");
-        }
-        Cabinet cabinet = new Cabinet();
-        //将警员相关信息添加到警员表
-        //生成一个uuid
-        String uuid = UUID.randomUUID().toString().replaceAll("-", "");
-        //生成当前时间
-        Date currentDate = DateTimeUtil.getCurrentDateTime();
-        cabinet.setId(uuid);
-        cabinet.setCreateTime(currentDate);
-        cabinet.setUpdateTime(currentDate);
-        cabinet.setOrgId((Long) msg.get("orgId"));
-        cabinet.setName((String) msg.get("name"));
-        //cabinet.setUpdateUser((String) msg.get("updateUser"));
-        cabinet.setLocation((String) msg.get("location"));
-        cabinet.setNum((Integer) msg.get("num"));
-        cabinet.setCabinetNum(cabinetNum);
-        cabinetMapper.addCabinet(cabinet);
-        /**
-         * 更新缓存
-         * */
-        //构建Redis缓存键
-        String redisKey = REDIS_CABINET + "true" + '_' + msg.get("orgId").toString();
-        // 从 Redis 中获取数据
-        List<Map<String, Object>> cachedDataTrue = redisUtils.findCachedData(redisKey);
-        if (cachedDataTrue != null) {
-            cachedDataTrue.add(0, msg);
-            //将查询结果存入 Redis 中
-            redisUtils.set(redisKey, cachedDataTrue);
-        }
-        //构建Redis缓存键
-        redisKey = REDIS_CABINET + "false" + '_' + msg.get("orgId").toString();
-        // 从 Redis 中获取数据
-        List<Map<String, Object>> cachedDataFalse = redisUtils.findCachedData(redisKey);
-        if (cachedDataFalse != null) {
-            cachedDataFalse.add(0, msg);
-            //将查询结果存入 Redis 中
-            redisUtils.set(redisKey, cachedDataFalse);
-        }
 
-        return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS, uuid);
-    }
 
     @Override
     public Map<String, Object> getOneCabinet(String id) {
@@ -129,23 +65,7 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
         return cabinetMapper.getOneCabinet(id);
     }
 
-    @Override
-    public ResponseResult deleteCabinet(Map<String, Object> msg) {
-        // 进行参数校验
-        try {
-            checkNotBlank(msg.get("cabinetList"), "cabinetList不能为空");
-        } catch (IllegalArgumentException e) {
-            return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, e.getMessage());
-        }
 
-        //批量删除操作
-        List<Object> cabinetList = (List<Object>) msg.get("cabinetList");
-        for (Object cabinetId : cabinetList) {
-            cabinetMapper.deleteCabinet(cabinetId.toString());
-        }
-
-        return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
-    }
 
     //查询某组织机构的所有子机构
     public List<String> getSubIds(String id) {
@@ -160,50 +80,7 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
         return subIds;
     }
 
-    @Override
-    public ResponseResult updateCabinet(Map<String, Object> msg) {
-        // 进行参数校验
-        try {
-            checkNotBlank(msg.get("id"), "id不能为空");
-            checkNotBlank(msg.get("cabinetNum"), "cabinetNum不能为空");
-            checkNotBlank(msg.get("name"), "name不能为空");
-            checkNotBlank(msg.get("orgId"), "orgId不能为空");
-        } catch (IllegalArgumentException e) {
-            return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, e.getMessage());
-        }
 
-        String cabinetNum = msg.get("cabinetNum").toString();
-
-        //查询传入的组织机构id是否存在
-        Long onePubOrg = pubOrgMapper.getOnePubOrg(msg.get("orgId").toString());
-        if (onePubOrg == null || onePubOrg.equals("")) {
-            return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, "该组织机构不存在");
-        }
-
-        //查询是否有重复的cabinetNum
-        Map<String, Object> hashCabinetNum = cabinetMapper.getCabinetByCabinetNum(cabinetNum);
-        //判断policeCode是否有变动
-        String oldCabinetNum = cabinetMapper.getCabinetNumById(msg.get("id").toString());
-        if (oldCabinetNum != null && !oldCabinetNum.equals(cabinetNum)) {
-            if (hashCabinetNum != null) {
-                return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, "主柜编号重复");
-            }
-        }
-
-        Cabinet cabinet = new Cabinet();
-        //生成当前时间
-        Date currentDate = DateTimeUtil.getCurrentDateTime();
-        cabinet.setUpdateTime(currentDate);
-        cabinet.setId((String) msg.get("id"));
-        cabinet.setCabinetNum((String) msg.get("cabinetNum"));
-        cabinet.setName((String) msg.get("name"));
-        cabinet.setOrgId((Long) msg.get("orgId"));
-        cabinet.setLocation((String) msg.get("location"));
-        //cabinet.setUpdateUser((String) msg.get("updateUser"));
-        //cabinet.setState((Integer) msg.get("errorState"));
-        cabinetMapper.updateCabinet(cabinet);
-        return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
-    }
 
     @Override
     public ResponseResult changeCabinetState(Map<String, Object> msg) {
@@ -529,6 +406,7 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
         Cabinet cabinet1 = this.getOne(eq);
         Integer oldNum = cabinet1.getNum();
         Integer totalBoxNum = cabinet1.getNum()+req.getNum();
+        List<CabinetBox> objects = new ArrayList<>();
         //循环新增箱数信息
         for (int i= oldNum+1;i<=totalBoxNum;i++){
             CabinetBox cabinetBox = new CabinetBox();
@@ -538,9 +416,12 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
             cabinetBox.setCabinetId(req.getId());
             cabinet.setState(1);
             cabinetBox.setNum(i);
-            //保存
-            cabinetBoxService.save(cabinetBox);
+            //保存到list
+            objects.add(cabinetBox);
+
         }
+        //批量插入
+        cabinetBoxService.saveBatch(objects);
         //总箱门数就是原来的箱门数+新增的箱门数
         cabinet.setNum(totalBoxNum);
         return this.updateById(cabinet);

jyzb-biz/src/main/resources/mapper/CabinetMapper.xml

@@ -53,10 +53,6 @@
         where c.id=#{id} and c.org_id_int =o.org_id
     </select>
 
-    <delete id="deleteCabinet">
-        delete from base_cabinet w
-        where w.id =#{id}
-    </delete>
 
     <update id="updateCabinet">
         update base_cabinet p
@@ -100,11 +96,7 @@
         where cabinet_id=#{id}
     </select>
 
-    <select id="getCabinetByCabinetNum" resultType="Map">
-        select id
-        from base_cabinet w
-        where cabinet_num=#{cabinetNum};
-    </select>
+
 
     <select id="getAllCabinetIdByHighest" resultType="String">
         select id

jyzb-boot/pom.xml

@@ -10,7 +10,7 @@
     <artifactId>jyzb-boot</artifactId>
     <version>1.0.0</version>
     <name>jyzb-boot</name>
-<!--    <packaging>war</packaging>-->
+    <packaging>war</packaging>
     <dependencies>
 
         <dependency>