Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw

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

.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/CabinetBoxDto.java

+package com.junmp.jyzb.api.bean.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CabinetBoxDto implements Serializable {
+    /**
+     * 主键ID
+     */
+    @ApiModelProperty(value = "主键ID")
+    private String id;
+
+    /**
+     * 箱号
+     */
+    @ApiModelProperty(value = "箱号")
+    private Integer num;
+
+    /**
+     * 异常状态:1正常/0异常
+     */
+    @ApiModelProperty(value = "异常状态:1正常/0异常")
+    private Integer state;
+
+    /**
+     * 异常原因
+     */
+    @ApiModelProperty(value = "异常原因")
+    private String errorMsg;
+
+
+}

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

 package com.junmp.jyzb.api.bean.dto;
 
-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.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 @Data
-
-public class CabinetDto implements Serializable {
+public class CabinetDto implements Serializable{
     /**
      * 单警柜ID
      */
@@ -48,31 +44,9 @@ public class CabinetDto implements Serializable {
     @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;
-
 
+    private List<CabinetBoxDto> cabinetBoxList;
 
-    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/UpdateCabinetBoxReq.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.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UpdateCabinetBoxReq extends BaseRequest {
+    @NotBlank(message = "箱门id不能为空",groups = {add.class,edit.class})
+    private  String id;
+    @NotBlank(message = "箱门状态不能为空",groups = {edit.class})
+    private  Integer state;
+
+    private String errorMsg;
+
+    //单警柜编号
+    @NotBlank(message = "单警柜编号不能为空",groups = {add.class})
+    private String cabinetNum;
+
+    @NotNull(message = "箱号不能为空",groups = {add.class})
+    private Integer num;
+}

jyzb-biz/src/main/java/com/junmp/jyzb/Dto/CabinetDto.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateCabinetReq.java

-package com.junmp.jyzb.Dto;
+package com.junmp.jyzb.api.bean.req;
 
-import com.junmp.jyzb.entity.CabinetBox;
 import com.junmp.v2.common.bean.request.BaseRequest;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class CabinetDto extends BaseRequest {
+public class UpdateCabinetReq extends BaseRequest {
     /**
      * 单警柜ID
      */
-    @NotNull(message = "单警柜ID主键不能为空", groups = {edit.class, delete.class, detail.class})
+    @NotBlank(message = "单警柜ID主键不能为空", groups = {edit.class, detail.class})
     @ApiModelProperty(value = "单警柜ID")
     private String id;
 
     /**
      * 单警柜编号
      */
-    @NotNull(message = "单警柜编号不能为空", groups = {edit.class, delete.class, detail.class})
+    @NotBlank(message = "单警柜编号不能为空", groups = {add.class,edit.class, detail.class})
     @ApiModelProperty(value = "单警柜编号")
     private String cabinetNum;
 
@@ -36,20 +36,21 @@ public class CabinetDto extends BaseRequest {
     /**
      * 单警柜名称
      */
-    @NotNull(message = "单警柜名称不能为空", groups = {edit.class, delete.class, detail.class})
+    @NotBlank(message = "单警柜名称不能为空", groups = {add.class,edit.class, detail.class})
     @ApiModelProperty(value = "单警柜名称")
     private String name;
 
     /**
      * 组织机构号
      */
-    @NotNull(message = "组织机构号不能为空", groups = {edit.class, delete.class, detail.class})
+    @NotBlank(message = "组织机构号不能为空", groups = {add.class,edit.class, detail.class})
     @ApiModelProperty(value = "组织机构号")
     private String orgId;
 
     /**
      * 位置信息
      */
+    @NotBlank(message = "位置信息不能为空", groups = {add.class, edit.class})
     @ApiModelProperty(value = "位置信息")
     private String location;
 
@@ -83,10 +84,13 @@ public class CabinetDto extends BaseRequest {
     @ApiModelProperty(value = "本机及下级")
     private String includeLowerLevel;
 
-    /**
-     * 单警柜与箱门一对多关系
-     */
-     private List<CabinetBox> list ;
+
+    //箱门信息列表
+    private List<UpdateCabinetBoxReq> cabinetBoxList;
+
+    //单警柜id列表
+    @NotBlank(message = "单警柜不能为空", groups = {delete.class})
+    private List<String> cabinetList;
 
     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/jyzb-biz.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="module" module-name="jyzb-api" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.20" 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: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.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.yaml:snakeyaml:1.27" 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-beans: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-context:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-db-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-config-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.4.31" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.4" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:junmp-v2-common:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.oshi:oshi-core:6.3.2" level="project" />
-    <orderEntry type="library" name="Maven: net.java.dev.jna:jna:5.12.1" level="project" />
-    <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:5.12.1" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.27" level="project" />
-    <orderEntry type="library" name="Maven: com.github.whvcse:easy-captcha:1.6.2" level="project" />
-    <orderEntry type="module" module-name="jyzb-api" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-validator-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.1.7.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
-    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:auth-sdk:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:auth-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-cache-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-cache-memory:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:security-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-cache-redis:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.4.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.4.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.4.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:3.3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.9.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-jwt-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:system-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:scanner-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:message-api:1.0.0" level="project" />
-    <orderEntry type="module" module-name="jyzb-common" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-log-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-job-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:31.1-jre" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.12.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
   </component>
 </module>
\ No newline at end of file

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

+package com.junmp.jyzb.controller;
+
+import com.junmp.jyzb.api.bean.req.UpdateCabinetBoxReq;
+import com.junmp.jyzb.service.CabinetBoxService;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@Slf4j
+@RequestMapping("/CabinetBox")
+@Api(tags = "箱门信息模块")
+public class CabinetBoxController {
+    @Resource
+    private CabinetBoxService cabinetBoxService;
+    //添加箱门信息
+    @PostMapping("/AddBoxInfo")
+    @ApiOperation("添加箱门信息")
+    public ApiRes<Boolean> AddBoxInfo(@RequestBody @Validated(ValidationApi.add.class) UpdateCabinetBoxReq req){
+        boolean b = cabinetBoxService.AddBoxInfo(req);
+        if (!b){
+            return ApiRes.failure("添加失败");
+        }
+        return ApiRes.success(b);
+    }
+}

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

 package com.junmp.jyzb.controller;
 
-import com.junmp.jyzb.Dto.CabinetDto;
+import com.junmp.jyzb.api.bean.dto.CabinetDto;
 import com.junmp.jyzb.api.bean.query.CabinetBoxReq;
 import com.junmp.jyzb.api.bean.query.CabinetReq;
-import com.junmp.jyzb.entity.Cabinet;
+import com.junmp.jyzb.api.bean.req.UpdateCabinetReq;
 import com.junmp.jyzb.entity.CabinetBox;
 import com.junmp.jyzb.service.CabinetBoxService;
 import com.junmp.jyzb.service.CabinetService;
 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.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -33,56 +35,58 @@ public class CabinetController {
     private CabinetBoxService cabinetBoxService;
 
 
-
-    @PostMapping("/ShowCabinet")
-    @ApiOperation("查询单警柜")
-    public ResponseResult showCabinet(@RequestBody Map<String, Object> msg){
-        ResponseResult returnMsg = cabinetService.getAllCabinet(msg);
-        return returnMsg;
-    }
-
-
     @PostMapping("/ErrorState")
     @ApiOperation("单警柜状态变更")
-    public ResponseResult changeCabinetState(@RequestBody Map<String,Object> msg) {
-        ResponseResult returnMsg = cabinetService.changeCabinetState(msg);
-        return returnMsg;
+    public ApiRes<Boolean> ChangeCabinetState(@RequestBody UpdateCabinetReq req) {
+        boolean result = cabinetService.ChangeCabinetState(req);
+        if (!result){
+            return ApiRes.failure("操作失败");
+        }
+        return ApiRes.success(result);
     }
 
-    @PostMapping("/GetCabinetDetail")
-    @ApiOperation("查询单警柜及其箱号信息")
-    public ResponseResult getCabinetDetail(@RequestBody Map<String, Object> msg){
-        ResponseResult returnMsg = cabinetService.getCabinetDetail(msg);
-        return returnMsg;
+    @PostMapping("/AddCabinetInfo")
+    @ApiOperation("添加单警柜信息")
+    public ApiRes<String> addCabinetInfo(@RequestBody @Validated(ValidationApi.add.class) UpdateCabinetReq req){
+        String cabinetId = cabinetService.addCabinetInfo(req);
+        return ApiRes.success(cabinetId);
     }
 
-    @PostMapping("/GetCabinetByOrgId")
-    @ApiOperation("根据组织机构获取单警柜及箱号信息")
-    public ResponseResult getCabinetByOrgId(@RequestBody Map<String, Object> msg){
-        ResponseResult returnMsg = cabinetService.getCabinetByOrgId(msg);
-        return returnMsg;
+    @PostMapping("/DeleteCabinetInfo")
+    @ApiOperation("删除单警柜信息")
+    public ApiRes<Boolean> deleteCabinetInfo(@RequestBody @Validated(ValidationApi.delete.class) UpdateCabinetReq req) {
+        return ApiRes.success(cabinetService.deleteCabinetInfo(req));
     }
 
-    @PostMapping("/AddCabinetInfo")
-    @ApiOperation("添加单警柜信息（新）")
-    public ApiRes<Boolean> addCabinetInfo(@RequestBody CabinetReq req){
-        boolean result = cabinetService.addCabinetInfo(req);
+    @PostMapping("/UpdateCabinetInfo")
+    @ApiOperation("修改单警柜信息")
+    public ApiRes<Boolean> updateCabinetInfo(@RequestBody @Validated(ValidationApi.edit.class) UpdateCabinetReq req) {
+        boolean result = cabinetService.updateCabinetInfo(req);
         if (!result){
             return ApiRes.failure("操作失败");
         }
         return ApiRes.success(result);
     }
 
-    @PostMapping("/DeleteCabinetInfo")
-    @ApiOperation("删除单警柜信息（新）")
-    public ApiRes<Boolean> deleteCabinetInfo(@RequestBody CabinetReq req) {
-        return ApiRes.success(cabinetService.deleteCabinetInfo(req));
+
+
+    //通过单警柜id查询单个箱门及其箱门信息
+    @PostMapping("/ShowOneCabinet")
+    @ApiOperation("查询单个单警柜及其箱门信息")
+    public ApiRes<CabinetDto> showOneCabinet(@RequestBody CabinetReq req){
+        return ApiRes.success(cabinetService.showOneCabinet(req));
     }
 
+    @PostMapping("/GetCabinetByOrgId")
+    @ApiOperation("根据组织机构获取单警柜及箱号信息")
+    public ResponseResult getCabinetByOrgId(@RequestBody Map<String, Object> msg){
+        ResponseResult returnMsg = cabinetService.getCabinetByOrgId(msg);
+        return returnMsg;
+    }
     @PostMapping("/ShowCabinetList")
-    @ApiOperation("查询单警柜列表（新）")
-    public ApiRes<List<Cabinet>> showCabinetList(@RequestBody CabinetReq req){
-        List<Cabinet> allCabinetList = cabinetService.getAllCabinetList(req);
+    @ApiOperation("查询单警柜列表")
+    public ApiRes<List<CabinetDto>> showCabinetList(@RequestBody CabinetReq req){
+        List<CabinetDto> allCabinetList = cabinetService.getAllCabinetList(req);
         if (allCabinetList.size()<=0){
             return ApiRes.failure("查询失败,列表为null");
         }
@@ -90,33 +94,15 @@ public class CabinetController {
     }
 
 
-
-    //通过单警柜id查询单个箱门及其箱门信息
-    @PostMapping("/ShowOneCabinet")
-    @ApiOperation("查询单个单警柜及其箱门信息（新）")
-    public ApiRes<CabinetDto> showOneCabinet(@RequestBody CabinetReq req){
-        return ApiRes.success(cabinetService.showOneCabinet(req));
-    }
-
     @PostMapping("/getCabinetBoxList")
-    @ApiOperation("通过单警柜id获取箱门列表（新）")
+    @ApiOperation("通过单警柜id获取箱门列表")
     public ApiRes<List<CabinetBox>> getCabinetBoxList(@RequestBody CabinetReq req){
         return ApiRes.success(cabinetBoxService.getCabinetBoxList(req));
     }
 
 
-    @PostMapping("/UpdateCabinetInfo")
-    @ApiOperation("修改单警柜信息（新）")
-    public ApiRes<Boolean> updateCabinetInfo(@RequestBody CabinetReq req) {
-        boolean result = cabinetService.updateCabinetInfo(req);
-        if (!result){
-            return ApiRes.failure("操作失败");
-        }
-        return ApiRes.success(result);
-    }
-
     @PostMapping("/boxBindPolice")
-    @ApiOperation("箱门绑定人员（新）")
+    @ApiOperation("箱门绑定人员")
     public ApiRes<Boolean> boxBindPolice(@RequestBody CabinetBoxReq req) {
         boolean result = cabinetService.boxBindPolice(req);
         if (!result){
@@ -124,4 +110,11 @@ public class CabinetController {
         }
         return ApiRes.success(result);
     }
+
+    @PostMapping("/SearchOrgId")
+    @ApiOperation("/根据单警柜id查询组织机构id")
+    public ApiRes<Long> SearchOrgId(String id){
+        return ApiRes.success(cabinetService.SearchOrgId(id));
+    }
+
 }
\ No newline at end of file

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("未找到警员信息");
-        }
-        return ApiRes.success(policeman);
-    }
-
-
-    @PostMapping("/DeletePolice")
-    @ApiOperation("删除警员信息")
-    public ResponseResult deletePolice(@RequestBody Map<String,Object> msg) {
-        ResponseResult returnMsg = policemanService.deletePolice(msg);
-        return returnMsg;
+    @PostMapping("/UpdatePolice")
+    @ApiOperation("修改警员信息")
+    public ApiRes<Boolean> UpdatePolice(@RequestBody UpdatePolicemanReq req) {
+        boolean b = policemanService.UpdatePolice(req);
+        if (!b){
+            return ApiRes.failure("修改失败");
         }
-
-    @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错误"),
+
+    /**
+     * 箱子已经存在
+     */
+    CABINETBOX_IS_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

@@ -12,11 +12,9 @@ public interface CabinetBoxMapper extends BaseMapper<CabinetBox> {
 
     List<Map<String, Object>> getBoxMsg(String id);
 
-    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

 package com.junmp.jyzb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.junmp.jyzb.Dto.CabinetDto;
+import com.junmp.jyzb.api.bean.dto.CabinetDto;
 import com.junmp.jyzb.entity.Cabinet;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -36,7 +36,6 @@ public interface CabinetMapper extends BaseMapper<Cabinet> {
     String getCabinetNumById(String id);
 
     List<Cabinet> getAllCabinetByOrgList(List<String> allOrgId);
-    List<CabinetDto> getAllCabinetByOrgList111(List<String> allOrgId);
 
     void setCabinetSumInventory(@Param("updateId") String id);
 
@@ -49,4 +48,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

@@ -2,7 +2,9 @@ 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.req.UpdateCabinetBoxReq;
 import com.junmp.jyzb.entity.CabinetBox;
+import com.junmp.jyzb.entity.Policeman;
 
 import java.util.List;
 import java.util.Map;
@@ -12,4 +14,8 @@ public interface CabinetBoxService extends IService<CabinetBox> {
     List<Map<String, Object>> getAllBoxMsg(String id);
 
     List<CabinetBox> getCabinetBoxList(CabinetReq req);
+
+
+    //添加箱门信息
+    boolean AddBoxInfo(UpdateCabinetBoxReq req);
 }

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

 package com.junmp.jyzb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.junmp.jyzb.Dto.CabinetDto;
+import com.junmp.jyzb.api.bean.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;
 
@@ -20,13 +21,9 @@ public interface CabinetService extends IService<Cabinet> {
     Map<String, Object> getOneCabinet(String cabinetId);
 
 
-    ResponseResult changeCabinetState(Map<String, Object> msg);
-
     List<String> getAllCabinetBoxId(String id);
 
-    ResponseResult getAllCabinet(Map<String, Object> msg);
 
-    ResponseResult getCabinetDetail(Map<String, Object> msg);
 
     ResponseResult setCabinetInventory(Map<String, Object> msg);
 
@@ -35,21 +32,21 @@ 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进行查询
      * @param req
      * @return
      */
-    List<Cabinet> getAllCabinetList(CabinetReq req);
+    List<CabinetDto> getAllCabinetList(CabinetReq req);
 
 
 
@@ -65,7 +62,7 @@ public interface CabinetService extends IService<Cabinet> {
      * @param req
      * @return
      */
-    boolean updateCabinetInfo(CabinetReq req);
+    boolean updateCabinetInfo(UpdateCabinetReq req);
 
     /**
      * 箱门绑定人员
@@ -80,4 +77,13 @@ public interface CabinetService extends IService<Cabinet> {
      * @return
      */
     ResponseResult getCabinetByOrgId(Map<String, Object> msg);
+
+    /**
+     * 修改单警柜箱门状态
+     * @param req
+     * @return
+     */
+    boolean ChangeCabinetState(UpdateCabinetReq req);
+
+    Long SearchOrgId(String id);
 }

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

@@ -4,14 +4,27 @@ import cn.hutool.core.util.ObjectUtil;
 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.api.bean.req.UpdateCabinetBoxReq;
+import com.junmp.jyzb.entity.Cabinet;
 import com.junmp.jyzb.entity.CabinetBox;
+import com.junmp.jyzb.entity.Policeman;
+import com.junmp.jyzb.exception.enums.CabinetBoxExceptionEnum;
+import com.junmp.jyzb.exception.enums.CabinetExceptionEnum;
 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 com.junmp.jyzb.service.CabinetService;
+import com.junmp.v2.common.exception.base.ServiceException;
+import com.junmp.v2.common.util.BeanPlusUtil;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 @Service
 public class CabinetBoxServiceImpl extends ServiceImpl<CabinetBoxMapper, CabinetBox> implements CabinetBoxService {
@@ -22,6 +35,15 @@ public class CabinetBoxServiceImpl extends ServiceImpl<CabinetBoxMapper, Cabinet
     @Resource
     private CabinetBoxService cabinetBoxService;
 
+    @Resource
+    private PolicemanMapper policemanMapper;
+
+    @Resource
+    private PoliceFingerMapper policeFingerMapper;
+
+    @Resource
+    private CabinetService cabinetService;
+
     @Override
     public List<Map<String, Object>> getAllBoxMsg(String id) {
         return cabinetBoxMapper.getBoxMsg(id);
@@ -40,4 +62,35 @@ public class CabinetBoxServiceImpl extends ServiceImpl<CabinetBoxMapper, Cabinet
                 .eq(ObjectUtil.isNotEmpty(req.getId()),CabinetBox::getCabinetId, req.getId()));
         return cabinetBoxList;
     }
+
+    //添加箱门信息
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean AddBoxInfo(UpdateCabinetBoxReq req) {
+        CabinetBox one = cabinetBoxService.getOne(new LambdaQueryWrapper<CabinetBox>()
+                .eq(CabinetBox::getId, req.getId()));
+        if (ObjectUtil.isNotNull(one)){
+            throw new ServiceException(CabinetBoxExceptionEnum.CABINETBOX_IS_EXISTS);
+        }
+        CabinetBox cabinetBox = new CabinetBox();
+        BeanPlusUtil.copyProperties(req,cabinetBox);
+        //添加单警柜箱门信息默认状态为1
+        cabinetBox.setState(1);
+        Cabinet cabinet = cabinetService.getOne(new LambdaQueryWrapper<Cabinet>()
+                .eq(Cabinet::getCabinetNum, req.getCabinetNum()));
+        if (ObjectUtil.isNull(cabinet)){
+            throw new ServiceException(CabinetExceptionEnum.CABINET_ISNOT_EXISTS);
+        }
+        cabinetBox.setCabinetId(cabinet.getId());
+        Integer num = cabinet.getNum();
+        if (num==null){
+            num=1;
+            cabinet.setNum(num);
+        }else {
+            cabinet.setNum(cabinet.getNum()+1);
+        }
+        cabinetService.updateById(cabinet);
+        return save(cabinetBox);
+    }
+
 }

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

@@ -3,15 +3,20 @@ package com.junmp.jyzb.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.junmp.jyzb.Dto.CabinetDto;
+import com.junmp.jyzb.api.bean.dto.CabinetDto;
+import com.junmp.jyzb.api.bean.dto.CabinetBoxDto;
+import com.junmp.jyzb.api.bean.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.UpdateCabinetBoxReq;
+import com.junmp.jyzb.api.bean.req.UpdateCabinetReq;
 import com.junmp.jyzb.entity.Cabinet;
 import com.junmp.jyzb.entity.CabinetBox;
 import com.junmp.jyzb.entity.Policeman;
 import com.junmp.jyzb.entity.PubOrg;
 import com.junmp.jyzb.exception.enums.CabinetExceptionEnum;
 import com.junmp.jyzb.exception.enums.PolicemanExceptionEnum;
+import com.junmp.jyzb.exception.enums.PubOrgExceptionEnum;
 import com.junmp.jyzb.mapper.*;
 import com.junmp.jyzb.service.CabinetBoxService;
 import com.junmp.jyzb.service.CabinetService;
@@ -83,57 +88,11 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
 
 
     @Override
-    public ResponseResult changeCabinetState(Map<String, Object> msg) {
-        // 进行参数校验
-        try {
-            checkNotBlank(msg.get("cabinetId"), "cabinetId不能为空");
-            checkNotBlank(msg.get("cabinetBoxList"), "cabinetBoxList不能为空");
-            List<Map<String, Object>> boxMsg = (List<Map<String, Object>>) msg.get("cabinetBoxList");
-            for (Map<String, Object> box : boxMsg) {
-                checkNotBlank(box.get("cabinetBoxId"), "cabinetBoxId不能为空");
-                checkNotBlank(box.get("state"), "state不能为空");
-            }
-        } catch (IllegalArgumentException e) {
-            return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, e.getMessage());
-        }
-
-        //判断组织机构id是否正确
-
-        CabinetBox cabinetBox = new CabinetBox();
-        //读取单警柜id
-        cabinetBox.setCabinetId(msg.get("cabinetId").toString());
-
-        //获取cabinetBoxList
-        List<Map<String, Object>> boxMsg = (List<Map<String, Object>>) msg.get("cabinetBoxList");
-        for (Map<String, Object> box : boxMsg) {
-            cabinetBox.setId((String) box.get("cabinetBoxId"));
-            cabinetBox.setState((Integer) box.get("state"));
-            cabinetBox.setErrorMsg((String) box.get("errorMsg"));
-            cabinetBoxMapper.changeCabinetState(cabinetBox);
-        }
-        return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
-    }
-
-    @Override
     public List<String> getAllCabinetBoxId(String id) {
         List<String> msg = cabinetMapper.getAllCabinetBoxId(id);
         return msg;
     }
 
-    @Override
-    public ResponseResult getAllCabinet(Map<String, Object> msg) {
-        try {
-            checkNotBlank(msg.get("orgId"), "orgId不能为空");
-            checkNotBlank(msg.get("IncludeLowerLevel"), "IncludeLowerLevel不能为空");
-        } catch (IllegalArgumentException e) {
-            return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, e.getMessage());
-        }
-
-        List<Map<String, Object>> allCabinet = new ArrayList<>();
-
-
-        return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS, allCabinet);
-    }
 
     private List<String> getAllOrgId(CabinetReq req, String includeLowerLevel) {
         List<String> allOrg = new ArrayList<>();
@@ -151,11 +110,6 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
         allCabinet = cabinetMapper.getAllCabinetByOrgList(allOrgId);
         return allCabinet;
     }
-    private List<CabinetDto> getAllCabinetByOrg111( List<String> allOrgId) {
-        List<CabinetDto> allCabinet = new ArrayList<>();
-        allCabinet = cabinetMapper.getAllCabinetByOrgList111(allOrgId);
-        return allCabinet;
-    }
 
     @Override
     public List<String> getAllCabinetId(Map<String, Object> msg) {
@@ -196,25 +150,6 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
         return cabinetId;
     }
 
-    @Override
-    public ResponseResult getCabinetDetail(Map<String, Object> msg) {
-        // 进行参数校验
-        try {
-            checkNotBlank(msg.get("id"), "id不能为空");
-        } catch (IllegalArgumentException e) {
-            return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, e.getMessage());
-        }
-
-        String idMsg = msg.get("id").toString();
-        Map<String, Object> cabinetMsg = getOneCabinet(idMsg);
-        if (cabinetMsg == null) {
-            return new ResponseResult(HttpStatus.NO_DATA, ReturnMsg.NO_DATA, ReturnData.NO_DATA);
-        }
-        List<Map<String, Object>> allBoxMsg = cabinetBoxMapper.getBoxMsg(idMsg);
-        cabinetMsg.put("cabinetBoxList", allBoxMsg);
-
-        return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS, cabinetMsg);
-    }
 
     public ResponseResult setCabinetInventory(Map<String, Object> msg) {
         String id;
@@ -243,20 +178,18 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean addCabinetInfo(CabinetReq req) {
+    public String addCabinetInfo(UpdateCabinetReq req) {
         Cabinet cabinet = new Cabinet();
         //查询传入的组织机构id是否存在
-        LambdaQueryWrapper<PubOrg> pubOrgWrapper = PubOrgWrapper(Long.parseLong(req.getOrgId()));
-        PubOrg puborg = pubOrgService.getOne(pubOrgWrapper);
-
+        PubOrg puborg = pubOrgService.getOne(new LambdaQueryWrapper<PubOrg>()
+                .eq(ObjectUtil.isNotEmpty(req.getOrgId()),PubOrg::getOrgId,req.getOrgId()));
         if (ObjectUtil.isEmpty(puborg)) {
             //抛出组织机构不存在异常
-            throw new ServiceException(CabinetExceptionEnum.PUBORG_NOT_EXIST);
+            throw new ServiceException(PubOrgExceptionEnum.PUBORG_NOT_EXIST);
         }
         //查询是否有重复的单警柜编号
-        LambdaQueryWrapper<Cabinet> wrapper2 = CabinetWrapper(req);
-        wrapper2.eq(ObjectUtil.isNotEmpty(req.getCabinetNum()),Cabinet::getCabinetNum,req.getCabinetNum());
-        List<Cabinet> list = this.list(wrapper2);
+        List<Cabinet> list = this.list(new LambdaQueryWrapper<Cabinet>()
+                .eq(ObjectUtil.isNotEmpty(req.getCabinetNum()),Cabinet::getCabinetNum,req.getCabinetNum()));
         if (list.size()>0) {
             //抛出单警柜重复异常
             throw new ServiceException(CabinetExceptionEnum.CABINETID_IS_EXISTS);
@@ -264,13 +197,13 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
         BeanPlusUtil.copyProperties(req, cabinet);
         cabinet.setCreateTime(DateTimeUtil.getCurrentDateTime());
         cabinet.setUpdateTime(DateTimeUtil.getCurrentDateTime());
-        boolean result = save(cabinet);
-        LambdaQueryWrapper<Cabinet> wrapper3 = CabinetWrapper(req);
-        wrapper3.eq(ObjectUtil.isNotEmpty(ObjectUtil.isNotEmpty(req.getCabinetNum())), Cabinet::getCabinetNum, req.getCabinetNum())
+        //添加单警柜
+        save(cabinet);
+        Cabinet one = getOne(new LambdaQueryWrapper<Cabinet>()
+                .eq(ObjectUtil.isNotEmpty(ObjectUtil.isNotEmpty(req.getCabinetNum())), Cabinet::getCabinetNum, req.getCabinetNum())
                 .eq(ObjectUtil.isNotEmpty(ObjectUtil.isNotEmpty(req.getOrgId())), Cabinet::getOrgId, req.getOrgId())
-                .eq(ObjectUtil.isNotEmpty(ObjectUtil.isNotEmpty(req.getName())), Cabinet::getName, req.getName());
-        Cabinet one = getOne(wrapper3);
-        ArrayList<CabinetBox> objects = new ArrayList<>();
+                .eq(ObjectUtil.isNotEmpty(ObjectUtil.isNotEmpty(req.getName())), Cabinet::getName, req.getName()));
+        List<CabinetBox> objects = new ArrayList<>();
         for (int i = 1; i <= req.getNum(); i++) {
             CabinetBox cabinetBox = new CabinetBox();
             cabinetBox.setCabinetId(one.getId());
@@ -280,42 +213,60 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
             objects.add(cabinetBox);
         }
         cabinetBoxService.saveBatch(objects);
-        return result;
+        return cabinet.getId();
     }
 
 
     /**
-     * 删除单警柜
+     * 删除单警柜(批量删除)
      *
      * @param req
      * @return
      */
     @Override
-    public boolean deleteCabinetInfo(CabinetReq req) {
+    @Transactional(rollbackFor = Exception.class)
+    public boolean deleteCabinetInfo(UpdateCabinetReq req) {
+        //获取传递的id列表
+        List<String> cabinetIdList = req.getCabinetList();
+        List<Cabinet> cabinetList=new ArrayList<>();
+        //遍历单警柜id列表
+        for (String id:cabinetIdList) {
             //通过单警柜id查询出他的箱门数
-        LambdaQueryWrapper<Cabinet> wrapper = CabinetWrapper(req)
-                .eq(ObjectUtil.isNotEmpty(req.getId()), Cabinet::getId, req.getId());
-        Cabinet cabinet = this.getOne(wrapper);
+            Cabinet cabinet = this.getOne(new LambdaQueryWrapper<Cabinet>()
+                    .eq(ObjectUtil.isNotEmpty(id), Cabinet::getId,id));
             //如果查询不到单警柜抛出异常
             if (ObjectUtil.isEmpty(cabinet)) {
                 throw new ServiceException(CabinetExceptionEnum.CABINET_ISNOT_EXISTS);
             }
+            //查询出单警柜之后添加到列表中
+            cabinetList.add(cabinet);
             //通过单警柜id循环遍历出并删除所有箱门信息
-        LambdaQueryWrapper<CabinetBox> eq = CabinetboxWrapper(req)
-                .eq(ObjectUtil.isNotEmpty(req.getId()), CabinetBox::getCabinetId, req.getId());
-        List<CabinetBox> list = cabinetBoxService.list(eq);
+            List<CabinetBox> list = cabinetBoxService.list(new LambdaQueryWrapper<CabinetBox>()
+                    .eq(ObjectUtil.isNotEmpty(id), CabinetBox::getCabinetId, id));
+            //创建police列表方便批量删除操作
+            List<Policeman> policemanList=new ArrayList<>();
+            //创建cabinetBox列表方便批量删除操作
+            List<CabinetBox> cabinetBoxList=new ArrayList<>();
             for (CabinetBox cabinetBox: list) {
+                CabinetBox cabinetBox1 = new CabinetBox();
+                BeanPlusUtil.copyProperties(cabinetBox,cabinetBox1);
+                cabinetBoxList.add(cabinetBox1);
                 //删除箱门信息的同时需要去判断箱门是否绑定警员，如果有，则解除绑定
                 Policeman one = policemanService.getOne(new LambdaQueryWrapper<Policeman>()
                         .eq(ObjectUtil.isNotEmpty(cabinetBox.getId()),Policeman::getCabinetBoxId,cabinetBox.getId()));
                 if (!ObjectUtil.isNull(one)){
                     one.setCabinetBoxId(null);
-                policemanService.updateById(one);
+                    policemanList.add(one);
+                }
             }
-            cabinetBoxService.removeById(cabinetBox.getId());
+            //批量修改绑定箱门的警员信息，将其解绑
+            policemanService.updateBatchById(policemanList);
+            //批量删除箱门数
+            cabinetBoxService.removeBatchByIds(cabinetBoxList);
+            //批量删除单警柜id
+            removeBatchByIds(cabinetList);
         }
-        //删除单警柜id
-        return this.removeById(cabinet.getId());
+        return true;
     }
 
     /**
@@ -326,22 +277,52 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
      * @return
      */
     @Override
-    public List<Cabinet> getAllCabinetList(CabinetReq req) {
+    public List<CabinetDto> getAllCabinetList(CabinetReq req) {
         List<Cabinet> cabinets = new ArrayList<>();
+        List<CabinetDto> cabinetList=new ArrayList<>();
+        List<CabinetBoxDto> cabinetBoxList=new ArrayList<>();
         //如果组织机构时浙江省公安厅
         if (req.getOrgId().equals("1369509498032808905") && req.getIncludeLowerLevel().equals("true")) {
             cabinets = cabinetMapper.getAllCabinet();
-            return cabinets;
+            for (Cabinet cabinet:cabinets) {
+                CabinetDto cabinetDto = new CabinetDto();
+                BeanPlusUtil.copyProperties(cabinet,cabinetDto);
+                //添加箱门信息列表
+                List<CabinetBox> list = cabinetBoxService.list(new LambdaQueryWrapper<CabinetBox>()
+                        .eq(CabinetBox::getCabinetId, cabinet.getId()));
+                for (CabinetBox cabinetBox:list) {
+                    CabinetBoxDto cabinetBoxDto = new CabinetBoxDto();
+                    BeanPlusUtil.copyProperties(cabinetBox,cabinetBoxDto);
+                    cabinetBoxList.add(cabinetBoxDto);
+                }
+                cabinetDto.setCabinetBoxList(cabinetBoxList);
+                cabinetList.add(cabinetDto);
+            }
+            return cabinetList;
         }
         //分两种情况，如果说是本级及下级（全部）所有的单警柜信息，则incluLowerLevel为true，如果是查询本级的单警柜信息则为false
         if (req.getIncludeLowerLevel().equals("true") || req.getIncludeLowerLevel().equals("false")) {
             List<String> allOrgId = getAllOrgId(req, req.getIncludeLowerLevel());
-            if (allOrgId.isEmpty()) {
+            if (allOrgId.size()==0) {
                 //抛出组织机构不存在异常
-                throw new ServiceException(CabinetExceptionEnum.PUBORG_NOT_EXIST);
+                throw new ServiceException(PubOrgExceptionEnum.PUBORG_NOT_EXIST);
             }
             cabinets = getAllCabinetByOrg(allOrgId);
-            return cabinets;
+            for (Cabinet cabinet:cabinets) {
+                CabinetDto cabinetDto = new CabinetDto();
+                BeanPlusUtil.copyProperties(cabinet,cabinetDto);
+                //添加箱门信息列表
+                List<CabinetBox> list = cabinetBoxService.list(new LambdaQueryWrapper<CabinetBox>()
+                        .eq(CabinetBox::getCabinetId, cabinet.getId()));
+                for (CabinetBox cabinetBox:list) {
+                    CabinetBoxDto cabinetBoxDto = new CabinetBoxDto();
+                    BeanPlusUtil.copyProperties(cabinetBox,cabinetBoxDto);
+                    cabinetBoxList.add(cabinetBoxDto);
+                }
+                cabinetDto.setCabinetBoxList(cabinetBoxList);
+                cabinetList.add(cabinetDto);
+            }
+            return cabinetList;
         } else {
             //传递的数据是否正确，不正确抛异常（只接受true、false）
             throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR);
@@ -351,26 +332,31 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
 
     /**
      * 通过单警柜id查询单个单警柜及其箱门信息
+     *
      * @param req
      * @return
      */
     @Override
     public CabinetDto showOneCabinet(CabinetReq req) {
         //查询单警柜信息
-        LambdaQueryWrapper<Cabinet> eq = CabinetWrapper(req)
-                .eq(ObjectUtil.isNotEmpty(req.getId()), Cabinet::getId, req.getId());
-        Cabinet one = getOne(eq);
+        Cabinet one = getOne(new LambdaQueryWrapper<Cabinet>()
+                .eq(ObjectUtil.isNotEmpty(req.getId()), Cabinet::getId, req.getId()));
         if (ObjectUtil.isNull(one)){
             throw new ServiceException(CabinetExceptionEnum.CABINET_ISNOT_EXISTS);
         }
         //查询单警柜的箱门信息
-        LambdaQueryWrapper<CabinetBox> eq1 = CabinetboxWrapper(req)
-                .eq(ObjectUtil.isNotEmpty(req.getId()), CabinetBox::getCabinetId, req.getId());
-        List<CabinetBox> list = cabinetBoxService.list(eq1);
+        List<CabinetBox> list = cabinetBoxService.list(new LambdaQueryWrapper<CabinetBox>()
+                .eq(ObjectUtil.isNotEmpty(req.getId()), CabinetBox::getCabinetId, req.getId()));
+        List<CabinetBoxDto> boxList=new ArrayList<>();
+        for (CabinetBox cabinetBox: list) {
+            CabinetBoxDto cabinetBoxDto = new CabinetBoxDto();
+            BeanPlusUtil.copyProperties(cabinetBox,cabinetBoxDto);
+            boxList.add(cabinetBoxDto);
+        }
         //将单警柜的信息和它的箱门信息返回
         CabinetDto cabinetDto = new CabinetDto();
         BeanPlusUtil.copyProperties(one,cabinetDto);
-        cabinetDto.setList(list);
+        cabinetDto.setCabinetBoxList(boxList);
         return cabinetDto;
     }
 
@@ -381,49 +367,28 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
      * @return
      */
     @Override
-    public boolean updateCabinetInfo(CabinetReq req) {
+    public boolean updateCabinetInfo(UpdateCabinetReq req) {
         //查询传入的组织机构id是否存在
-        LambdaQueryWrapper<PubOrg> pubOrgwrapper = PubOrgWrapper(Long.parseLong(req.getOrgId()));
-        PubOrg puborg = pubOrgService.getOne(pubOrgwrapper);
+        PubOrg puborg = pubOrgService.getOne(new LambdaQueryWrapper<PubOrg>()
+                .eq(ObjectUtil.isNotEmpty(req.getOrgId()),PubOrg::getOrgId,req.getOrgId()));
         if (ObjectUtil.isEmpty(puborg)) {
             //抛出组织机构不存在异常
-            throw new ServiceException(CabinetExceptionEnum.PUBORG_NOT_EXIST);
+            throw new ServiceException(PubOrgExceptionEnum.PUBORG_NOT_EXIST);
         }
         //查询是否有重复的单警柜编号
-        LambdaQueryWrapper<Cabinet> wrapper2 = CabinetWrapper(req);
-        wrapper2.eq(ObjectUtil.isNotEmpty(req.getCabinetNum()),Cabinet::getCabinetNum,req.getCabinetNum());
-        List<Cabinet> list = this.list(wrapper2);
+        List<Cabinet> list = this.list(new LambdaQueryWrapper<Cabinet>()
+                .eq(ObjectUtil.isNotEmpty(req.getCabinetNum()),Cabinet::getCabinetNum,req.getCabinetNum()));
         if (list.size()>0) {
+            //判断是否是本身，如果是则不抛出异常(根据单警柜id进行比较)
+            Cabinet cabinet = list.get(0);
+            if (!cabinet.getId().equals(req.getId())){
                 //抛出单警柜重复异常
                 throw new ServiceException(CabinetExceptionEnum.CABINETID_IS_EXISTS);
             }
-        Cabinet cabinet = new Cabinet();
-        BeanPlusUtil.copyProperties(req, cabinet);
-        //如果新增箱门个数，那么对应的箱门表中也需要插入对应对应数量的箱门记录条数
-        LambdaQueryWrapper<Cabinet> eq = CabinetWrapper(req)
-                .eq(ObjectUtil.isNotEmpty(req.getOrgId()), Cabinet::getOrgId, req.getOrgId())
-                .eq(ObjectUtil.isNotEmpty(req.getCabinetNum()), Cabinet::getCabinetNum, req.getCabinetNum());
-        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();
-            //箱门id
-            String id = UUID.randomUUID().toString();
-            cabinetBox.setId(id);
-            cabinetBox.setCabinetId(req.getId());
-            cabinet.setState(1);
-            cabinetBox.setNum(i);
-            //保存到list
-            objects.add(cabinetBox);
 
         }
-        //批量插入
-        cabinetBoxService.saveBatch(objects);
-        //总箱门数就是原来的箱门数+新增的箱门数
-        cabinet.setNum(totalBoxNum);
+        Cabinet cabinet = new Cabinet();
+        BeanPlusUtil.copyProperties(req, cabinet);
         return this.updateById(cabinet);
     }
 
@@ -492,28 +457,40 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
         return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS, allCabinet);
     }
 
-
-    //查询的各种条件信息
-    //单警柜主柜查询条件
-    private LambdaQueryWrapper<Cabinet> CabinetWrapper(CabinetReq req) {
-        LambdaQueryWrapper<Cabinet> wrapper = new LambdaQueryWrapper<>();
-        //查询全部
-        if (ObjectUtil.isEmpty(req)) {
-            return wrapper;
+    /**
+     * 修改单警柜箱门状态
+     * @param req
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean ChangeCabinetState(UpdateCabinetReq req) {
+        //查询单警柜是否存在
+        Cabinet cabinet = getOne(new LambdaQueryWrapper<Cabinet>()
+                .eq(Cabinet::getId, req.getId()));
+        if (ObjectUtil.isNull(cabinet)){
+            throw new ServiceException(CabinetExceptionEnum.CABINET_ISNOT_EXISTS);
         }
-        return wrapper;
+        List<UpdateCabinetBoxReq> cabinetBoxList = req.getCabinetBoxList();
+        List<CabinetBox> list =new ArrayList<>();
+        for (UpdateCabinetBoxReq updateCabinet:cabinetBoxList) {
+            CabinetBox cabinetBox = new CabinetBox();
+            BeanPlusUtil.copyProperties(updateCabinet,cabinetBox);
+            list.add(cabinetBox);
+        }
+        return cabinetBoxService.updateBatchById(list);
     }
 
-    //箱门的查询条件
-    private LambdaQueryWrapper<CabinetBox> CabinetboxWrapper(CabinetReq req) {
-        LambdaQueryWrapper<CabinetBox> wrapper = new LambdaQueryWrapper<>();
-        //查询全部
-        if (ObjectUtil.isEmpty(req)) {
-            return wrapper;
+    @Override
+    public Long SearchOrgId(String id) {
+        Cabinet one = getOne(new LambdaQueryWrapper<Cabinet>().eq(Cabinet::getId, id));
+        if (ObjectUtil.isNull(one)){
+            throw new ServiceException(CabinetExceptionEnum.CABINET_ISNOT_EXISTS);
         }
-        return wrapper;
+        return one.getOrgId();
     }
 
+
     //查询机构id是否存在
     private LambdaQueryWrapper<PubOrg> PubOrgWrapper(long orgId) {
         LambdaQueryWrapper<PubOrg> wrapper = new LambdaQueryWrapper<>();

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

@@ -175,7 +175,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/PolicemanServiceImpl.java

@@ -3,21 +3,25 @@ package com.junmp.jyzb.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 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.api.bean.dto.PoliceDto;
+import com.junmp.jyzb.api.bean.dto.PoliceFingerDto;
+import com.junmp.jyzb.api.bean.dto.PolicemanDto;
 import com.junmp.jyzb.api.bean.query.PolicemanReq;
-import com.junmp.jyzb.entity.Cabinet;
-import com.junmp.jyzb.entity.PoliceFinger;
+import com.junmp.jyzb.api.bean.req.UpdatePolicemanReq;
+import com.junmp.jyzb.entity.*;
+import com.junmp.jyzb.exception.enums.CabinetBoxExceptionEnum;
+import com.junmp.jyzb.exception.enums.CabinetExceptionEnum;
 import com.junmp.jyzb.exception.enums.PolicemanExceptionEnum;
+import com.junmp.jyzb.exception.enums.PubOrgExceptionEnum;
 import com.junmp.jyzb.mapper.*;
-import com.junmp.jyzb.service.CabinetService;
-import com.junmp.jyzb.service.PolicemanService;
-import com.junmp.jyzb.service.PubOrgService;
+import com.junmp.jyzb.service.*;
 import com.junmp.jyzb.utils.*;
+import com.junmp.v2.auth.password.BcryptPasswordStoredEncrypt;
 import com.junmp.v2.common.exception.base.ServiceException;
+import com.junmp.v2.common.util.BeanPlusUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-
-import com.junmp.jyzb.entity.Policeman;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -56,98 +60,45 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
     @Resource
     private PolicemanService policemanService;
 
+    @Resource
+    private CabinetBoxService cabinetBoxService;
+
+    @Resource
+    private PoliceFingerService policeFingerService;
+
+    @Resource
+    private SysuserService sysUserService;
+
     private static final String REDIS_POLICE = "Policeman_";
     private static final String REDIS_ORG = "Organization_";
 
-    @Override
-    public ResponseResult addPoliceman(Map<String, Object> policeman) {
-        // 进行参数校验
-        try {
-            checkNotBlank(policeman.get("orgId"), "orgId不能为空");
-            checkNotBlank(policeman.get("name"), "name不能为空");
-            checkNotBlank(policeman.get("policeCode"), "policeCode不能为空");
-            checkNotBlank(policeman.get("sex"),"sex不能为空");
-            //checkNotBlank((String) policeman.get("cabinetBoxId"), "cabinetBoxId不能为空");
-            checkNotBlank(policeman.get("phone"), "phone不能为空");
-            checkNotBlank(policeman.get("idCard"), "idCard不能为空");
-            //checkNotBlank((String) policeman.get("photo"), "photo不能为空");
-        } catch (IllegalArgumentException e) {
-            return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
-        }
 
+    /**
+     * 添加警员信息
+     * @param req
+     * @return
+     */
+    @Override
+    public String AddPoliceman(UpdatePolicemanReq req) {
         //查询传入的组织机构id是否存在
-//        Long onePubOrg = pubOrgMapper.getOnePubOrg(policeman.get("orgId").toString());
-//        if (onePubOrg == null || onePubOrg.equals("")){
-//            return new ResponseResult(HttpStatus.ERROR,ReturnMsg.ERROR,"该组织机构不存在");
-//        }
+        PubOrg puborg = pubOrgService.getOne(new LambdaQueryWrapper<PubOrg>()
+                .eq(ObjectUtil.isNotEmpty(req.getOrgId()),PubOrg::getOrgId,req.getOrgId()));
+        if (ObjectUtil.isEmpty(puborg)) {
+            //抛出组织机构不存在异常
+            throw new ServiceException(PubOrgExceptionEnum.PUBORG_NOT_EXIST);
+        }
 
         //查询是否有重复的policeCode
-        List<String> policeCodeFlag = policemanMapper.getPoliceByPoliceCode((String) policeman.get("policeCode"));
-        if (!policeCodeFlag.isEmpty()){
-            return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,"警员编号已存在");
-        }
-
-        //todo cabinetBoxId能否重复
-
-
-        //查询单警柜箱号是否存在
-        if (policeman.containsKey("cabinetBoxId") && policeman.get("cabinetBoxId").toString()!=""){ //如果cabinetBoxId的存在且值不为空
-            String oneCabinetBox = cabinetBoxMapper.getOneCabinetBox(policeman.get("cabinetBoxId").toString());
-            if (oneCabinetBox == null || oneCabinetBox.equals("")){
-                return new ResponseResult(HttpStatus.ERROR,ReturnMsg.ERROR,"该单警柜箱号不存在");
-            }
-        }
-
-        Policeman police =new Policeman();
-        //将警员相关信息添加到警员表
-        //生成一个uuid
-        String uuid = UUID.randomUUID().toString().replaceAll("-", "");
-        //生成当前时间
-        Date currentDate = DateTimeUtil.getCurrentDateTime();
-        police.setCreateTime(currentDate);
-        police.setUpdateTime(currentDate);
-        police.setId(uuid);
-
-        police.setOrgId((Long) policeman.get("orgId"));
-        police.setName((String) policeman.get("name"));
-        police.setPoliceCode((String) policeman.get("policeCode"));
-        police.setSex((String) policeman.get("sex"));
-        police.setCabinetBoxId((String) policeman.get("cabinetBoxId"));
-        police.setPhone((String) policeman.get("phone"));
-        police.setIdCard((String) policeman.get("idCard"));
-        police.setPhoto((String) policeman.get("photo"));
-
-        policemanMapper.addPoliceman(police);
-
-//        // 将uuid、创建时间、更新时间加入到policeman中
-//        policeman.put("id",uuid);
-//        long timestamp = currentDate.getTime(); // 将Date对象转换为long类型的时间戳
-//        policeman.put("updateTime",timestamp);
-//
-//        /**
-//         * 更新缓存
-//         * */
-//        //构建Redis缓存键
-//        String redisKey = REDIS_ORG + "true" +'_'+ policeman.get("orgId").toString();
-//        // 从 Redis 中获取数据
-//        List<Map<String, Object>> cachedDataTrue = redisUtils.findCachedData(redisKey);
-//        if (cachedDataTrue != null) {
-//            cachedDataTrue.add(0,policeman);
-//            //将查询结果存入 Redis 中
-//            redisUtils.set(redisKey, cachedDataTrue);
-//        }
-//
-//        //构建Redis缓存键
-//        redisKey = REDIS_ORG + "false" +'_'+ policeman.get("orgId").toString();
-//        // 从 Redis 中获取数据
-//        List<Map<String, Object>> cachedDataFalse = redisUtils.findCachedData(redisKey);
-//        if (cachedDataFalse != null) {
-//            cachedDataFalse.add(0,policeman);
-//            //将查询结果存入 Redis 中
-//            redisUtils.set(redisKey, cachedDataFalse);
-//        }
-
-        return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,uuid);
+        List<Policeman> list = policemanService.list(new LambdaQueryWrapper<Policeman>()
+                .eq(ObjectUtil.isNotEmpty(req.getPoliceCode()), Policeman::getPoliceCode, req.getPoliceCode()));
+        if (list.size()>0){
+            throw new ServiceException(PolicemanExceptionEnum.POLICECODE_IS_EXISTS);
+        }
+        Policeman policeman = new Policeman();
+        BeanPlusUtil.copyProperties(req,policeman);
+        //添加警员绑定用户信息
+        policemanService.save(policeman);
+        return policeman.getId();
     }
 
     // 更新缓存的方法，新增警员信息时调用
@@ -185,178 +136,102 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         redisUtils.delete(redisKey);
     }
 
+
+    /**
+     *
+     * @param req
+     * @return
+     */
     @Override
-    public ResponseResult getOnePolice(Map<String, Object> msg){
-        // 进行参数校验
-        try {
-            checkNotBlank(msg.get("policeId"), "policeId不能为空");
-        } catch (IllegalArgumentException e) {
-            return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
+    public PolicemanDto GetOnePolice(PolicemanReq req) {
+        Policeman one = getOne(new LambdaQueryWrapper<Policeman>()
+                .eq(ObjectUtil.isNotNull(req.getId()), Policeman::getId, req.getId()));
+        if (ObjectUtil.isNull(one)){
+            throw new ServiceException(PolicemanExceptionEnum.POLICEMAN_NOT_EXIST);
         }
-
-        String userId = msg.get("policeId").toString();
-        Map<String, Object> policeMsg = policemanMapper.getOnePolice(userId);
-        //如果没有查找到信息，返回相关提示
-        if (policeMsg == null){
-            return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.NO_DATA, ReturnData.NO_DATA);
+        PolicemanDto policemanDto = new PolicemanDto();
+        BeanPlusUtil.copyProperties(one,policemanDto);
+        //将警员的指纹信息查询出来
+        List<PoliceFinger> list1 = policeFingerService.list(new LambdaQueryWrapper<PoliceFinger>()
+                .eq(ObjectUtil.isNotNull(req.getId()), PoliceFinger::getPoliceId, req.getId()));
+        List<PoliceFingerDto> fingerDtoList=new ArrayList<>();
+        for (PoliceFinger policeFinger:list1) {
+            PoliceFingerDto policeFingerDto = new PoliceFingerDto();
+            BeanPlusUtil.copyProperties(policeFinger,policeFingerDto);
+            fingerDtoList.add(policeFingerDto);
         }
-        return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,policeMsg);
+        policemanDto.setFingersList(fingerDtoList);
+        return policemanDto;
     }
 
+
+    /**
+     * 删除警员信息
+     * @param req
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
     @Override
-    public ResponseResult deletePolice(Map<String, Object> msg) {
-        // 进行参数校验
-        try {
-            checkNotBlank(msg.get("policeList"), "policeList不能为空");
-        } catch (IllegalArgumentException e) {
-            return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
+    public boolean DeletePolice(UpdatePolicemanReq req) {
+        //通过警员id查询警员信息
+        Policeman policeman = policemanService.getOne(new LambdaQueryWrapper<Policeman>()
+                .eq(ObjectUtil.isNotNull(req.getId()), Policeman::getId, req.getId()));
+        //查询不到警员信息则抛异常
+        if (ObjectUtil.isNull(policeman)){
+            throw new ServiceException(PolicemanExceptionEnum.POLICEMAN_NOT_EXIST);
         }
-
-        //遍历要删除的警员id
-        List<Object> policeList = (List<Object>) msg.get("policeList");
-        for (Object policeId:policeList){
-            policemanMapper.deletePolice(policeId.toString());
+        //如果查询出来的警员信息中没有绑定箱门而参数传递了箱门id，则抛出异常警员绑定箱门错误
+        //如果传递的箱门id参数与查询出来的箱门id不一致，则抛出异常警员绑定的箱门与实际绑定不符合
+        if ((ObjectUtil.isNull(policeman.getCabinetBoxId()) && ObjectUtil.isNotNull(req.getCabinetBoxId()))){
+            throw new ServiceException(CabinetBoxExceptionEnum.CABINETBOX_ISNOT_EXISTS);
         }
+        //通过警员信息中的userId对账号进行删除
+        sysUserService.remove(new LambdaQueryWrapper<User>()
+                .eq(User::getUserId,policeman.getUserId()));
+         return policemanService.removeById(policeman);
 
-        //todo 删除缓存中的警员信息
-
-        return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS);
     }
 
-    @Override
-    public ResponseResult updatePolice(Map<String, Object> policeman) {
-        // 进行参数校验
-        try {
-            checkNotBlank(policeman.get("id"), "id不能为空");
-            checkNotBlank(policeman.get("orgId"), "orgId不能为空");
-            checkNotBlank(policeman.get("name"), "name不能为空");
-            checkNotBlank(policeman.get("policeCode"), "policeCode不能为空");
-            checkNotBlank(policeman.get("sex"), "sex不能为空");
-            //checkNotBlank((String) policeman.get("cabinetBoxId"), "cabinetBoxId不能为空");
-            checkNotBlank(policeman.get("phone"), "phone不能为空");
-            checkNotBlank(policeman.get("idCard"), "idCard不能为空");
-            //checkNotBlank((String) policeman.get("photo"), "photo不能为空");
-        } catch (IllegalArgumentException e) {
-            return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
-        }
 
+    /**
+     * 修改警员信息
+     * @param req
+     * @return
+     */
+    @Override
+    public boolean UpdatePolice(UpdatePolicemanReq req) {
+        Policeman policeman = new Policeman();
+        BeanPlusUtil.copyProperties(req,policeman);
         //查询传入的组织机构id是否存在
-//        Long onePubOrg = pubOrgMapper.getOnePubOrg(policeman.get("orgId").toString());
-//        if (onePubOrg == null || onePubOrg.equals("")){
-//            return new ResponseResult(HttpStatus.ERROR,ReturnMsg.ERROR,"该组织机构不存在");
-//        }
-
-        //获取map中的policeCode
-        String policeCode = policeman.get("policeCode").toString();
+        PubOrg puborg = pubOrgService.getOne(new LambdaQueryWrapper<PubOrg>()
+                .eq(ObjectUtil.isNotEmpty(req.getOrgId()),PubOrg::getOrgId,req.getOrgId()));
+        if (ObjectUtil.isEmpty(puborg)) {
+            //抛出组织机构不存在异常
+            throw new ServiceException(PubOrgExceptionEnum.PUBORG_NOT_EXIST);
+        }
+        //判断传入的修改的警员编号与本身编号一致，如果一致则无所谓，如果不一致则需要判断修改的警员编号是否已经存在
+        Policeman one = policemanService.getOne(new LambdaQueryWrapper<Policeman>()
+                .eq(ObjectUtil.isNotNull(req.getId()), Policeman::getId, req.getId()));
+        if (!req.getPoliceCode().equals(one.getPoliceCode())){
+            Policeman one1 = policemanService.getOne(new LambdaQueryWrapper<Policeman>()
+                    .eq(ObjectUtil.isNotNull(req.getPoliceCode()), Policeman::getPoliceCode, req.getPoliceCode()));
+            if (ObjectUtil.isNotNull(one1)){
+                throw new ServiceException(PolicemanExceptionEnum.POLICECODE_IS_EXISTS);
+            }
+        }
 
-        //查询是否有重复的policeCode
-        List<String> policeCodeFlag = policemanMapper.getPoliceByPoliceCode(policeCode);
-        //判断policeCode是否有变动
-        String oldPoliceCode = policemanMapper.getPoliceCodeById(policeman.get("id").toString());
-        if (oldPoliceCode!=null && !oldPoliceCode.equals(policeCode)){
-            if (!policeCodeFlag.isEmpty()){
-                return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,"警员编号已存在");
-            }
-        }
-
-        //查询单警柜箱号是否存在
-        if (policeman.containsKey("cabinetBoxId") && policeman.get("cabinetBoxId").toString()!=""){
-            String oneCabinetBox = cabinetBoxMapper.getOneCabinetBox(policeman.get("cabinetBoxId").toString());
-            if (oneCabinetBox == null || oneCabinetBox.equals("")){
-                return new ResponseResult(HttpStatus.ERROR,ReturnMsg.ERROR,"该单警柜箱号不存在");
-            }
-        }
-
-        Policeman police =new Policeman();
-        //修改警员相关信息
-        //生成当前时间
-        Date currentDate = DateTimeUtil.getCurrentDateTime();
-        //police.setId(uuid);
-        String id = policeman.get("id").toString();
-        police.setId(id);
-        police.setOrgId((Long) policeman.get("orgId"));
-        police.setName((String) policeman.get("name"));
-        police.setPoliceCode((String) policeman.get("policeCode"));
-        police.setSex((String) policeman.get("sex"));
-        //police.setIsCreatedAccount((Integer) policeman.get("isCreatedAccount"));
-        police.setCabinetBoxId((String) policeman.get("cabinetBoxId"));
-        police.setPhone((String) policeman.get("phone"));
-        police.setIdCard((String) policeman.get("idCard"));
-        police.setPhoto((String) policeman.get("photo"));
-        //police.setUpdateUser((String) policeman.get("updateUser"));
-        police.setUpdateTime(currentDate);
-
-        policemanMapper.updatePolice(police);
-
-//        //更新缓存中的信息
-//        long timestamp = currentDate.getTime(); // 将Date对象转换为long类型的时间戳
-//        policeman.put("updateTime",timestamp);
-//
-//        /**
-//         * 更新缓存
-//         * */
-//        //构建Redis缓存键
-//        String redisKey = REDIS_ORG + "true" +'_'+ policeman.get("orgId").toString();
-//        // 从 Redis 中获取数据
-//        List<Map<String, Object>> cachedDataTrue = redisUtils.findCachedData(redisKey);
-//        if (cachedDataTrue != null) {
-//            //删除之前的缓存信息
-//            Iterator<Map<String, Object>> iterator = cachedDataTrue.iterator();
-//            while (iterator.hasNext()) {
-//                Map<String, Object> oneData = iterator.next();
-//                String redisId = oneData.get("id").toString();
-//                if (id.equals(redisId)) {
-//                    iterator.remove(); // 删除当前循环中的元素
-//                    break;
-//                }
-//            }
-//            //将最新的信息加入
-//            cachedDataTrue.add(0,policeman);
-//            //将查询结果存入 Redis 中
-//            redisUtils.set(redisKey, cachedDataTrue);
-//        }
-//
-//
-//        //构建Redis缓存键
-//        redisKey = REDIS_ORG + "false" +'_'+ policeman.get("orgId").toString();
-//        // 从 Redis 中获取数据
-//        List<Map<String, Object>> cachedDataFalse = redisUtils.findCachedData(redisKey);
-//        if (cachedDataFalse != null) {
-//            //删除之前的缓存信息
-//            Iterator<Map<String, Object>> iterator = cachedDataTrue.iterator();
-//            while (iterator.hasNext()) {
-//                Map<String, Object> oneData = iterator.next();
-//                String redisId = oneData.get("id").toString();
-//                if (id.equals(redisId)) {
-//                    iterator.remove(); // 删除当前循环中的元素
-//                    break;
-//                }
-//            }
-//            //将最新的信息加入
-//            cachedDataFalse.add(0,policeman);
-//            //将查询结果存入 Redis 中
-//            redisUtils.set(redisKey, cachedDataFalse);
-//        }
-
-        return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS);
+        //查询单警柜箱号是否存在,箱门不存在抛异常
+        CabinetBox cabinetBox = cabinetBoxService.getOne(new LambdaQueryWrapper<CabinetBox>()
+                .eq(CabinetBox::getId, req.getCabinetBoxId()));
+        if (ObjectUtil.isNull(cabinetBox)){
+            throw new ServiceException(CabinetBoxExceptionEnum.CABINETBOX_ISNOT_EXISTS);
+        }
+        policeman.setUpdateTime(DateTimeUtil.getCurrentDateTime());
+        return policemanService.updateById(policeman);
     }
 
     @Override
     public List<String> getAllPoliceId(Map<String, Object> msg) {
-        //如果组织机构是最高级的，获取所有id
-//        if (msg.get("orgId").toString().equals("1369509498032808905")){
-//            //构建 Redis 缓存键
-//            String redisKey = "getAllPoliceId_"+msg.get("orgId");
-//            // 从 Redis 中获取数据
-//            List<String> cachedData = redisUtils.findCachedData(redisKey);
-//            if (cachedData!=null){
-//                return cachedData;
-//            }
-//            List<String> allPoliceId = policemanMapper.getAllPoliceIdByHighest();
-//            //将查询结果存入 Redis 中
-//            redisUtils.set(redisKey, allPoliceId);
-//            return allPoliceId;
-//        }
 
         //构建 Redis 缓存键
         String redisKey = "getAllPoliceId_"+msg.get("IncludeLowerLevel")+'_'+msg.get("orgId");
@@ -398,17 +273,6 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         return subIds;
     }
 
-    @Override
-    public ResponseResult deleteFinger(Map<String, Object> msg) {
-        try {
-            checkNotBlank(msg.get("fingerId"), "fingerId不能为空");
-        } catch (IllegalArgumentException e) {
-            return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
-        }
-        String fingerId = msg.get("fingerId").toString();
-        policemanMapper.deleteFinger(fingerId);
-        return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS);
-    }
 
     @Override
     public List<String> getAllPoliceIdByCabinet(Map<String, Object> cabinetId) {
@@ -422,115 +286,24 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         return boxId;
     }
 
-    @Override
-    public ResponseResult addFingerInfo(Map<String, Object> msg) {
-        try {
-            checkNotBlank(msg.get("policeId"), "policeId不能为空");
-            checkNotBlank(msg.get("name"), "name不能为空");
-            checkNotBlank(msg.get("fingerInfo"), "fingerInfo不能为空");
-        } catch (IllegalArgumentException e) {
-            return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
-        }
-
-        //指纹id是自增
-        Date currentDate = DateTimeUtil.getCurrentDateTime();
-        PoliceFinger finger =new PoliceFinger();
-
-        finger.setPoliceId(msg.get("policeId").toString());
-        finger.setName(msg.get("name").toString());
-        finger.setFingerInfo(msg.get("fingerInfo").toString());
-
-        finger.setCreateTime(currentDate);
-        finger.setUpdateTime(currentDate);
-        policeFingerMapper.addFingers(finger);
-        return new ResponseResult(HttpStatus.SUCCESS,"操作成功");
-    }
-
-    /**
-         * @author lxh
-         * @description 更新警员的指纹信息
-         * @since 2023/7/18 14:21
-         * @param
-         * @return
-         **/
-    @Override
-    public boolean updateFingerInfo(PoliceFinger req) {
-        //警员id,name,指纹信息不能为空
-//        PoliceFinger policeFinger = this.queryProduct(req);
-//        BeanPlusUtil.copyProperties(req, policeFinger);
-//        return this.updateById(policeFinger);
-//        try {
-//            checkNotBlank(msg.get("policeId"), "policeId不能为空");
-//            checkNotBlank(msg.get("name"), "name不能为空");
-//            checkNotBlank(msg.get("fingerInfo"), "fingerInfo不能为空");
-//        } catch (IllegalArgumentException e) {
-//            return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
-//        }
-//        PoliceFinger policeFinger = new PoliceFinger();
-//        policeFinger.setId((Integer) msg.get("id"));
-//        policeFinger.setPoliceId((String) msg.get("policeId"));
-//        policeFinger.setUpdateTime(DateTimeUtil.getCurrentDateTime());
-//        policeFinger.setFingerInfo((String) msg.get("fingerInfo"));
-//        policeFinger.setName((String) msg.get("name"));
-//        policeFingerMapper.update(policeFinger, new LambdaQueryWrapper<PoliceFinger>()
-//                .eq(PoliceFinger::getId, msg.get("id")));
-//        return new ResponseResult(HttpStatus.SUCCESS,"操作成功");
-        return false;
-    }
 
 
     /**
-     * @author lxh
-     * @description 查询警员的指纹信息
-     * @since 2023/7/18 14:21
-     * @param msg (fingerId)
+     * 修改警员状态
+     * @param req
      * @return
-     **/
+     */
     @Override
-    public ResponseResult searchFingerInfo(Map<String, Object> msg) {
-        //警员id不能为空
-        try {
-            checkNotBlank(msg.get("policeId"), "policeId不能为空");
-        } catch (IllegalArgumentException e) {
-            return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
-        }
-        List<PoliceFinger> fingerList = policeFingerMapper.selectList(new LambdaQueryWrapper<PoliceFinger>()
-                .eq(PoliceFinger::getPoliceId, msg.get("policeId")));
-        return new ResponseResult(HttpStatus.SUCCESS,"操作成功",fingerList);
-    }
-
-    @Override
-    public boolean addFaceInfo(PolicemanReq req) {
-        //面部信息为null或者为空
-        if (ObjectUtil.isNull(req.getFaceInfo()) || ObjectUtil.isEmpty(req.getFaceInfo())){
-            return false;
-        }
-        Policeman police = getOne(new LambdaQueryWrapper<Policeman>()
-                .eq(ObjectUtil.isNotEmpty(req.getId()),Policeman::getId,req.getId()));
-        if (ObjectUtil.isNull(police)){
+    public boolean ChangePoliceState(UpdatePolicemanReq req) {
+        //通过警员id查询出警员信息
+        Policeman one = getOne(new LambdaQueryWrapper<Policeman>()
+                .eq(ObjectUtil.isNotNull(req.getId()), Policeman::getId, req.getId()));
+        if (ObjectUtil.isNull(one)){
             throw new ServiceException(PolicemanExceptionEnum.POLICEMAN_NOT_EXIST);
         }
-        police.setFaceInfo(req.getFaceInfo());
-        police.setUpdateTime(DateTimeUtil.getCurrentDateTime());
-        return policemanService.updateById(police);
-    }
+        one.setState(req.getState());
+        return policemanService.updateById(one);
 
-    @Override
-    public ResponseResult changePoliceState(Map<String, Object> msg) {
-        Policeman police =new Policeman();
-
-        try {
-            checkNotBlank(msg.get("policeId"), "policeId不能为空");
-            checkNotBlank(msg.get("state"), "state不能为空");
-        } catch (IllegalArgumentException e) {
-            return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
-        }
-
-        police.setId(msg.get("policeId").toString());
-        police.setState((Integer) msg.get("state"));
-
-        policemanMapper.changePoliceState(police);
-        return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS);
     }
 
     public List<Map<String, Object>> getAllPolicemanMsg(Map<String, Object> msg,List<String> allPoliceId) {
@@ -568,14 +341,11 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         } catch (IllegalArgumentException e) {
             return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
         }
-
         List<Map<String, Object>> allPoliceman = new ArrayList<>();
 
         //如果组织机构是浙江省公安厅
         if (msg.get("orgId").toString().equals("1369509498032808905") && msg.get("IncludeLowerLevel").toString().equals("true")){
             allPoliceman = policemanMapper.getAllPolice();
-            //将查询结果存入 Redis 中
-            //redisUtils.set(redisKey, allPoliceman);
             return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,allPoliceman);
         }
 
@@ -588,40 +358,55 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         //根据获取的组织机构查询警员信息
         allPoliceman = getAllPolicemanByOrg(msg,allOrgId);
 
-        //将查询结果存入 Redis 中
-        //redisUtils.set(redisKey, allPoliceman);
-
         return new ResponseResult(HttpStatus.SUCCESS,"操作成功",allPoliceman);
 
     }
 
+    /**
+     * 通过组织机构id查询警员列表
+     * @param orgId
+     */
+    @Override
+    public PoliceDto GetAllPolicemanList(Long orgId) {
+        //查询传入的组织机构id是否存在
+        PubOrg puborg = pubOrgService.getOne(new LambdaQueryWrapper<PubOrg>()
+                .eq(ObjectUtil.isNotEmpty(orgId),PubOrg::getOrgId,orgId));
+        if (ObjectUtil.isNull(puborg)) {
+            //抛出组织机构不存在异常
+            throw new ServiceException(PubOrgExceptionEnum.PUBORG_NOT_EXIST);
+        }
+        //查询出组织机构下的所有警员信息
+        List<Policeman> list = list(new LambdaQueryWrapper<Policeman>()
+                .eq(ObjectUtil.isNotEmpty(orgId), Policeman::getOrgId, orgId)
+                .eq(Policeman::getState,1));
+        List<PolicemanDto> policeList=new ArrayList<>();
+        //查询出警员信息下的指纹列表信息
+        for (Policeman p:list) {
+            PolicemanDto policemanDto = new PolicemanDto();
+            BeanPlusUtil.copyProperties(p,policemanDto);
+            List<PoliceFinger> list1 = policeFingerService.list(new LambdaQueryWrapper<PoliceFinger>()
+                    .eq(ObjectUtil.isNotNull(p.getId()), PoliceFinger::getPoliceId, p.getId()));
+            List<PoliceFingerDto> policeFingerDtoList=new ArrayList<>();
+            for (PoliceFinger policeFinger:list1) {
+                PoliceFingerDto policeFingerDto = new PoliceFingerDto();
+                BeanPlusUtil.copyProperties(policeFinger,policeFingerDto);
+                policeFingerDtoList.add(policeFingerDto);
+            }
+            policemanDto.setFingersList(policeFingerDtoList);
+            policeList.add(policemanDto);
+
+        }
+        PoliceDto policeDto = new PoliceDto();
+        policeDto.setPolicemanlist(policeList);
+        //设置组织机构名
+        policeDto.setOrgName(puborg.getOrgName());
+        policeDto.setOrgId(orgId);
+        return policeDto;
+    }
+
     private List<Map<String, Object>> getAllPolicemanByOrg(Map<String, Object> msg, List<String> allOrgId) {
         List<Map<String, Object>> allPoliceman = new ArrayList<>();
-//        // 构建 Redis 缓存键
-//        String redisKey = REDIS_ORG + msg.get("IncludeLowerLevel").toString() +'_'+ msg.get("orgId").toString();
-//        // 从 Redis 中获取数据
-//        List<Map<String, Object>> cachedData = redisUtils.findCachedData(redisKey);
-//        if (cachedData != null) {
-//            //将Long类型的数据转化为Date
-//            for (Map<String,Object> one:cachedData){
-//                Long dataMsg = (Long) one.get("updateTime");
-//                one.put("updateTime", redisUtils.getDate(dataMsg));
-//                allPoliceman.add(one);
-//            }
-//            return cachedData;
-//        }
-
-//        for (String orgId : allOrgId) {
-//            List<Map<String, Object>> policeMsg = policemanMapper.getAllPolicemanByOrg(orgId);
-//            allPoliceman.addAll(policeMsg);
-//        }
         allPoliceman = policemanMapper.getAllPolicemanByOrgList(allOrgId);
-
-        //按照updateTime降序排序
-        //DateTimeUtil.timeSort(allPoliceman);
-
-//        //将查询结果存入 Redis 中
-//        redisUtils.set(redisKey, allPoliceman);
         return allPoliceman;
     }
 
@@ -636,116 +421,60 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         return allOrg;
     }
 
+
+    //根据单警柜id查询警员信息
     @Override
-    public ResponseResult getPoliceData(Map<String, Object> msg) {
-        try {
-            checkNotBlank(msg.get("cabinetId"), "cabinetId不能为空");
-            checkNotBlank(msg.get("type"), "type不能为空");
-        } catch (IllegalArgumentException e) {
-            return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
+    public PoliceDto GetPoliceData(String id) {
+        PoliceDto policeDto = new PoliceDto();
+        //判断单警柜id是否正确
+        Cabinet cabinet = cabinetService.getOne(new LambdaQueryWrapper<Cabinet>()
+                .eq(Cabinet::getId, id));
+        if (ObjectUtil.isNull(cabinet)){
+            throw new ServiceException(CabinetExceptionEnum.CABINET_ISNOT_EXISTS);
+        }
+        //通过箱门id查询出警员
+        List<Policeman> policemenList = policemanMapper.SearchPoliceList(id);
+        List<PolicemanDto> list = new ArrayList<>();
+        for (Policeman policeman:policemenList) {
+            PolicemanDto policemanDto = new PolicemanDto();
+            BeanPlusUtil.copyProperties(policeman,policemanDto);
+            //指纹信息查找
+            List<PoliceFinger> fingerList = policeFingerService.list(new LambdaQueryWrapper<PoliceFinger>()
+                    .eq(PoliceFinger::getPoliceId, policeman.getId()));
+            List<PoliceFingerDto> fingerDtoList=new ArrayList<>();
+            for (PoliceFinger policeFinger:fingerList) {
+                PoliceFingerDto policeFingerDto = new PoliceFingerDto();
+                BeanPlusUtil.copyProperties(policeFinger,policeFingerDto);
+                fingerDtoList.add(policeFingerDto);
+            }
+            policemanDto.setFingersList(fingerDtoList);
+            list.add(policemanDto);
+        }
+        policeDto.setPolicemanlist(list);
+        policeDto.setCabinetNum(cabinet.getCabinetNum());
+        policeDto.setCabinetName(cabinet.getName());
+        PubOrg pubOrg = pubOrgService.getOne(new LambdaQueryWrapper<PubOrg>()
+                .eq(PubOrg::getOrgId, cabinet.getOrgId()));
+        policeDto.setOrgId(pubOrg.getOrgId());
+        policeDto.setOrgName(pubOrg.getOrgName());
+        return policeDto;
+    }
+
+    //添加人脸信息
+    @Override
+    public boolean AddFaceInfo(PolicemanReq req) {
+        //面部信息为null或者为空
+        if (ObjectUtil.isNull(req.getFaceInfo()) || ObjectUtil.isEmpty(req.getFaceInfo())){
+            return false;
         }
-
-        //如果没有找到该单警柜，返回对应信息
-        String cabinetMsg = msg.get("cabinetId").toString();
-        Map<String, Object> oneCabinet = cabinetMapper.getOneCabinet(cabinetMsg);
-        if (oneCabinet.isEmpty()){
-            return new ResponseResult(HttpStatus.ERROR,ReturnMsg.NO_DATA,ReturnData.NO_DATA);
-        }
-
-        String type = msg.get("type").toString();
-        //存放返回的数据
-        Map<String, Object> allMsg = new HashMap<>();
-
-        if (type.equals("all")){
-            //根据单警柜id获取组织机构id
-            String orgId = cabinetMapper.getOrgByCabinet(msg.get("cabinetId").toString());
-
-            //根据组织机构id,查询所有的警员
-            List<Map<String, Object>> allPolicemanByOrg = policemanMapper.getAllPolicemanByOrg(orgId);
-            return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,allPolicemanByOrg);
-
-        }else if(type.equals("single")){
-            allMsg.put("id",oneCabinet.get("id"));
-            allMsg.put("cabinetNum",oneCabinet.get("cabinetNum"));
-            allMsg.put("name",oneCabinet.get("name"));
-            allMsg.put("orgId",oneCabinet.get("orgId"));
-            allMsg.put("orgName",oneCabinet.get("orgName"));
-            allMsg.put("location",oneCabinet.get("location"));
-            List<Map<String, Object>> allBoxMsg = cabinetBoxMapper.getBoxMsg(cabinetMsg);
-            List<Map<String, Object>> policeMsg = new ArrayList<>();
-            for (Map<String, Object> boxMsg:allBoxMsg){
-                String cabinetBoxId = boxMsg.get("cabinetBoxId").toString();
-                List<String> allPoliceIdByBoxId = policemanMapper.getAllPoliceIdByBoxId(cabinetBoxId);
-                for(String policeId:allPoliceIdByBoxId){
-                    Map<String, Object> onePolice = policemanMapper.getOnePolice(policeId);
-                    List<Map<String, Object>> fingerprints= policeFingerMapper.getFingersByUserId(policeId);
-                    onePolice.put("fingerMsg",fingerprints);
-                    policeMsg.add(onePolice);
-                }
-            }
-            allMsg.put("policeList",policeMsg);
-            return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,allMsg);
-        }else if(type.equals("allBind")){
-            //构建存放返回信息的List
-            List<Map<String,Object>> returnMsg = new ArrayList<>();
-
-            //根据单警柜id获取组织机构id
-            String orgId = cabinetMapper.getOrgByCabinet(msg.get("cabinetId").toString());
-
-            //根据组织机构id获取下面的所有单警柜
-            List<Map<String, Object>> allCabinet = cabinetMapper.getCabinetByOrgId(orgId);
-
-            //根据单警柜的List,查询所有绑定的警员信息
-            for (Map<String, Object> one:allCabinet){
-
-                //构建cabinet的map
-                Map<String, Object> cabinetMap = new HashMap<>();
-                cabinetMap.put("id",one.get("id"));
-                cabinetMap.put("cabinetNum",one.get("cabinetNum"));
-                cabinetMap.put("name",one.get("name"));
-                cabinetMap.put("orgId",one.get("orgId"));
-                cabinetMap.put("orgName",one.get("orgName"));
-                cabinetMap.put("location",one.get("location"));
-
-                List<Map<String, Object>> allBoxMsg = cabinetBoxMapper.getBoxMsg(one.get("id").toString());
-                List<Map<String, Object>> policeMsg = new ArrayList<>();
-                for (Map<String, Object> boxMsg:allBoxMsg){
-                    String cabinetBoxId = boxMsg.get("cabinetBoxId").toString();
-                    List<String> allPoliceIdByBoxId = policemanMapper.getAllPoliceIdByBoxId(cabinetBoxId);
-                    for(String policeId:allPoliceIdByBoxId){
-                        Map<String, Object> onePolice = policemanMapper.getOnePolice(policeId);
-                        List<Map<String, Object>> fingerprints= policeFingerMapper.getFingersByUserId(policeId);
-                        onePolice.put("fingerMsg",fingerprints);
-                        policeMsg.add(onePolice);
-                    }
-                }
-                cabinetMap.put("policeList",policeMsg);
-
-                //将cabinetMap放入list
-                returnMsg.add(cabinetMap);
-            }
-            return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,returnMsg);
-        }else {
-            return new ResponseResult(HttpStatus.ERROR,ReturnMsg.ERROR,"传入的type有误");
+        Policeman police = getOne(new LambdaQueryWrapper<Policeman>()
+                .eq(ObjectUtil.isNotEmpty(req.getId()),Policeman::getId,req.getId()));
+        if (ObjectUtil.isNull(police)){
+            throw new ServiceException(PolicemanExceptionEnum.POLICEMAN_NOT_EXIST);
         }
-//        // 构建 Redis 缓存键
-//        String redisKey = "getPoliceData" + cabinetId.get("cabinetId").toString();
-//        // 从 Redis 中获取数据
-//        Map<String, Object> cachedData = redisUtils.findCachedData(redisKey);
-//        if (cachedData != null) {
-//            //将Long类型的数据转化为Date
-////            for (Map<String,Object> one:cachedData){
-////                Long dataMsg = (Long) one.get("updateTime");
-////                one.put("updateTime", redisUtils.getDate(dataMsg));
-////                allPoliceman.add(one);
-////            }
-//            return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,cachedData);
-//        }
-
-
-
-        //将查询结果存入 Redis 中
-        //redisUtils.set(redisKey, allMsg);
+        police.setFaceInfo(req.getFaceInfo());
+        police.setUpdateTime(DateTimeUtil.getCurrentDateTime());
+        return policemanService.updateById(police);
     }
 
     /**
@@ -757,14 +486,13 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
          * @return
          **/
     @Override
-    public boolean updateFaceInfo(PolicemanReq req) {
+    public boolean UpdateFaceInfo(UpdatePolicemanReq req) {
         //警员id不能为空
         if (ObjectUtil.isEmpty(req.getId()) || ObjectUtil.isNull(req.getId())){
             return false;
         }
-        LambdaQueryWrapper<Policeman> eq = PolicemanWrapper(req)
-                .eq(ObjectUtil.isNotEmpty(req.getId()), Policeman::getId, req.getId());
-        Policeman police = policemanService.getOne(eq);
+        Policeman police = policemanService.getOne(new LambdaQueryWrapper<Policeman>()
+                .eq(ObjectUtil.isNotEmpty(req.getId()), Policeman::getId, req.getId()));
         police.setFaceInfo(req.getFaceInfo());
         police.setUpdateTime(DateTimeUtil.getCurrentDateTime());
         return policemanService.updateById(police);
@@ -779,14 +507,13 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
          * @return
          **/
     @Override
-    public Policeman searchFaceInfo(PolicemanReq req) {
+    public Policeman SearchFaceInfo(PolicemanReq req) {
         //警员id不能为空
         if (ObjectUtil.isEmpty(req.getId()) || ObjectUtil.isNull(req.getId())){
             return null;
         }
-        LambdaQueryWrapper<Policeman> eq = PolicemanWrapper(req)
-                .eq(ObjectUtil.isNotEmpty(req.getId()), Policeman::getId, req.getId());
-        Policeman policeman = policemanService.getOne(eq);
+        Policeman policeman = policemanService.getOne(new LambdaQueryWrapper<Policeman>()
+                .eq(ObjectUtil.isNotEmpty(req.getId()), Policeman::getId, req.getId()));
         if (ObjectUtil.isNull(policeman)){
             throw new ServiceException(PolicemanExceptionEnum.POLICEMAN_NOT_EXIST);
         }
@@ -794,30 +521,62 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
 
     }
 
-    //通过单警柜获取组织机构id,再获取组织机构下的所有警员信息
-    @Override
-    public List<Policeman> getOrgPoliceman(CabinetReq req) {
 
-        //通过警柜id获取组织机构id
-        Cabinet cabinet = cabinetService.getOne(new LambdaQueryWrapper<Cabinet>()
-                .eq(ObjectUtil.isNotEmpty(req.getId()),Cabinet::getId, req.getId()));
-        if (ObjectUtil.isNull(cabinet)){
-            return null;
+    /**
+     * 警员绑定账号
+     * @param req
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean PoliceBindUser(PolicemanReq req) {
+        User user = new User();
+        BeanPlusUtil.copyProperties(req,user);
+        //密码加密，依赖注入错误
+        BcryptPasswordStoredEncrypt passwordStoredEncrypt = new BcryptPasswordStoredEncrypt();
+        String encrypt = passwordStoredEncrypt.encrypt(req.getPassword());
+        user.setPassword(encrypt);
+        //存储到数据库
+        //判断传入的sex是什么，需要做处理
+        if (req.getSex().equals("男")){
+            user.setSex("M");
+        }else{
+            user.setSex("F");
+        }
+        user.setRealName(req.getName());
+        user.setNickName(req.getName());
+        sysUserService.save(user);
+
+        //通过警员id将查询到的警员信息进行修改设置
+        Policeman policeman = policemanService.getOne(new LambdaQueryWrapper<Policeman>()
+                .eq(Policeman::getId, req.getId()));
+        if (ObjectUtil.isNull(policeman)){
+            throw new ServiceException(PolicemanExceptionEnum.POLICEMAN_NOT_EXIST);
         }
-        long orgId = cabinet.getOrgId();
-        //通过机构id获取机构下所有的警员信息
-        List<Policeman> policemenList = policemanService.list(new LambdaQueryWrapper<Policeman>()
-                .eq(Policeman::getOrgId, orgId));
-        return policemenList;
+        policeman.setUserId(user.getUserId());
+        policeman.setIsCreatedAccount(true);
+        policeman.setPassword(encrypt);
+        return policemanService.updateById(policeman);
     }
 
-    private LambdaQueryWrapper<Policeman> PolicemanWrapper(PolicemanReq req) {
-        LambdaQueryWrapper<Policeman> wrapper = new LambdaQueryWrapper<>();
-        //查询全部
-        if (ObjectUtil.isEmpty(req)) {
-            return wrapper;
+    //人员绑定箱门
+    @Override
+    public boolean PoliceBindBox(PolicemanReq req) {
+        Policeman policeman = new Policeman();
+        BeanPlusUtil.copyProperties(req,policeman);
+        Policeman one = policemanService.getOne(new LambdaQueryWrapper<Policeman>()
+                .eq(Policeman::getId, req.getId()));
+        if (ObjectUtil.isNull(one)){
+            throw new ServiceException(PolicemanExceptionEnum.POLICEMAN_NOT_EXIST);
         }
-        return wrapper;
+        //判断箱子是否存在
+        CabinetBox cabinetBox = cabinetBoxService.getOne(new LambdaQueryWrapper<CabinetBox>()
+                .eq(CabinetBox::getId, req.getCabinetBoxId()));
+        if (ObjectUtil.isNull(cabinetBox)){
+            throw new ServiceException(CabinetBoxExceptionEnum.CABINETBOX_ISNOT_EXISTS);
         }
+        return policemanService.updateById(policeman);
+    }
+
 
 }

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

@@ -22,17 +22,7 @@
         WHERE f.cabinet_id = #{id};
   </select>
 
-  <update id="changeCabinetState">
-        update base_cabinet_box f
-        set state = #{state},error_msg=#{errorMsg}
-        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" />
@@ -147,26 +146,6 @@
             #{item}
         </foreach>
     </select>
-    <select id="getAllCabinetByOrgList111" resultType="com.junmp.jyzb.Dto.CabinetDto">
-        select
-        c.id,
-        c.cabinet_num as cabinetNum,
-        c.name,
-        o.org_id as orgId,
-        o.org_name as orgName,
-        c.location,
-        c.state,
-        c.update_time as updateTime,
-        c.sum as sum,
-        c.in_sum as inSum,
-        c.out_sum as outSum
-        from base_cabinet c
-        left join pub_org o on c.org_id_int =o.org_id
-        where c.org_id_int in
-        <foreach item="item" collection="list" open="(" separator="," close=")">
-            #{item}
-        </foreach>
-    </select>
 
 
     <update id="setCabinetSumInventory">
@@ -249,4 +228,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-boot/jyzb-boot.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="web" name="Web">
-      <configuration>
-        <webroots>
-          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
     <facet type="jpa" name="JPA">
       <configuration>
         <setting name="validation-enabled" value="true" />
@@ -21,308 +14,4 @@
       <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="module" module-name="jyzb-api" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.4" level="project" />
-    <orderEntry type="library" name="Maven: p6spy:p6spy:3.9.1" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.21" level="project" />
-    <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.11.4" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:log-biz-manage:1.0.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: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.boot:spring-boot-starter-json:2.4.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: com.junmp.v2:wrapper-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-log-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-config-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:system-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:scanner-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-log-db:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:junmp-v2-common:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.oshi:oshi-core:6.3.2" level="project" />
-    <orderEntry type="library" name="Maven: net.java.dev.jna:jna:5.12.1" level="project" />
-    <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:5.12.1" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.27" level="project" />
-    <orderEntry type="library" name="Maven: com.github.whvcse:easy-captcha:1.6.2" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-security-boot-starter:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-cache-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:security-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:security-captcha:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-cache-memory:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:security-xss:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:security-sdk-listing:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:security-count:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-config-boot-starter:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-config-biz:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:config-redis-sdk:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-config-sdk:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-db-boot-starter:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-db-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-db-mp:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-db-init:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-db-flyway:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.flywaydb:flyway-core:7.1.1" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-log-boot-starter:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-log-file:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:log-biz-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:swagger2-boot-starter:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:31.0.1-jre" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.12.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-starter:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.25.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webflux:3.0.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-oas:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.1.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-core:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.4" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-boot-starter:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-data-rest:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-ui:3.0.3" 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:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:swagger2-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-redis-boot-starter:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-cache-redis:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:3.3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.9.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:file-boot-starter:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:file-biz:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:file-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:file-local:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:file-minio:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.minio:minio:3.0.10" level="project" />
-    <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-xml:1.20.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.20.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.14" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.9" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.12.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:3.0.1" level="project" />
-    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:system-boot-starter:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:system-biz-user:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:system-biz-resource:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:system-biz-role:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:system-biz-org:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:system-biz-menu:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:system-biz-app:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:system-biz-login-log:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:auth-boot-starter:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:auth-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:auth-sdk:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-jwt-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:message-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-jwt-sdk:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:validator-boot-starter:1.0.0" 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-beans:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.5" 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-expression:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-validator-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.1.7.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:job-boot-starter:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-job-biz:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-job-hutool:1.0.0" level="project" />
-    <orderEntry type="module" module-name="jyzb-biz" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.20" level="project" />
-    <orderEntry type="module" module-name="jyzb-api" />
-    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
-    <orderEntry type="module" module-name="jyzb-common" />
-    <orderEntry type="library" name="Maven: com.junmp.v2:v2-job-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.junmp.jyzb:jyzb-process:1.0.0" 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.module:jackson-module-jaxb-annotations:2.11.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.4" 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.springframework:spring-web:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.4.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.4.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.4.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.0.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.73.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.73.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.73.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.73.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.73.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-tcnative-classes:2.0.46.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.73.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generator:3.4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-spring-boot-starter:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-spring-boot-autoconfigure:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-spring-security:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-idm-api:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-spring-boot-starter-process:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-engine:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-process-validation:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-image-generator:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-engine-common:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-variable-service-api:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-event-registry-api:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-variable-service:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-identitylink-service:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-identitylink-service-api:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-entitylink-service:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-entitylink-service-api:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-event-registry:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-event-registry-model:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-event-registry-json-converter:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-eventsubscription-service-api:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-event-registry-configurator:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-eventsubscription-service:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-task-service:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-task-service-api:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-job-service:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-job-service-api:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-batch-service:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-batch-service-api:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-idm-engine:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-idm-engine-configurator:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-cmmn-api:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-cmmn-model:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-dmn-api:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-form-model:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-form-api:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-content-api:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-http-common:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-email:1.5" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.mail:javax.mail:1.5.6" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-spring:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-spring-common:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-job-spring-service:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-event-registry-spring-configurator:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-event-registry-spring:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-orm:5.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-spring-boot-starter-cmmn:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-cmmn-engine:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-cmmn-image-generator:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-cmmn-converter:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-case-validation:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.liquibase:liquibase-core:3.10.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.uuid:java-uuid-generator:3.3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-cmmn-spring:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-spring-boot-starter-dmn:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-dmn-engine:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-dmn-model:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-dmn-xml-converter:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-dmn-image-generator:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-dmn-spring:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-spring-configurator:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-engine-configurator:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-cmmn-spring-configurator:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-cmmn-engine-configurator:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-dmn-spring-configurator:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-dmn-engine-configurator:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-content-spring-configurator:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-content-spring:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-content-engine:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-content-engine-configurator:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-bpmn-model:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-json-converter:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: joda-time:joda-time:2.10.10" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-bpmn-converter:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-engine-common-api:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.flowable:flowable-bpmn-layout:6.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.tinyjee.jgraphx:jgraphx:1.10.4.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0.1" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.22" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.8.83" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.4" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-integration:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-core:5.4.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-messaging: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.retry:spring-retry:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-stream:5.4.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-mqtt:5.4.5" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5" level="project" />
-  </component>
 </module>
\ 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

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