修改警员模块

.gitignore

@@ -62,3 +62,12 @@ Thumbs.db
 /.idea/encodings.xml
 /jyzb-api/jyzb-api.iml
 /jyzb-boot/pom.xml
+/jyzb-boot/src/main/resources/application-local.yml
+/.idea/modules.xml
+/.idea/modules.xml
+/jyzb-biz/jyzb-biz.iml
+/.idea/modules.xml
+/jyzb-boot/jyzb-boot.iml
+/jyzb-mq/jyzb-mq-producer/jyzb-mq-producer.iml
+/jyzb-mq/jyzb-mq-consumer/jyzb-mq-consumer.iml
+/.idea/modules.xml

.idea/modules.xml

@@ -7,7 +7,6 @@
       <module fileurl="file://$PROJECT_DIR$/jyzb-boot/jyzb-boot.iml" filepath="$PROJECT_DIR$/jyzb-boot/jyzb-boot.iml" />
       <module fileurl="file://$PROJECT_DIR$/jyzb-mq/jyzb-mq-consumer/jyzb-mq-consumer.iml" filepath="$PROJECT_DIR$/jyzb-mq/jyzb-mq-consumer/jyzb-mq-consumer.iml" />
       <module fileurl="file://$PROJECT_DIR$/jyzb-mq/jyzb-mq-producer/jyzb-mq-producer.iml" filepath="$PROJECT_DIR$/jyzb-mq/jyzb-mq-producer/jyzb-mq-producer.iml" />
-      <module fileurl="file://$PROJECT_DIR$/jyzb-process/jyzb-process.iml" filepath="$PROJECT_DIR$/jyzb-process/jyzb-process.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/CabinetDto.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 @Data
 
