系统人员和消防人员同步优化

amos-boot-utils/amos-boot-utils-adpter/src/main/java/com/yeejoin/amos/adpter/service/AdpterService.java

@@ -202,7 +202,7 @@ public class AdpterService {
             map.put("AGENCY_CODE", "ONEPLOT");
             map.put("REC_DATE", time);
             //去重
-            if(!oldUserId.contains(map.get("SEQUENCE_NBR").toString())){
+            if(!oldUserId.contains(map.get("SEQUENCE_NBR").toString())&&!"5048575".equals(map.get("USER_ID").toString())){
                 query.add(map);
             }
         }
@@ -225,7 +225,8 @@ public class AdpterService {
                 }
                 params.add(param);
                 //用户公司表数据、用户角色表数据、用户与应用关联表数据插入
-                if (map.containsKey("USER_ID") && !ObjectUtils.isEmpty(map.get("USER_ID"))&&!userId.contains(map.get("USER_ID").toString())) {
+                if (map.containsKey("USER_ID") && !ObjectUtils.isEmpty(map.get("USER_ID"))&&
+                        !userId.contains(map.get("USER_ID").toString())&& !"5048575".equals(map.get("USER_ID").toString())) {
                     userId.add(map.get("USER_ID").toString());
                     sqlList.add("INSERT INTO `privilege_group_user` (`SEQUENCE_NBR`, `GROUP_SEQ`, `USER_ID`, `AGENCY_CODE`, `REC_DATE`, `REC_USER_ID`, `SUB_ORG_SEQ`) VALUES (" + HutoolIdGenerator.generate() + ", " + projectRoleSeq + ", '" + map.get("USER_ID") + "', 'ONEPLOT', '"+ time +"', '4950517', NULL)");
                     sqlList.add("INSERT INTO `privilege_user_org_role` (`SEQUENCE_NBR`, `REC_DATE`, `REC_USER_ID`, `USER_ID`, `COMPANY_SEQ`, `DEPARTMENT_SEQ`, `AGENCY_CODE`, `ROLE_SEQ`) VALUES (" + HutoolIdGenerator.generate() + ", '"+ time +"', '4950517', '" + map.get("USER_ID") + "', " + projectOrgSeq + ", NULL, 'ONEPLOT', " + projectRoleSeq + ")");
@@ -447,7 +448,7 @@ public class AdpterService {
                 ResultSet resultSet = pst.executeQuery();
                 while (resultSet.next()) {
                     int num = resultSet.getInt("num");
-                    if (num < 1) {
+                    if (num < 1 && !"5144631".equals(map.get("USER_ID").toString())) {
                         query.add(map);
                     } else {
                         list.add(map.get(id).toString());

amos-boot-utils/amos-boot-utils-adpter/src/main/java/com/yeejoin/amos/adpter/util/HutoolIdGenerator.java

@@ -4,7 +4,7 @@ import cn.hutool.core.util.IdUtil;
 
 public class HutoolIdGenerator {
     public static long generate() {
-        Snowflake snowflake = IdUtil.getSnowflake(1, 3); // 指定workerId和datacenterId
+        Snowflake snowflake = IdUtil.getSnowflake(1, 4); // 指定workerId和datacenterId
         return snowflake.nextId();
     }
 

amos-boot-utils/amos-boot-utils-adpter/src/main/resources/application-dev.properties

@@ -7,15 +7,15 @@ eureka.instance.health-check-url-path=/actuator/health
 eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
 eureka.instance.status-page-url-path=/actuator/info
 eureka.instance.metadata-map.management.api-docs=http://39.100.71.139:${server.port}${server.servlet.context-path}/swagger-ui.html
-#����ʵ��ip��ַ����eureka.instance.prefer-ip-address=false,ip-address����ʧЧ��һ������������á�
+#����ʵ��ip��ַ����eureka.instance.prefer-ip-address=false,ip-address����ʧЧ��һ������������á�
 #eureka.instance.ip-address= 172.16.3.135
-#eureka����ip���ã�����д�̶�ip��ַ
+#eureka����ip���ã�����д�̶�ip��ַ
 eureka.instance.hostname=172.16.11.201
-#eureka�������õ�У���˺ż�����,�������eureka�����̨�����ļ���һ��
+#eureka�������õ�У���˺ż�����,�������eureka�����̨�����ļ���һ��
 spring.security.user.name=admin
 spring.security.user.password=ENC(L4qq21tOLsPYx2assArZ2y0/dfYZFRtVZWzj31kDKo66XB/Kgw7759Psu+deB2N1)
 eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@${eureka.instance.hostname}:10001/eureka/
-##########eureka������Ϣ###############
+##########eureka������Ϣ###############
 
 management.health.redis.enabled=false
 
@@ -29,19 +29,19 @@ source.jdbc.ip.buss=jdbc:mysql://172.16.11.201:3306/dl_business?useUnicode=true&
 goal.jdbc.ip.buss=jdbc:mysql://172.16.11.201:3306/dl_business_copy?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
 
 source.jdbc.ip.dataview=jdbc:mysql://39.100.71.139:3307/amos-iot-data-view?allowMultiQueries=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
-goal.jdbc.ip.dlbuss=jdbc:mysql://39.100.71.139:3307/ykz_business?allowMultiQueries=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+goal.jdbc.ip.dlbuss=jdbc:mysql://172.16.0.25:3307/cj_dl_business_v3.0.1.3?allowMultiQueries=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
 goal.jdbc.ip.relation=jdbc:mysql://39.100.71.139:3307/iot-data-index?allowMultiQueries=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
-goal.jdbc.ip.dlcom=jdbc:mysql://172.16.11.201:3307/gusu_common?allowMultiQueries=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+goal.jdbc.ip.dlcom=jdbc:mysql://172.16.0.25:3307/cj_dl_amos_common_biz?allowMultiQueries=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
 
 
 goal.jdbc.ip.project=jdbc:mysql://39.100.71.139:3307/amos_project?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
-source.jdbc.ip.project=jdbc:mysql://39.100.71.139:3307/wh_project?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
-## 系统用户要同步公司的ID
-goal.jdbc.ip.project.org.seq=1921835551384690690
-## 系统用户要同步角色的ID
-goal.jdbc.ip.project.role.seq=1769904956711661569
-## 系统用户同步数据插入时间（建议每个站不一样，方便恢复数据）
-goal.jdbc.ip.project.user.rec-time=2011-11-11 11:11:52
+source.jdbc.ip.project=jdbc:mysql://39.100.71.139:3307/gusu_amos_project?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+## 系统用户要同步公司的ID
+goal.jdbc.ip.project.org.seq=1920040218673569793
+## 系统用户要同步角色的ID
+goal.jdbc.ip.project.role.seq=1924390137286914050
+## 系统用户同步数据插入时间（建议每个站不一样，方便恢复数据）
+goal.jdbc.ip.project.user.rec-time=2011-11-11 11:11:36
 
 yeejoin.user=root
 yeejoin.pwd=Yeejoin@2020
\ No newline at end of file