新增警员禁用警柜版

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdatePolicemanReq.java

@@ -15,7 +15,7 @@ public class UpdatePolicemanReq extends BaseRequest {
 
     @NotBlank(message = "警员主键不能为空", groups = {edit.class, delete.class, detail.class})
     private String id;
-
+    private String serialNum;
     @NotBlank(message = "警员名字不能为空", groups = {add.class,edit.class})
     private String name;
 

jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/PolicemanExceptionEnum.java

@@ -36,7 +36,11 @@ public enum PolicemanExceptionEnum implements IExceptionEnum {
     /**
      * 该警员已经在审核流中，请勿重复操作
      */
-    POLICE_IS_IN_EXAMINE(CommonConstant.DEFAULT_USER_ERROR_CODE,"该警员已经在审核流中或已经调岗完成，请勿重复操作")
+    POLICE_IS_IN_EXAMINE(CommonConstant.DEFAULT_USER_ERROR_CODE,"该警员已经在审核流中或已经调岗完成，请勿重复操作"),
+    /**
+     * 该警员已经在审核流中，请勿重复操作
+     */
+    POLICE_IS_BUSY(CommonConstant.DEFAULT_USER_ERROR_CODE,"警员调岗中，无法操作")
     ;
     /**
      * 错误编码

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

@@ -66,6 +66,15 @@ public class PoliceController {
         return ApiRes.success(policemanService.GetPoliceWithoutOrg());
     }
 
+    @PostMapping(path="/DeletePoliceFromCab",name="警柜禁用警员信息#logType=30")
+    @ApiOperation("删除警员信息")
+    public ApiRes<Boolean> DeletePoliceFromCab(@RequestBody @Validated(ValidationApi.delete.class) UpdatePolicemanReq req) {
+        boolean b = policemanService.DeletePoliceFromCab(req);
+        if (!b){
+            return ApiRes.failure("删除失败");
+        }
+        return ApiRes.success(b);
+    }
     @PostMapping(path="/DeletePolice",name="删除警员信息#logType=30")
     @ApiOperation("删除警员信息")
     public ApiRes<Boolean> DeletePolice(@RequestBody @Validated(ValidationApi.delete.class) UpdatePolicemanReq req) {
@@ -75,7 +84,6 @@ public class PoliceController {
         }
         return ApiRes.success(b);
     }
-
     //添加人脸和指纹照片或修改
     @PostMapping(path="/addFaceAndfinger",name="添加警员人脸照片和指纹照片#logType=30")
     @ApiOperation("添加警员人脸照片和指纹照片")

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

@@ -40,6 +40,8 @@ public interface PolicemanService extends IService<Policeman> {
     boolean DeletePolice(UpdatePolicemanReq req);
 
 
+    //删除警员
+    boolean DeletePoliceFromCab(UpdatePolicemanReq req);
     //修改警员信息
     boolean UpdatePolice(UpdatePolicemanReq req);
     boolean UpdatePoliceFromCab(CabinetPolicemanReq req);

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

@@ -487,6 +487,44 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         return removeById(req.getId());
 
     }
+    /**
+     * 禁用警员信息
+     *
+     * @param req
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean DeletePoliceFromCab(UpdatePolicemanReq req) {
+        //通过警员id查询警员信息
+        Policeman policeman = PoliceExist(req.getId());
+
+        if (policeman.getState().equals(2))//说明当前警员调岗中不可操作
+        {
+            throw new ServiceException(PolicemanExceptionEnum.POLICE_IS_BUSY);
+        }
+        else
+        {
+            policeman.setState(req.getState());
+        }
+
+        PubOrg orgInfos=pubOrgService.getOne(new LambdaQueryWrapper<PubOrg>().eq(PubOrg::getOrgId, req.getOrgId()));
+        orgInfos.setPoliceUpdateTime(DateTime.now());
+        Cabinet cabinetOrg= cabinetService.getOne(new LambdaQueryWrapper<Cabinet>().eq(Cabinet::getCabinetNum, req.getSerialNum()));
+        orgInfos.setPoliceUpdateService(cabinetOrg.getName()+"-"+cabinetOrg.getCabinetNum());
+        pubOrgService.updateById(orgInfos);
+        //人员信息修改之后推送至本地主机和单警柜
+        List<Cabinet> cabinets= cabinetService.list(new LambdaQueryWrapper<Cabinet>().eq(Cabinet::getOrgIdInt, req.getCabinetOrgId()));//拿到组织机构下所有的警柜用于消息推送
+        if (cabinets.size()>0)
+        {
+            cabinets.forEach(t-> MQ.SendMsg("cabinetMsg",t.getCabinetNum(),"policeChange"));
+        }
+
+        MQ.SendMsg("warehouseMsg",req.getOrgId().toString(),"policeChange");//推送至仓库主机
+        return this.updateById(policeman);
+
+
+    }
 
 
     /**
@@ -832,8 +870,10 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         cpDto.setActionUpdateTime(String.valueOf(orgInfo.getPoliceUpdateTime()));
         cpDto.setOrgName(orgInfo.getOrgName());
 
-        // 获取组织机构下的警员列表
-        List<Policeman> policeList = this.list(new LambdaQueryWrapper<Policeman>().eq(Policeman::getOrgId, org));
+        // 获取组织机构下的警员列表，state字段为字符串 "1"
+        List<Policeman> policeList = this.list(new LambdaQueryWrapper<Policeman>()
+                .eq(Policeman::getOrgId, org)
+                .eq(Policeman::getState, 1));
 
         // 转换警员信息为 PoliceDetailDto
         List<PoliceDetailDto> policeDtoList = new ArrayList<>();