feature(人员同步导入机构id添加): 人员同步导入机构id添加

人员同步导入机构id添加

dcuc-auth-model/src/main/java/com/dragoninfo/dcuc/auth/sub/dto/AuthUserDTO.java

@@ -45,6 +45,12 @@ public class AuthUserDTO {
     @ApiModelProperty(value = "警号")
     private String policeNumber;
 
+    /**
+     * 所在机构id
+     */
+    @ApiModelProperty(value = "所在机构id")
+    private String orgId;
+
     /**
      * 所在机构编码
      */

dcuc-auth-model/src/main/java/com/dragoninfo/dcuc/auth/sub/dto/ExcelImpUserInfo.java

@@ -40,6 +40,11 @@ public class ExcelImpUserInfo {
      */
     private String policeNumber;
 
+    /**
+     * 机构id
+     */
+    private String orgId;
+
     /**
      * 机构code
      */
@@ -86,5 +91,4 @@ public class ExcelImpUserInfo {
      */
     private String area;
 
-
 }

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/entity/AuthUserInfo.java

@@ -62,6 +62,12 @@ public class AuthUserInfo implements LogicDeleteable, IdEntity<String> {
     @Column(name = "POLICE_NUMBER")
     private String policeNumber;
 
+    /**
+     * 机构id
+     */
+    @Column(name = "ORG_ID")
+    private String orgId;
+
     /**
      * 所在机构编码
      */

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/service/impl/AuthUserInfoService.java

@@ -231,7 +231,7 @@ public class AuthUserInfoService implements IAuthUserInfoService {
 
         List<String> idcards = list.stream().map(item -> item.getIdcard()).collect(Collectors.toList());
 
-        //机构和身份证是否存在校验
+        //身份证是否存在校验
         List<String> existIdcards = getExistIdcards(idcards);
         if(CollectionUtils.isNotEmpty(existIdcards)) {
             String exist = existIdcards.stream().collect(Collectors.joining(","));
@@ -299,6 +299,7 @@ public class AuthUserInfoService implements IAuthUserInfoService {
             AuthOrgInfo authOrgInfo = orgInfoMap.get(item.getOrgCode());
             if(null != authOrgInfo) {
                 item.setOrgName(authOrgInfo.getFullName());
+                item.setOrgId(authOrgInfo.getId());
             }
         });
         //将辅警的人员类型设置到auxiliaryType字段上

dcuc-auth-service/src/main/resources/config/mysql/V4_3_0014__Add_Org_Id.sql

@@ -0,0 +1,4 @@
+-- 新增orgId字段
+ALTER TABLE `t_auth_user_info` ADD `ORG_ID`varchar(32) DEFAULT NULL COMMENT '机构id' AFTER `POLICE_NUMBER`;
+-- orgId字段数据处理 手动处理 数据量大
+-- UPDATE `t_auth_user_info` u INNER JOIN `t_auth_org_info` o ON u.org_code = o.code SET u.org_id = o.ID;