@@ -74,5 +75,6 @@ public class CabinetDto implements Serializable {
 
 
 
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/PoliceDto.java

+package com.junmp.jyzb.api.bean.dto;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PoliceDto  {
+
+    //单警柜编号
+    private String cabinetNum;
+    //单警柜主柜名
+    private String cabinetName;
+    //组织机构名称
+    private String orgName;
+    //组织机构id
+    private Long orgId;
+    //警员输出信息
+    private List<PolicemanDto> policemanlist;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/PoliceFingerDto.java

+package com.junmp.jyzb.api.bean.dto;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class PoliceFingerDto implements Serializable {
+
+    private String name;
+
+    private String fingerInfo;
+
+}

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/PolicemanDto.java

+package com.junmp.jyzb.api.bean.dto;
+
+import com.junmp.jyzb.api.bean.dto.PoliceFingerDto;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PolicemanDto {
+
+    private String id;
+
+    private String name;
+
+    private String cabinetBoxId;
+
+    private String policeCode;
+
+    private String sex;
+
+    private String faceInfo;
+
+    private String password;
+
+    private String photo;
+
+    private String phone;
+
+    //指纹信息列表
+    private List<PoliceFingerDto> fingersList;
+
+    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

@@ -22,7 +22,6 @@ public class CabinetReq extends BaseRequest {
     /**
      * 单警柜编号
      */
-    @NotNull(message = "单警柜编号不能为空", groups = {edit.class, delete.class, detail.class})
     @ApiModelProperty(value = "单警柜编号")
     private String cabinetNum;
 
@@ -35,14 +34,12 @@ public class CabinetReq extends BaseRequest {
     /**
      * 单警柜名称
      */
-    @NotNull(message = "单警柜名称不能为空", groups = {edit.class, delete.class, detail.class})
     @ApiModelProperty(value = "单警柜名称")
     private String name;
 
     /**
      * 组织机构号
      */
-    @NotNull(message = "组织机构号不能为空", groups = {edit.class, delete.class, detail.class})
     @ApiModelProperty(value = "组织机构号")
     private String orgId;
 
@@ -82,11 +79,10 @@ public class CabinetReq extends BaseRequest {
     @ApiModelProperty(value = "本机及下级")
     private String includeLowerLevel;
 
-//    /**
-//     * 单警柜与箱门一对多关系
-//     */
-//    private List<CabinetBox> list;
-//     private List<CabinetBox> a ;
+    /**
+     * 排序字段
+     */
+    private String sort;
 
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

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

 package com.junmp.jyzb.api.bean.query;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.junmp.v2.common.bean.request.BaseRequest;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class PolicemanReq extends BaseRequest {
 
-    @NotNull(message = "警员主键不能为空", groups = {edit.class, delete.class, detail.class})
+    @NotBlank(message = "警员主键不能为空", groups = {edit.class, delete.class, detail.class})
     private String id;
 
-    @NotNull(message = "警员名字不能为空", groups = {edit.class, delete.class, detail.class})
     private String name;
 
+    @NotBlank(message = "箱门id不能为空", groups = {edit.class, delete.class, detail.class})
     private String cabinetBoxId;
 
-    @NotNull(message = "组织机构不能为空", groups = {edit.class, delete.class, detail.class})
-    private String orgId;
-
-    private Long orgIdInt;
+    private Long orgId;
 
     private Long departmentId;
 
@@ -37,6 +33,10 @@ public class PolicemanReq extends BaseRequest {
 
     private String doorCode;
 
+    //账号
+    private String account;
+
+    //密码
     private String password;
 
     private String photo;

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

+package com.junmp.jyzb.api.bean.req;
+
+import com.junmp.v2.common.bean.request.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UpdateCabinetReq extends BaseRequest {
+    /**
+     * 单警柜ID
+     */
+    @NotNull(message = "单警柜ID主键不能为空", groups = {edit.class, delete.class, detail.class})
+    @ApiModelProperty(value = "单警柜ID")
+    private String id;
+
+    /**
+     * 单警柜编号
+     */
+    @NotNull(message = "单警柜编号不能为空", groups = {edit.class, delete.class, detail.class})
+    @ApiModelProperty(value = "单警柜编号")
+    private String cabinetNum;
+
+    /**
+     * 箱数
+     */
+    @ApiModelProperty(value = "箱数")
+    private Integer num;
+
+    /**
+     * 单警柜名称
+     */
+    @NotNull(message = "单警柜名称不能为空", groups = {edit.class, delete.class, detail.class})
+    @ApiModelProperty(value = "单警柜名称")
+    private String name;
+
+    /**
+     * 组织机构号
+     */
+    @NotNull(message = "组织机构号不能为空", groups = {edit.class, delete.class, detail.class})
+    @ApiModelProperty(value = "组织机构号")
+    private String orgId;
+
+    /**
+     * 位置信息
+     */
+    @ApiModelProperty(value = "位置信息")
+    private String location;
+
+    /**
+     * 单警柜当前状态，0正常，1异常
+     */
+    @ApiModelProperty(value = "单警柜当前状态，0正常，1异常")
+    private Integer state;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 更新人员
+     */
+    @ApiModelProperty(value = "更新人员")
+    private String updateUser;
+
+    /**
+     * 是否包含本级及下级，true为包含，false为不包含，只显示本级
+     */
+    @ApiModelProperty(value = "本机及下级")
+    private String includeLowerLevel;
+
+//    /**
+//     * 单警柜与箱门一对多关系
+//     */
+//    private List<CabinetBox> list;
+//     private List<CabinetBox> a ;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

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

+package com.junmp.jyzb.api.bean.req;
+
+import com.junmp.v2.common.bean.request.BaseRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UpdatePolicemanReq extends BaseRequest {
+
+    @NotNull(message = "警员主键不能为空", groups = {edit.class, delete.class, detail.class})
+    private String id;
+
+    @NotNull(message = "警员名字不能为空", groups = {edit.class, delete.class, detail.class})
+    private String name;
+
+    private String cabinetBoxId;
+
+    @NotNull(message = "组织机构不能为空", groups = {edit.class, delete.class, detail.class})
+    private String orgId;
+
+    private Long orgIdInt;
+
+    private Long departmentId;
+
+    @NotNull(message = "警员编号不能为空", groups = {edit.class, delete.class, detail.class})
+    private String policeCode;
+
+    @NotNull(message = "性别不能为空", groups = {edit.class, delete.class, detail.class})
+    private String sex;
+
+    private String faceInfo;
+
+    private Boolean isCreatedAccount;
+
+    private String doorCode;
+
+    private String password;
+
+    @NotNull(message = "电话不能为空", groups = {edit.class, delete.class, detail.class})
+    private String photo;
+
+    private String phone;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    @NotNull(message = "身份证号不能为空", groups = {edit.class, delete.class, detail.class})
+    private String idCard;
+
+    private String updateUser;
+
+    private Integer state;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/Dto/CabinetDto.java

@@ -16,14 +16,12 @@ public class CabinetDto extends BaseRequest {
     /**
      * 单警柜ID
      */
-    @NotNull(message = "单警柜ID主键不能为空", groups = {edit.class, delete.class, detail.class})
     @ApiModelProperty(value = "单警柜ID")
     private String id;
 
     /**
      * 单警柜编号
      */
-    @NotNull(message = "单警柜编号不能为空", groups = {edit.class, delete.class, detail.class})
     @ApiModelProperty(value = "单警柜编号")
     private String cabinetNum;
 
@@ -36,14 +34,12 @@ public class CabinetDto extends BaseRequest {
     /**
      * 单警柜名称
      */
-    @NotNull(message = "单警柜名称不能为空", groups = {edit.class, delete.class, detail.class})
     @ApiModelProperty(value = "单警柜名称")
     private String name;
 
     /**
      * 组织机构号
      */
-    @NotNull(message = "组织机构号不能为空", groups = {edit.class, delete.class, detail.class})
     @ApiModelProperty(value = "组织机构号")
     private String orgId;
 

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

@@ -3,6 +3,7 @@ package com.junmp.jyzb.controller;
 import com.junmp.jyzb.Dto.CabinetDto;
 import com.junmp.jyzb.api.bean.query.CabinetBoxReq;
 import com.junmp.jyzb.api.bean.query.CabinetReq;
+import com.junmp.jyzb.api.bean.req.UpdateCabinetReq;
 import com.junmp.jyzb.entity.Cabinet;
 import com.junmp.jyzb.entity.CabinetBox;
 import com.junmp.jyzb.service.CabinetBoxService;
@@ -49,6 +50,8 @@ public class CabinetController {
         return returnMsg;
     }
 
+
+
     @PostMapping("/GetCabinetDetail")
     @ApiOperation("查询单警柜及其箱号信息")
     public ResponseResult getCabinetDetail(@RequestBody Map<String, Object> msg){
@@ -65,17 +68,14 @@ public class CabinetController {
 
     @PostMapping("/AddCabinetInfo")
     @ApiOperation("添加单警柜信息（新）")
-    public ApiRes<Boolean> addCabinetInfo(@RequestBody CabinetReq req){
-        boolean result = cabinetService.addCabinetInfo(req);
-        if (!result){
-            return ApiRes.failure("操作失败");
-        }
-        return ApiRes.success(result);
+    public ApiRes<String> addCabinetInfo(@RequestBody UpdateCabinetReq req){
+        String cabinetId = cabinetService.addCabinetInfo(req);
+        return ApiRes.success(cabinetId);
     }
 
     @PostMapping("/DeleteCabinetInfo")
     @ApiOperation("删除单警柜信息（新）")
-    public ApiRes<Boolean> deleteCabinetInfo(@RequestBody CabinetReq req) {
+    public ApiRes<Boolean> deleteCabinetInfo(@RequestBody UpdateCabinetReq req) {
         return ApiRes.success(cabinetService.deleteCabinetInfo(req));
     }
 
@@ -89,8 +89,6 @@ public class CabinetController {
         return ApiRes.success(allCabinetList);
     }
 
-
-
     //通过单警柜id查询单个箱门及其箱门信息
     @PostMapping("/ShowOneCabinet")
     @ApiOperation("查询单个单警柜及其箱门信息（新）")
@@ -107,7 +105,7 @@ public class CabinetController {
 
     @PostMapping("/UpdateCabinetInfo")
     @ApiOperation("修改单警柜信息（新）")
-    public ApiRes<Boolean> updateCabinetInfo(@RequestBody CabinetReq req) {
+    public ApiRes<Boolean> updateCabinetInfo(@RequestBody UpdateCabinetReq req) {
         boolean result = cabinetService.updateCabinetInfo(req);
         if (!result){
             return ApiRes.failure("操作失败");

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

 package com.junmp.jyzb.controller;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.junmp.jyzb.api.bean.query.CabinetReq;
+import com.junmp.jyzb.api.bean.dto.PoliceDto;
+import com.junmp.jyzb.api.bean.dto.PolicemanDto;
 import com.junmp.jyzb.api.bean.query.PolicemanReq;
+import com.junmp.jyzb.api.bean.req.UpdatePolicemanReq;
 import com.junmp.jyzb.entity.Policeman;
 import com.junmp.jyzb.service.PolicemanService;
 import com.junmp.jyzb.utils.ResponseResult;
+import com.junmp.v2.common.bean.request.ValidationApi;
 import com.junmp.v2.common.bean.response.ApiRes;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -27,55 +30,40 @@ public class PoliceController {
 
     @PostMapping("/AddPoliceman")
     @ApiOperation("添加警员信息")
-    public ResponseResult addPoliceman(@RequestBody Map<String,Object> msg) {
-        ResponseResult returnMsg = policemanService.addPoliceman(msg);
-        return returnMsg;
+    public ApiRes<String> AddPoliceman(@RequestBody UpdatePolicemanReq req) {
+        String policeId = policemanService.AddPoliceman(req);
+        return ApiRes.success(policeId);
     }
 
-
-    @PostMapping("/AddFaceInfo")
-    @ApiOperation("添加警员面部信息")
-    public ApiRes<Boolean> addFaceInfo(@RequestBody PolicemanReq req) {
-        boolean b = policemanService.addFaceInfo(req);
+    @PostMapping("/DeletePolice")
+    @ApiOperation("删除警员信息")
+    public ApiRes<Boolean> DeletePolice(@RequestBody UpdatePolicemanReq req) {
+        boolean b = policemanService.DeletePolice(req);
         if (!b){
-            return ApiRes.failure("添加失败");
+            return ApiRes.failure("删除失败");
         }
         return ApiRes.success(b);
     }
 
-    @PostMapping("/updateFaceInfo")
-    @ApiOperation("修改、删除人脸信息")
-    public ApiRes<Boolean> updateFaceInfo(@RequestBody PolicemanReq req) {
-        boolean b = policemanService.updateFaceInfo(req);
+
+    @PostMapping("/ChangePoliceState")
+    @ApiOperation("修改警员状态")
+    public ApiRes<Boolean> ChangePoliceState(@RequestBody UpdatePolicemanReq req) {
+        boolean b = policemanService.ChangePoliceState(req);
         if (!b){
-            return ApiRes.failure("操作失败");
+            return ApiRes.failure("修改失败");
         }
         return ApiRes.success(b);
     }
 
-    @PostMapping("/searchFaceInfo")
-    @ApiOperation("查找人脸信息")
-    public ApiRes<Policeman> searchFaceInfo(@RequestBody PolicemanReq req) {
-        Policeman policeman = policemanService.searchFaceInfo(req);
-        if (ObjectUtil.isEmpty(policeman)){
-            return ApiRes.failure("未找到警员信息");
+    @PostMapping("/UpdatePolice")
+    @ApiOperation("修改警员信息")
+    public ApiRes<Boolean> UpdatePolice(@RequestBody UpdatePolicemanReq req) {
+        boolean b = policemanService.UpdatePolice(req);
+        if (!b){
+            return ApiRes.failure("修改失败");
         }
-        return ApiRes.success(policeman);
-    }
-
-
-    @PostMapping("/DeletePolice")
-    @ApiOperation("删除警员信息")
-    public ResponseResult deletePolice(@RequestBody Map<String,Object> msg) {
-        ResponseResult returnMsg = policemanService.deletePolice(msg);
-        return returnMsg;
-    }
-
-    @PostMapping("/ChangePoliceState")
-    @ApiOperation("修改警员状态")
-    public ResponseResult ChangePoliceState(@RequestBody Map<String,Object> msg) {
-        ResponseResult returnMsg = policemanService.changePoliceState(msg);
-        return returnMsg;
+        return ApiRes.success(b);
     }
 
     @PostMapping("/ShowPolice")
@@ -85,50 +73,103 @@ public class PoliceController {
         return returnMsg;
     }
 
+
+    //根据组织机构id查询,只查询本级，不包含下级
+     @PostMapping("/ShowPoliceList")
+    @ApiOperation("查询某个组织机构下的所有警员信息")
+    public ApiRes<PoliceDto> GetAllPolicemanList(Long orgId){
+         PoliceDto policeDto = policemanService.GetAllPolicemanList(orgId);
+         return ApiRes.success(policeDto);
+     }
+
+
+
+    /**
+     * 通过警员id查询警员信息
+     * @param req
+     * @return
+     */
     @PostMapping("/GetPoliceDetail")
     @ApiOperation("查询单个警员信息")
-    public ResponseResult getOnePolice(@RequestBody Map<String, Object> msg) {
-        ResponseResult returnMsg = policemanService.getOnePolice(msg);
-        return returnMsg;
+    public ApiRes<PolicemanDto> GetOnePolice(@RequestBody PolicemanReq req) {
+        return ApiRes.success(policemanService.GetOnePolice(req));
     }
 
-    @PostMapping("/UpdatePolice")
-    @ApiOperation("修改警员信息")
-    public ResponseResult updatePolice(@RequestBody Map<String,Object> msg) {
-        ResponseResult returnMsg = policemanService.updatePolice(msg);
-        return returnMsg;
-    }
 
-    //todo 更新查询所有
+    /**
+     * 根据单警柜id查询出单警柜下面箱门绑定的警员信息
+     * @param
+     * @return
+     */
     @PostMapping("/GetPoliceData")
     @ApiOperation("查询与单警柜绑定的警员信息")  //根据单警柜id查询
-    public ResponseResult getPoliceData(@RequestBody Map<String, Object> cabinetId){
+    public ApiRes<PoliceDto> GetPoliceData(String id){
         //获取该组织机构下所有警员的id
-        ResponseResult returnMsg =policemanService.getPoliceData(cabinetId);
-        return returnMsg;
+        PoliceDto policeDto = policemanService.GetPoliceData(id);
+        return ApiRes.success(policeDto);
     }
 
+
+
     @PostMapping("/ChangePoliceOrg")
     @ApiOperation("警员调岗")
     public ResponseResult changePoliceOrg(@RequestBody Map<String, Object> cabinetId){
 
         return null;
     }
-    /**
-         * @author lxh
-         * @description 单警柜所在的单位下面所有的人员
-         * @since 2023/7/19 10:10
-         * @param
-         * @return
-         **/
-    @PostMapping("/policeList")
-    @ApiOperation("人员列表")
-    public ApiRes<List<Policeman>> policeList(@RequestBody CabinetReq req){
-        List<Policeman> orgPoliceman = policemanService.getOrgPoliceman(req);
-        if (orgPoliceman.isEmpty()){
-            return ApiRes.failure("未查到人员信息");
+
+
+    @PostMapping("/AddFaceInfo")
+    @ApiOperation("添加警员面部信息")
+    public ApiRes<Boolean> AddFaceInfo(@RequestBody PolicemanReq req) {
+        boolean b = policemanService.AddFaceInfo(req);
+        if (!b){
+            return ApiRes.failure("添加失败");
+        }
+        return ApiRes.success(b);
+    }
+
+    @PostMapping("/UpdateFaceInfo")
+    @ApiOperation("修改、删除人脸信息")
+    public ApiRes<Boolean> UpdateFaceInfo(@RequestBody UpdatePolicemanReq req) {
+        boolean b = policemanService.UpdateFaceInfo(req);
+        if (!b){
+            return ApiRes.failure("操作失败");
         }
-        return ApiRes.success(orgPoliceman);
+        return ApiRes.success(b);
     }
 
+    @PostMapping("/SearchFaceInfo")
+    @ApiOperation("查找人脸信息")
+    public ApiRes<Policeman> SearchFaceInfo(@RequestBody PolicemanReq req) {
+        Policeman policeman = policemanService.SearchFaceInfo(req);
+        if (ObjectUtil.isEmpty(policeman)){
+            return ApiRes.failure("未找到警员信息");
+        }
+        return ApiRes.success(policeman);
+    }
+
+    //警员绑定账号
+    @PostMapping("/PoliceBindUser")
+    @ApiOperation("警员绑定账号")
+    public ApiRes<Boolean> PoliceBindUser(@RequestBody PolicemanReq req){
+        boolean b = policemanService.PoliceBindUser(req);
+        if (!b){
+            return ApiRes.failure("操作失败");
+        }
+        return ApiRes.success(b);
+    }
+
+    /**
+     * 人员绑定箱门
+     */
+    @PostMapping("/PoliceBindBox")
+    @ApiOperation("人员绑定箱门")
+    public ApiRes<Boolean> PoliceBindBox(@RequestBody @Validated(ValidationApi.edit.class) PolicemanReq req){
+        boolean b = policemanService.PoliceBindBox(req);
+        if (!b){
+            return ApiRes.failure("操作失败");
+        }
+        return ApiRes.success(b);
+    }
 }

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

@@ -31,7 +31,7 @@ public class PolicemanFingerController implements PolicemanFingerDoc {
 
     }
 
-    @PostMapping("/updateFingerInfo")
+    @PostMapping("/UpdateFingerInfo")
     @ApiOperation("修改指纹信息")
     public ApiRes<Boolean> updateFingerInfo(@RequestBody @Validated(PolicemanFingerReq.edit.class) PolicemanFingerReq req) {
         return ApiRes.success(policeFingerService.updateFingerInfo(req)) ;

jyzb-biz/src/main/java/com/junmp/jyzb/entity/Cabinet.java

@@ -42,7 +42,7 @@ public class Cabinet implements Serializable {
      */
     @ApiModelProperty(value = "新版本组织机构号")
     @TableField("org_id_int")
-    private long orgId;
+    private Long orgId;
 
 
     /**

jyzb-biz/src/main/java/com/junmp/jyzb/entity/EquipmentType.java

@@ -62,8 +62,6 @@ public class EquipmentType implements Serializable {
     private String parentIds;
 
 
-
-
     @TableField(fill = FieldFill.INSERT_UPDATE, value = "create_time")
     private Date createTime;
 

jyzb-biz/src/main/java/com/junmp/jyzb/entity/PoliceFinger.java

 package com.junmp.jyzb.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
@@ -19,6 +16,7 @@ import javax.validation.constraints.NotNull;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@TableName("base_police_finger")
 public class PoliceFinger implements Serializable {
     @TableId(value = "id",type= IdType.AUTO)
     private Integer id;
@@ -32,10 +30,10 @@ public class PoliceFinger implements Serializable {
     @TableField(value = "finger_info")
     private String fingerInfo;
 
-    @TableField(value = "create_time")
+    @TableField(fill = FieldFill.INSERT, value = "create_time")
     private Date createTime;
 
-    @TableField(value = "update_time")
+    @TableField(fill = FieldFill.UPDATE, value = "update_time")
     private Date updateTime;
 
     private static final long serialVersionUID = 1L;

jyzb-biz/src/main/java/com/junmp/jyzb/entity/Policeman.java

 package com.junmp.jyzb.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.junmp.jyzb.entity.Cabinet;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -22,7 +19,8 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @TableName("base_policeman")
 public class Policeman implements Serializable {
-    @TableId(value = "id")
+
+    @TableId(value = "id",type = IdType.ASSIGN_UUID)
     private String id;
 
     @TableField(value = "name")
@@ -62,10 +60,10 @@ public class Policeman implements Serializable {
     @TableField(value = "phone")
     private String phone;
 
-    @TableField(value = "create_time")
+    @TableField(fill = FieldFill.INSERT, value = "create_time")
     private Date createTime;
 
-    @TableField(value = "update_time")
+    @TableField(fill = FieldFill.UPDATE, value = "update_time")
     private Date updateTime;
 
     @TableField(value = "id_card")
@@ -77,5 +75,8 @@ public class Policeman implements Serializable {
     @TableField(value = "state")
     private Integer state;
 
+    @TableField(value = "user_id")
+    private Long UserId;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/entity/User.java

+package com.junmp.jyzb.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("sys_user")
+public class User implements Serializable {
+
+    private Long userId;
+
+    @TableField(value = "real_name")
+    private String realName;
+    private String nickName;
+    private String account;
+    private String password;
+    //头像，存的为文件的id
+    private Long avatar;
+    private Date birthday;
+    private String sex;
+    private String email;
+    private String phone;
+    private String tel;
+    private String superAdminFlag;
+    private String statusFlag;
+    private Integer userType;
+    private String lastLoginIp;
+    private Date lastLoginTime;
+    private Integer delFlag;
+
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    private Long createUser;
+
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
+    private Date updateTime;
+
+    private Long updateUser;
+    private Integer appFlag;
+}

jyzb-biz/src/main/java/com/junmp/jyzb/exception/enums/CabinetBoxExceptionEnum.java

+package com.junmp.jyzb.exception.enums;
+
+import com.junmp.v2.common.constant.CommonConstant;
+import com.junmp.v2.common.exception.IExceptionEnum;
+import lombok.Getter;
+
+@Getter
+public enum CabinetBoxExceptionEnum implements IExceptionEnum {
+    /**
+     * 箱子信息不存在，箱门id错误
+     */
+    CABINETBOX_ISNOT_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE,"箱子信息不存在，箱门id错误"),
+
+    ;
+    /**
+     * 错误编码
+     */
+    private final Integer code;
+
+    /**
+     * 提示用户信息
+     */
+    private final String message;
+
+    CabinetBoxExceptionEnum(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}
+

jyzb-biz/src/main/java/com/junmp/jyzb/exception/enums/CabinetExceptionEnum.java

@@ -19,10 +19,7 @@ import lombok.Getter;
  */
 @Getter
 public enum CabinetExceptionEnum implements IExceptionEnum {
-    /**
-     * 组织机构不存在
-     */
-    PUBORG_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"组织机构不存在"),
+
     /**
      * 单警柜编号重复
      */

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

@@ -22,9 +22,14 @@ public enum PolicemanExceptionEnum implements IExceptionEnum {
      * 警员不存在
      */
     POLICEMAN_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"警员不存在"),
-    ;
 
+    /**
+     * 警员编号已经存在，警员编号重复
+     *
+     */
+    POLICECODE_IS_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE,"警员编号已经存在，警员编号重复"),
 
+    ;
     /**
      * 错误编码
      */

jyzb-biz/src/main/java/com/junmp/jyzb/exception/enums/PubOrgExceptionEnum.java

+package com.junmp.jyzb.exception.enums;
+
+import com.junmp.v2.common.constant.CommonConstant;
+import com.junmp.v2.common.exception.IExceptionEnum;
+import lombok.Getter;
+
+@Getter
+public enum PubOrgExceptionEnum implements IExceptionEnum {
+    /**
+     * 组织机构不存在
+     */
+    PUBORG_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"组织机构不存在"),
+    ;
+    /**
+     * 错误编码
+     */
+    private final Integer code;
+
+    /**
+     * 提示用户信息
+     */
+    private final String message;
+
+    PubOrgExceptionEnum(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}

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

@@ -14,9 +14,9 @@ public interface CabinetBoxMapper extends BaseMapper<CabinetBox> {
 
     void changeCabinetState(CabinetBox cabinetBox);
 
-    String getOneCabinetBox(String cabinetBoxId);
 
     List<CabinetBox> selectByIdCabinetBoxes(String id);
 
 
+
 }
\ No newline at end of file

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

@@ -49,4 +49,6 @@ public interface CabinetMapper extends BaseMapper<Cabinet> {
     List<Map<String, Object>> getCabinetByOrgId(String orgId);
 
     String getOrgByCabinet(String cabinetId);
+
+
 }
\ No newline at end of file

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

 package com.junmp.jyzb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.junmp.jyzb.entity.CabinetBox;
 import com.junmp.jyzb.entity.Policeman;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -10,13 +11,9 @@ import java.util.Map;
 @Mapper
 public interface PolicemanMapper extends BaseMapper<Policeman> {
 
-    void addPoliceman(Policeman policeman);
 
     Map<String, Object> getOnePolice(String id);
 
-    void deletePolice(String id);
-
-    void updatePolice(Policeman police);
 
     List<String> getAllPoliceId(String orgId);
 
@@ -26,13 +23,11 @@ public interface PolicemanMapper extends BaseMapper<Policeman> {
 
     void addFaceInfo(Policeman police);
 
-    void changePoliceState(Policeman police);
 
     List<String> getChildren(String id);
 
     List<String> getAllBoxIdByCabinet(String cabinetId);
 
-    List<String> getPoliceByPoliceCode(String policeCode);
 
     List<Map<String,Object>> getAllPolice();
 
@@ -43,4 +38,8 @@ public interface PolicemanMapper extends BaseMapper<Policeman> {
     List<Map<String, Object>> getAllPolicemanByOrg(String orgId);
 
     List<Map<String, Object>> getAllPolicemanByOrgList(List<String> orgId);
+
+    List<Policeman> SearchBoxBindPolice(List<String> cabinetBoxes);
+
+    List<Policeman> SearchPoliceList(String id);
 }
\ No newline at end of file

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

+package com.junmp.jyzb.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.junmp.jyzb.entity.User;
+
+public interface SysuserMapper extends BaseMapper<User> {
+}

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

@@ -3,6 +3,7 @@ package com.junmp.jyzb.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.junmp.jyzb.api.bean.query.CabinetReq;
 import com.junmp.jyzb.entity.CabinetBox;
+import com.junmp.jyzb.entity.Policeman;
 
 import java.util.List;
 import java.util.Map;
@@ -12,4 +13,6 @@ public interface CabinetBoxService extends IService<CabinetBox> {
     List<Map<String, Object>> getAllBoxMsg(String id);
 
     List<CabinetBox> getCabinetBoxList(CabinetReq req);
+
+
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.junmp.jyzb.Dto.CabinetDto;
 import com.junmp.jyzb.api.bean.query.CabinetBoxReq;
 import com.junmp.jyzb.api.bean.query.CabinetReq;
+import com.junmp.jyzb.api.bean.req.UpdateCabinetReq;
 import com.junmp.jyzb.entity.Cabinet;
 import com.junmp.jyzb.utils.ResponseResult;
 
@@ -35,14 +36,14 @@ public interface CabinetService extends IService<Cabinet> {
      * @param req
      * @return
      */
-    boolean addCabinetInfo(CabinetReq req) ;
+    String addCabinetInfo(UpdateCabinetReq req) ;
 
     /**
      * 删除单警柜
      * @param req
      * @return
      */
-    boolean deleteCabinetInfo(CabinetReq req);
+    boolean deleteCabinetInfo(UpdateCabinetReq req);
 
     /**
      * 查询单警柜信息，通过组织机构id进行查询
@@ -65,7 +66,7 @@ public interface CabinetService extends IService<Cabinet> {
      * @param req
      * @return
      */
-    boolean updateCabinetInfo(CabinetReq req);
+    boolean updateCabinetInfo(UpdateCabinetReq req);
 
     /**
      * 箱门绑定人员

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

 package com.junmp.jyzb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.junmp.jyzb.api.bean.query.CabinetReq;
+import com.junmp.jyzb.api.bean.dto.PoliceDto;
+import com.junmp.jyzb.api.bean.dto.PolicemanDto;
 import com.junmp.jyzb.api.bean.query.PolicemanReq;
-import com.junmp.jyzb.entity.PoliceFinger;
+import com.junmp.jyzb.api.bean.req.UpdatePolicemanReq;
 import com.junmp.jyzb.entity.Policeman;
 import com.junmp.jyzb.utils.ResponseResult;
 
@@ -11,40 +12,53 @@ import java.util.List;
 import java.util.Map;
 
 public interface PolicemanService extends IService<Policeman> {
-    ResponseResult addPoliceman(Map<String, Object> msg);
 
-    ResponseResult getOnePolice(Map<String, Object> id);
+    //添加警员
+    String AddPoliceman(UpdatePolicemanReq req);
 
-    ResponseResult deletePolice(Map<String, Object> msg);
 
-    ResponseResult updatePolice(Map<String, Object> msg);
+    //获取单个警员信息
+    PolicemanDto GetOnePolice(PolicemanReq req);
 
-    List<String> getAllPoliceId(Map<String, Object> orgId);
 
-    ResponseResult deleteFinger(Map<String, Object> msg);
+    //删除警员
+    boolean DeletePolice(UpdatePolicemanReq req);
+
+
+    //修改警员信息
+    boolean UpdatePolice(UpdatePolicemanReq req);
+
+    List<String> getAllPoliceId(Map<String, Object> orgId);
 
     List<String> getAllPoliceIdByCabinet(Map<String, Object> cabinetId);
 
-    ResponseResult addFingerInfo(Map<String, Object> msg);
-    //修改指纹信息
-    boolean updateFingerInfo(PoliceFinger req);
-    //查询指纹信息
-    ResponseResult searchFingerInfo(Map<String, Object> msg);
 
-    boolean addFaceInfo(PolicemanReq req);
+    boolean AddFaceInfo(PolicemanReq req);
+
 
-    ResponseResult changePoliceState(Map<String, Object> msg);
+    //修改警员状态
+    boolean ChangePoliceState(UpdatePolicemanReq req);
 
     //List<Map<String, Object>> getAllPoliceman(List<String> allPoliceId);
 
     ResponseResult getAllPoliceman(Map<String, Object> orgId);
 
-    ResponseResult getPoliceData(Map<String, Object> cabinetId);
+    //通过组织机构id查询警员列表
+    PoliceDto GetAllPolicemanList(Long orgId);
+
+
+    //根据单警柜id查询警员列表
+    PoliceDto GetPoliceData(String id);
+
+    boolean UpdateFaceInfo(UpdatePolicemanReq req);
+
+    Policeman SearchFaceInfo(PolicemanReq req);
+
+
+
+    boolean PoliceBindUser(PolicemanReq req);
 
-    boolean updateFaceInfo(PolicemanReq req);
+    boolean PoliceBindBox(PolicemanReq req);
 
-    Policeman searchFaceInfo(PolicemanReq req);
 
-    //通过单警柜获取组织机构id,再获取组织机构下的所有警员信息
-    List<Policeman> getOrgPoliceman(CabinetReq req);
 }

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

+package com.junmp.jyzb.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.entity.User;
+
+
+public interface SysuserService extends IService<User> {
+}

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

@@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.api.bean.query.CabinetReq;
 import com.junmp.jyzb.entity.CabinetBox;
+import com.junmp.jyzb.entity.Policeman;
 import com.junmp.jyzb.mapper.CabinetBoxMapper;
+import com.junmp.jyzb.mapper.PoliceFingerMapper;
+import com.junmp.jyzb.mapper.PolicemanMapper;
 import com.junmp.jyzb.service.CabinetBoxService;
 import org.springframework.stereotype.Service;
 
@@ -22,6 +25,12 @@ public class CabinetBoxServiceImpl extends ServiceImpl<CabinetBoxMapper, Cabinet
     @Resource
     private CabinetBoxService cabinetBoxService;
 
+    @Resource
+    private PolicemanMapper policemanMapper;
+
+    @Resource
+    private PoliceFingerMapper policeFingerMapper;
+
     @Override
     public List<Map<String, Object>> getAllBoxMsg(String id) {
         return cabinetBoxMapper.getBoxMsg(id);
@@ -40,4 +49,5 @@ public class CabinetBoxServiceImpl extends ServiceImpl<CabinetBoxMapper, Cabinet
                 .eq(ObjectUtil.isNotEmpty(req.getId()),CabinetBox::getCabinetId, req.getId()));
         return cabinetBoxList;
     }
+
 }

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

@@ -173,7 +173,7 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
 
         return true;
     }
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public Boolean updateEquipment(UpdateEquipmentTypeReq req) {
         EquipmentType type = this.queryEqType(req);

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

@@ -80,8 +80,14 @@ public class PoliceFingerServiceImpl extends ServiceImpl<PoliceFingerMapper, Pol
     //    删除指纹信息
     @Override
     public boolean deleteFinger(PolicemanFingerReq req) {
-        this.removeById(req.getId());
-        return true;
+        req.getId();
+        PoliceFinger one = getOne(new LambdaQueryWrapper<PoliceFinger>()
+                .eq(ObjectUtil.isNotNull(req.getId()), PoliceFinger::getId, req.getId())
+                .eq(ObjectUtil.isNotNull(req.getPoliceId()), PoliceFinger::getPoliceId, req.getPoliceId()));
+        if (ObjectUtil.isNull(one)){
+            throw new ServiceException(PolicemanFingerExceptionEnum.POLICEMAN_FINGER_NOTEXISTS);
+        }
+        return removeById(one);
     }
 
     /**

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

+package com.junmp.jyzb.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.junmp.jyzb.entity.User;
+import com.junmp.jyzb.mapper.SysuserMapper;
+import com.junmp.jyzb.service.SysuserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class SysuserServiceImpl extends ServiceImpl<SysuserMapper, User> implements SysuserService {
+}

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

@@ -28,11 +28,6 @@
         where f.id =#{id}
   </update>
 
-  <select id="getOneCabinetBox" resultType="String">
-        select id
-        from base_cabinet_box b
-        where b.id =#{cabinetBoxId}
-    </select>
     <select id="selectByIdCabinetBoxes" resultType="com.junmp.jyzb.entity.CabinetBox"
             parameterType="java.lang.String">
         select * from base_cabinet_box b where b.cabinet_id=#{id}

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

@@ -5,8 +5,7 @@
         <id property="id" column="id" />
         <result property="cabinetNum" column="cabinet_num" />
         <result property="name" column="name" />
-        <result property="orgIdInt" column="org_id_int" />
-        <result property="orgId" column="org_id" />
+        <result property="orgId" column="org_id_int" />
         <result property="departmentId" column="department_id" />
         <result property="location" column="location" />
         <result property="state" column="state" />
@@ -249,4 +248,5 @@ SET price_total = (
         left join pub_org o on c.org_id_int =o.org_id
         where c.org_id_int = #{orgId}
     </select>
+
 </mapper>
\ No newline at end of file

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

@@ -21,14 +21,7 @@
 <!--    </collection>-->
 <!--</resultMap>-->
 
-    <insert id="addPoliceman" parameterType="com.junmp.jyzb.entity.Policeman">
-      insert into base_policeman
-            (id,org_id_int,name,police_code,sex,
-            cabinet_box_id,phone,id_card,photo,create_time,update_time)
-            values
-            (#{id},#{orgId},#{name},#{policeCode},#{sex},
-            #{cabinetBoxId},#{phone},#{idCard},#{photo},#{createTime},#{updateTime})
-    </insert>
+
 
     <select id="getOnePolice" resultType="Map">
         SELECT
@@ -91,26 +84,7 @@
 <!--    LEFT JOIN base_cabinet c ON p.cabinet_box_id = c.id-->
 <!--</select>-->
 
-    <delete id="deletePolice">
-        DELETE FROM base_policeman p WHERE p.id =#{id};
-    </delete>
 
-    <update id="updatePolice">
-        update base_policeman p
-        set
-        org_id=#{orgId},
-        name = #{name},
-        police_code=#{policeCode},
-        sex=#{sex},
-        isCreatedAccount=#{isCreatedAccount},
-        cabinet_box_id=#{cabinetBoxId},
-        phone=#{phone},
-        id_card=#{idCard},
-        update_user=#{updateUser},
-        photo=#{photo},
-        update_time=#{updateTime}
-        where p.id =#{id}
-    </update>
 
 <!--    <select id="getAllPoliceman" resultType="Map">-->
 <!--        select p.id,p.name as police_name,cabinet_id,org_id,police_code,sex,face_info,photo ,f.name as finger_name,finger_info-->
@@ -148,11 +122,6 @@
       where p.id=#{id}
     </update>
 
-    <update id="changePoliceState">
-        update base_policeman p
-        set state = #{state}
-        where p.id =#{id}
-    </update>
 
     <select id="getChildren" resultType="String">
         select org_id from pub_org where org_parent_id = #{id}
@@ -164,9 +133,6 @@
         where cabinet_id=#{cabinetId}
     </select>
 
-    <select id="getPoliceByPoliceCode" resultType="java.lang.String">
-        select police_code from base_policeman where police_code =#{policeCode}
-    </select>
 
     <select id="getPoliceCodeById" resultType="java.lang.String">
         select police_code from base_policeman where id =#{id}
@@ -219,4 +185,21 @@ WHERE o.org_id IN
     </foreach>
 </select>
 
+    <select id="SearchBoxBindPolice" resultType="com.junmp.jyzb.entity.Policeman">
+        select * from base_policeman p
+        left join base_Cabinet_box bc on p.cabinet_box_id = bc.id
+        where p.cabinet_box_id in
+        <foreach item="item" collection="list" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+    <select id="SearchPoliceList" resultType="com.junmp.jyzb.entity.Policeman">
+        select p.id,p.org_id_int,p.`name`,p.sex,p.phone,p.photo,p.police_code,p.cabinet_box_id,p.`password`,p.face_info from base_policeman p
+        left join base_Cabinet_box bc on p.cabinet_box_id = bc.id
+        where p.cabinet_box_id in
+                       (SELECT bc.id as boxid FROM base_cabinet_box bc
+                       LEFT JOIN base_cabinet b ON b.id=bc.cabinet_id
+                       WHERE b.id=#{id}) and p.state=1
+    </select>
+
 </mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.junmp.jyzb.mapper.SysuserMapper">
+  <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.User">
+    <id column="user_id"  property="userId" />
+    <result column="real_name"  property="realName" />
+    <result column="nick_name"  property="nickName" />
+    <result column="account"  property="account" />
+    <result column="password"  property="password" />
+    <result column="avatar"  property="avatar" />
+    <result column="birthday"  property="birthday" />
+    <result column="sex"  property="sex" />
+    <result column="email"  property="email" />
+    <result column="phone" property="phone" />
+    <result column="tel"  property="tel" />
+    <result column="super_admin_flag" property="superAdminFlag" />
+    <result column="status_flag"  property="statusFlag" />
+    <result column="user_type"  property="userType" />
+    <result column="last_login_ip"  property="lastLoginIp" />
+    <result column="last_login_time"  property="lastLoginTime" />
+    <result column="del_flag"  property="delFlag" />
+    <result column="create_time"  property="createTime" />
+    <result column="create_user"  property="createUser" />
+    <result column="update_time"  property="updateTime" />
+    <result column="update_user"  property="updateUser" />
+    <result column="app_flag"  property="appFlag" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    user_id,real_name,nick_name,account,password,avatar,birthday,sex,email,phone,tel,super_admin_flag,
+        status_flag,user_type,last_login_ip,last_login_time,del_flag,create_time,create_user,update_time,update_user,app_flag
+  </sql>
+</mapper>
\ No newline at end of file

jyzb-common/jyzb-common.iml

-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
-    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.4" level="project" />
-  </component>
-</module>
\ No newline at end of file

jyzb-mq/jyzb-mq-consumer/jyzb-mq-consumer.iml

 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+<module version="4">
   <component name="FacetManager">
     <facet type="Spring" name="Spring">
       <configuration />
     </facet>
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-amqp:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:2.3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.10.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
-    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
-    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.18.1" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.7.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.7.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.platform:junit-platform-engine:1.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.6.28" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.22" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.22" level="project" />
-    <orderEntry type="library" name="Maven: org.objenesis:objenesis:3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mockito:mockito-junit-jupiter:3.6.28" level="project" />
-    <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.44" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.44" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.5" level="project" />
   </component>
 </module>
\ No newline at end of file

jyzb-mq/jyzb-mq-producer/jyzb-mq-producer.iml

 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+<module version="4">
   <component name="FacetManager">
     <facet type="Spring" name="Spring">
       <configuration />
     </facet>
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-amqp:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:2.3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.10.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
-    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
-    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.18.1" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.7.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.7.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.platform:junit-platform-engine:1.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.6.28" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.22" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.22" level="project" />
-    <orderEntry type="library" name="Maven: org.objenesis:objenesis:3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mockito:mockito-junit-jupiter:3.6.28" level="project" />
-    <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.44" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.44" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.5" level="project" />
   </component>
 </module>
\ No newline at end of file

pom.xml

@@ -262,6 +262,11 @@
                 <version>3.0.3</version>
             </dependency>
 
+            <!--   bcrypt依赖  -->
+            <dependency>
+                <groupId>org.springframework.security</groupId>
+                <artifactId>spring-security-web</artifactId>
+            </dependency>
         </dependencies>
 
     </dependencyManagement>