diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml
index f5baf54244..917387298a 100644
--- a/epmet-admin/epmet-admin-server/pom.xml
+++ b/epmet-admin/epmet-admin-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.33</version>
+    <version>0.3.35</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-admin</artifactId>
@@ -120,7 +120,7 @@
                 <spring.datasource.druid.username>epmet_admin_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
+                <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -168,7 +168,7 @@
                 <spring.datasource.druid.username>epmet_admin_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
+                <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -209,19 +209,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>root</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Abc@123456</spring.datasource.druid.password>
+                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
-                <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.port>10001</spring.redis.port>
-                <spring.redis.password>elink!888</spring.redis.password>
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
-                <nacos.discovery.namespace>fd1029d1-0caa-4e3b-a62d-0d4a03a2f693</nacos.discovery.namespace>
+                <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
+                <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -233,7 +233,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>114.215.125.123:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.10.165:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
 
                 <!--线程池-->
@@ -254,18 +254,18 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>epmet_admin_user</spring.datasource.druid.username>
+                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>5</spring.redis.index>
-                <spring.redis.host>r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>Elink833066</spring.redis.password>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.0.53:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
                 <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
@@ -279,7 +279,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.16.0.53:9876;172.16.0.51:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
 
                 <!--线程池-->
diff --git a/epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml b/epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml
index 94112d1c19..3d27fa4d07 100644
--- a/epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml
+++ b/epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/admin"/>
 
diff --git a/epmet-auth/src/main/resources/logback-spring.xml b/epmet-auth/src/main/resources/logback-spring.xml
index 6cc55ee386..3ddc774384 100644
--- a/epmet-auth/src/main/resources/logback-spring.xml
+++ b/epmet-auth/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/auth"/>
 
@@ -138,12 +139,36 @@
         </filter>
     </appender>
 
+    <!--  rocketmq client 的日志appender  -->
+    <appender name="RocketmqClientAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/rocketmqclient.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/rocketmqclient-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+    </appender>
+
     <!-- 开发、测试环境 -->
     <springProfile name="local,dev,test">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet" level="INFO"/>
         <logger name="com.epmet" level="DEBUG"/>
+        <!-- 只打印rocketmq client的日志 -->
+        <logger name="RocketmqClient" level="INFO" additivity="false">
+            <appender-ref ref="RocketmqClientAppender"/>
+        </logger>
         <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>
@@ -157,6 +182,10 @@
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet" level="INFO"/>
+        <!-- 只打印rocketmq client的日志 -->
+        <logger name="RocketmqClient" level="INFO" additivity="false">
+            <appender-ref ref="RocketmqClientAppender"/>
+        </logger>
         <root level="INFO">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="DEBUG_FILE"/>
diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java
index 1a4b303c3c..2aadd34cb4 100644
--- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java
+++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java
@@ -93,4 +93,9 @@ public interface ConsomerGroupConstants {
      * 志愿者变更
      */
     String VOLUNTEER_CHANGE_EVENT_LISTENER_GROUP = "volunteer_change_event_listener_group";
+
+    /**
+     * 创建党员居民信息消费者组，将user库的党员信息同步到partymember库的党员表。
+     */
+    String CREATE_RESI_PARTYMEMBER_SYNC_GROUP = "create_resi_sync_group";
 }
diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java
index beef085faa..e700095481 100644
--- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java
+++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java
@@ -79,4 +79,9 @@ public interface TopicConstants {
      * 志愿者
      */
     String VOLUNTEER ="volunteer";
+
+    /**
+     * 居民的党员信息
+     */
+    String PARTYMEMBER_RESI = "partymember_resi";
 }
diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartymemberSyncMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartymemberSyncMQMsg.java
new file mode 100644
index 0000000000..d9010854e0
--- /dev/null
+++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartymemberSyncMQMsg.java
@@ -0,0 +1,60 @@
+package com.epmet.commons.rocketmq.messages;
+
+import com.epmet.commons.tools.dto.form.mq.MqBaseFormDTO;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * user库党员信息同步到partymember库的mq消息
+ */
+@Data
+public class PartymemberSyncMQMsg extends MqBaseFormDTO {
+
+    /**
+     * 党员列表，允许一次传输多个党员信息
+     */
+    private List<PartyMemberSyncForm> partymemberList = new ArrayList<>();
+
+    @Data
+    public static class PartyMemberSyncForm {
+
+        private String customerId;
+        private String agencyId;
+        private String agencyPids;
+        private String icResiUser;
+        private String name;
+        private String idCard;
+        private String mobile;
+        private String address;
+        private String rdsj;
+        private String sszb;
+        /**
+         * 是否流动党员
+         */
+        private String isLd;
+
+        /**
+         * 流动党员活动证号
+         */
+        private String ldzh;
+        /**
+         * 职务
+         */
+        private String partyZw;
+        /**
+         * 是否退休
+         */
+        private String isTx;
+        /**
+         * 是否党员中心户
+         */
+        private String isDyzxh;
+        /**
+         * 志愿者类型,逗号隔开
+         */
+        private String volunteerCategory;
+
+    }
+}
diff --git a/epmet-commons/epmet-commons-tools/src/main/resources/logback-base.xml b/epmet-commons/epmet-commons-tools/src/main/resources/logback-base.xml
new file mode 100644
index 0000000000..4d40231ff9
--- /dev/null
+++ b/epmet-commons/epmet-commons-tools/src/main/resources/logback-base.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Base logback configuration provided for compatibility with Spring Boot 1.1
+从spring/logging包复制过来的，主要是屏蔽了/tmp/spring.log文件的生成(与我们自定义的重复，且不会滚动更新)。其他服务都改用引用此文件。
+-->
+
+<included>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <!--<property name="LOG_FILE" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/spring.log}"/>-->
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+    <include resource="org/springframework/boot/logging/logback/file-appender.xml" />
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="FILE" />
+    </root>
+</included>
\ No newline at end of file
diff --git a/epmet-gateway/src/main/resources/logback-spring.xml b/epmet-gateway/src/main/resources/logback-spring.xml
index 8cffd573f8..1e050e9686 100644
--- a/epmet-gateway/src/main/resources/logback-spring.xml
+++ b/epmet-gateway/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/gateway"/>
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/logback-spring.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/logback-spring.xml
index a33066487a..c639482221 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/data-aggregator"/>
 
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml
index 85893a5907..86de057fc6 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/data-report"/>
 
diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml
index f4bb8ef5c7..98bb995c7e 100644
--- a/epmet-module/data-statistical/data-statistical-server/pom.xml
+++ b/epmet-module/data-statistical/data-statistical-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.347</version>
+    <version>0.3.382</version>
     <parent>
         <artifactId>data-statistical</artifactId>
         <groupId>com.epmet</groupId>
@@ -274,7 +274,7 @@
                 <datasource.druid.operCustomize.password>EpmEt-db-UsEr</datasource.druid.operCustomize.password>
 
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
+                <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -412,7 +412,7 @@
                 <datasource.druid.operCustomize.password>EpmEt-db-UsEr</datasource.druid.operCustomize.password>
 
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
+                <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -459,88 +459,88 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.stats.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.stats.url>
-                <datasource.druid.stats.username>root</datasource.druid.stats.username>
-                <datasource.druid.stats.password>Abc@123456</datasource.druid.stats.password>
+                <datasource.druid.stats.username>epmet</datasource.druid.stats.username>
+                <datasource.druid.stats.password>elink@833066</datasource.druid.stats.password>
 
                 <datasource.druid.org.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.org.url>
-                <datasource.druid.org.username>root</datasource.druid.org.username>
-                <datasource.druid.org.password>Abc@123456</datasource.druid.org.password>
+                <datasource.druid.org.username>epmet</datasource.druid.org.username>
+                <datasource.druid.org.password>elink@833066</datasource.druid.org.password>
 
                 <datasource.druid.issue.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.issue.url>
-                <datasource.druid.issue.username>root</datasource.druid.issue.username>
-                <datasource.druid.issue.password>Abc@123456</datasource.druid.issue.password>
+                <datasource.druid.issue.username>epmet</datasource.druid.issue.username>
+                <datasource.druid.issue.password>elink@833066</datasource.druid.issue.password>
 
                 <datasource.druid.project.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.project.url>
-                <datasource.druid.project.username>root</datasource.druid.project.username>
-                <datasource.druid.project.password>Abc@123456</datasource.druid.project.password>
+                <datasource.druid.project.username>epmet</datasource.druid.project.username>
+                <datasource.druid.project.password>elink@833066</datasource.druid.project.password>
 
                 <datasource.druid.voice.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.voice.url>
-                <datasource.druid.voice.username>root</datasource.druid.voice.username>
-                <datasource.druid.voice.password>Abc@123456</datasource.druid.voice.password>
+                <datasource.druid.voice.username>epmet</datasource.druid.voice.username>
+                <datasource.druid.voice.password>elink@833066</datasource.druid.voice.password>
 
                 <datasource.druid.crm.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.crm.url>
-                <datasource.druid.crm.username>root</datasource.druid.crm.username>
-                <datasource.druid.crm.password>Abc@123456</datasource.druid.crm.password>
+                <datasource.druid.crm.username>epmet</datasource.druid.crm.username>
+                <datasource.druid.crm.password>elink@833066</datasource.druid.crm.password>
 
                 <datasource.druid.group.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.group.url>
-                <datasource.druid.group.username>root</datasource.druid.group.username>
-                <datasource.druid.group.password>Abc@123456</datasource.druid.group.password>
+                <datasource.druid.group.username>epmet</datasource.druid.group.username>
+                <datasource.druid.group.password>elink@833066</datasource.druid.group.password>
 
                 <datasource.druid.user.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.user.url>
-                <datasource.druid.user.username>root</datasource.druid.user.username>
-                <datasource.druid.user.password>Abc@123456</datasource.druid.user.password>
+                <datasource.druid.user.username>epmet</datasource.druid.user.username>
+                <datasource.druid.user.password>elink@833066</datasource.druid.user.password>
 
                 <datasource.druid.statsdisplay.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.statsdisplay.url>
-                <datasource.druid.statsdisplay.username>root</datasource.druid.statsdisplay.username>
-                <datasource.druid.statsdisplay.password>Abc@123456</datasource.druid.statsdisplay.password>
+                <datasource.druid.statsdisplay.username>epmet</datasource.druid.statsdisplay.username>
+                <datasource.druid.statsdisplay.password>elink@833066</datasource.druid.statsdisplay.password>
 
                 <datasource.druid.evaluationIndex.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.evaluationIndex.url>
-                <datasource.druid.evaluationIndex.username>root</datasource.druid.evaluationIndex.username>
-                <datasource.druid.evaluationIndex.password>Abc@123456</datasource.druid.evaluationIndex.password>
+                <datasource.druid.evaluationIndex.username>epmet</datasource.druid.evaluationIndex.username>
+                <datasource.druid.evaluationIndex.password>elink@833066</datasource.druid.evaluationIndex.password>
 
                 <datasource.druid.evaluationIndex1.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.evaluationIndex1.url>
-                <datasource.druid.evaluationIndex1.username>root</datasource.druid.evaluationIndex1.username>
-                <datasource.druid.evaluationIndex1.password>Abc@123456</datasource.druid.evaluationIndex1.password>
+                <datasource.druid.evaluationIndex1.username>epmet</datasource.druid.evaluationIndex1.username>
+                <datasource.druid.evaluationIndex1.password>elink@833066</datasource.druid.evaluationIndex1.password>
 
                 <datasource.druid.partyMember.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.partyMember.url>
-                <datasource.druid.partyMember.username>root</datasource.druid.partyMember.username>
-                <datasource.druid.partyMember.password>Abc@123456</datasource.druid.partyMember.password>
+                <datasource.druid.partyMember.username>epmet</datasource.druid.partyMember.username>
+                <datasource.druid.partyMember.password>elink@833066</datasource.druid.partyMember.password>
 
                 <datasource.druid.epmetHeart.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.epmetHeart.url>
-                <datasource.druid.epmetHeart.username>root</datasource.druid.epmetHeart.username>
-                <datasource.druid.epmetHeart.password>Abc@123456</datasource.druid.epmetHeart.password>
+                <datasource.druid.epmetHeart.username>epmet</datasource.druid.epmetHeart.username>
+                <datasource.druid.epmetHeart.password>elink@833066</datasource.druid.epmetHeart.password>
 
                 <datasource.druid.epmetPoint.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.epmetPoint.url>
-                <datasource.druid.epmetPoint.username>root</datasource.druid.epmetPoint.username>
-                <datasource.druid.epmetPoint.password>Abc@123456</datasource.druid.epmetPoint.password>
+                <datasource.druid.epmetPoint.username>epmet</datasource.druid.epmetPoint.username>
+                <datasource.druid.epmetPoint.password>elink@833066</datasource.druid.epmetPoint.password>
 
                 <datasource.druid.operCustomize.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -549,14 +549,14 @@
                 <datasource.druid.operCustomize.password>elink@833066</datasource.druid.operCustomize.password>
 
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
-                <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.port>10001</spring.redis.port>
-                <spring.redis.password>elink!888</spring.redis.password>
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
-                <nacos.discovery.namespace>fd1029d1-0caa-4e3b-a62d-0d4a03a2f693</nacos.discovery.namespace>
+                <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
+                <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -582,7 +582,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>114.215.125.123:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.10.165:9876</rocketmq.nameserver>
             </properties>
         </profile>
         <profile>
@@ -593,103 +593,103 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.stats.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.stats.url>
-                <datasource.druid.stats.username>epdc</datasource.druid.stats.username>
-                <datasource.druid.stats.password>Elink@833066</datasource.druid.stats.password>
+                <datasource.druid.stats.username>epmet_data_statistical</datasource.druid.stats.username>
+                <datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
 
                 <datasource.druid.org.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.org.url>
-                <datasource.druid.org.username>epdc</datasource.druid.org.username>
-                <datasource.druid.org.password>Elink@833066</datasource.druid.org.password>
+                <datasource.druid.org.username>epmet_gov_org_user</datasource.druid.org.username>
+                <datasource.druid.org.password>EpmEt-db-UsEr</datasource.druid.org.password>
 
                 <datasource.druid.issue.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.issue.url>
-                <datasource.druid.issue.username>epdc</datasource.druid.issue.username>
-                <datasource.druid.issue.password>Elink@833066</datasource.druid.issue.password>
+                <datasource.druid.issue.username>epmet_gov_issue_user</datasource.druid.issue.username>
+                <datasource.druid.issue.password>EpmEt-db-UsEr</datasource.druid.issue.password>
 
                 <datasource.druid.project.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.project.url>
-                <datasource.druid.project.username>epdc</datasource.druid.project.username>
-                <datasource.druid.project.password>Elink@833066</datasource.druid.project.password>
+                <datasource.druid.project.username>epmet_gov_project_user</datasource.druid.project.username>
+                <datasource.druid.project.password>EpmEt-db-UsEr</datasource.druid.project.password>
 
                 <datasource.druid.voice.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.voice.url>
-                <datasource.druid.voice.username>epdc</datasource.druid.voice.username>
-                <datasource.druid.voice.password>Elink@833066</datasource.druid.voice.password>
+                <datasource.druid.voice.username>epmet_gov_voice_user</datasource.druid.voice.username>
+                <datasource.druid.voice.password>EpmEt-db-UsEr</datasource.druid.voice.password>
 
                 <datasource.druid.crm.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.crm.url>
-                <datasource.druid.crm.username>epdc</datasource.druid.crm.username>
-                <datasource.druid.crm.password>Elink@833066</datasource.druid.crm.password>
+                <datasource.druid.crm.username>epmet_oper_crm_user</datasource.druid.crm.username>
+                <datasource.druid.crm.password>EpmEt-db-UsEr</datasource.druid.crm.password>
 
                 <datasource.druid.group.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.group.url>
-                <datasource.druid.group.username>epdc</datasource.druid.group.username>
-                <datasource.druid.group.password>Elink@833066</datasource.druid.group.password>
+                <datasource.druid.group.username>epmet_resi_group_user</datasource.druid.group.username>
+                <datasource.druid.group.password>EpmEt-db-UsEr</datasource.druid.group.password>
 
                 <datasource.druid.user.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.user.url>
-                <datasource.druid.user.username>epdc</datasource.druid.user.username>
-                <datasource.druid.user.password>Elink@833066</datasource.druid.user.password>
+                <datasource.druid.user.username>epmet_user_user</datasource.druid.user.username>
+                <datasource.druid.user.password>EpmEt-db-UsEr</datasource.druid.user.password>
 
                 <datasource.druid.statsdisplay.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.statsdisplay.url>
-                <datasource.druid.statsdisplay.username>epdc</datasource.druid.statsdisplay.username>
-                <datasource.druid.statsdisplay.password>Elink@833066</datasource.druid.statsdisplay.password>
+                <datasource.druid.statsdisplay.username>epmet_data_stats_display_user</datasource.druid.statsdisplay.username>
+                <datasource.druid.statsdisplay.password>EpmEt-db-UsEr</datasource.druid.statsdisplay.password>
 
                 <datasource.druid.evaluationIndex.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.evaluationIndex.url>
-                <datasource.druid.evaluationIndex.username>epdc</datasource.druid.evaluationIndex.username>
-                <datasource.druid.evaluationIndex.password>Elink@833066</datasource.druid.evaluationIndex.password>
+                <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
+                <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
                 <datasource.druid.evaluationIndex1.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.evaluationIndex1.url>
-                <datasource.druid.evaluationIndex1.username>epdc</datasource.druid.evaluationIndex1.username>
-                <datasource.druid.evaluationIndex1.password>Elink@833066</datasource.druid.evaluationIndex1.password>
+                <datasource.druid.evaluationIndex1.username>epmet_cloud_viewer</datasource.druid.evaluationIndex1.username>
+                <datasource.druid.evaluationIndex1.password>EpmEtclOUdvIEwEr@w</datasource.druid.evaluationIndex1.password>
 
                 <datasource.druid.partyMember.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.partyMember.url>
-                <datasource.druid.partyMember.username>epdc</datasource.druid.partyMember.username>
-                <datasource.druid.partyMember.password>Elink@833066</datasource.druid.partyMember.password>
+                <datasource.druid.partyMember.username>epmet_resi_partymember_user</datasource.druid.partyMember.username>
+                <datasource.druid.partyMember.password>EpmEt-db-UsEr</datasource.druid.partyMember.password>
 
                 <datasource.druid.epmetHeart.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.epmetHeart.url>
-                <datasource.druid.epmetHeart.username>epdc</datasource.druid.epmetHeart.username>
-                <datasource.druid.epmetHeart.password>Elink@833066</datasource.druid.epmetHeart.password>
+                <datasource.druid.epmetHeart.username>epmet_heart_user</datasource.druid.epmetHeart.username>
+                <datasource.druid.epmetHeart.password>EpmEt-db-UsEr</datasource.druid.epmetHeart.password>
 
                 <datasource.druid.epmetPoint.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.epmetPoint.url>
-                <datasource.druid.epmetPoint.username>epdc</datasource.druid.epmetPoint.username>
-                <datasource.druid.epmetPoint.password>Elink@833066</datasource.druid.epmetPoint.password>
+                <datasource.druid.epmetPoint.username>epmet_point_user</datasource.druid.epmetPoint.username>
+                <datasource.druid.epmetPoint.password>EpmEt-db-UsEr</datasource.druid.epmetPoint.password>
 
                 <datasource.druid.operCustomize.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.operCustomize.url>
-                <datasource.druid.operCustomize.username>epdc</datasource.druid.operCustomize.username>
-                <datasource.druid.operCustomize.password>Elink@833066</datasource.druid.operCustomize.password>
+                <datasource.druid.operCustomize.username>epmet_oper_customize_user</datasource.druid.operCustomize.username>
+                <datasource.druid.operCustomize.password>EpmEt-db-UsEr</datasource.druid.operCustomize.password>
 
                 <!-- redis配置 -->
-                <spring.redis.index>5</spring.redis.index>
-                <spring.redis.host>r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>Elink833066</spring.redis.password>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.0.53:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
                 <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
@@ -716,7 +716,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.16.0.53:9876;172.16.0.51:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
index 1a92303138..7d2b7648a3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/data-statistical"/>
 
diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/logback-spring.xml
index 06dee672f2..280e9f4bb2 100644
--- a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/activiti"/>
 
diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java
index 1f7d8420ab..2108042cd6 100644
--- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java
@@ -21,6 +21,8 @@ public interface ImportTaskConstants {
     String BIZ_TYPE_IC_PARTY_MEMBER = "ic_party_member";
     String BIZ_TYPE_IC_DANGEROUS_CHEMICALS = "ic_dangerous_chemicals";
     String BIZ_TYPE_IC_ENTERPRISE="ic_enterprise";
+    String IC_POINT_NUCLEIC_MONITORING = "ic_point_nucleic_monitoring";
+    String IC_POINT_VACCINES_INOCULATION = "ic_point_vaccines_inoculation";
     /**
      * 核酸检测
      */
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml
index e9ea76e023..dbd4fe85bb 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/common-service"/>
 
diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/logback-spring.xml
index d131824d7c..1b8b94ba78 100644
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/demo"/>
 
diff --git a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml
index 19d477e27c..8f428f8d5f 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/ext"/>
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
index 651da0efd6..5d1c230a1c 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.77</version>
+    <version>0.0.81</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>
@@ -163,7 +163,7 @@
                 <datasource.druid.username>epmet_heart_user</datasource.druid.username>
                 <datasource.druid.password>EpmEt-db-UsEr</datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
+                <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -219,7 +219,7 @@
                 <datasource.druid.username>epmet_heart_user</datasource.druid.username>
                 <datasource.druid.password>EpmEt-db-UsEr</datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
+                <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -270,19 +270,19 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.url>
-                <datasource.druid.username>root</datasource.druid.username>
-                <datasource.druid.password>Abc@123456</datasource.druid.password>
+                <datasource.druid.username>epmet</datasource.druid.username>
+                <datasource.druid.password>elink@833066</datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
-                <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.port>10001</spring.redis.port>
-                <spring.redis.password>elink!888</spring.redis.password>
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
-                <nacos.discovery.namespace>fd1029d1-0caa-4e3b-a62d-0d4a03a2f693</nacos.discovery.namespace>
+                <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
+                <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -303,7 +303,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>114.215.125.123:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.10.165:9876</rocketmq.nameserver>
 
                 <!--线程池-->
                 <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
@@ -326,18 +326,18 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.url>
-                <datasource.druid.username>epdc</datasource.druid.username>
-                <datasource.druid.password>Elink@833066</datasource.druid.password>
+                <datasource.druid.username>epmet_heart_user</datasource.druid.username>
+                <datasource.druid.password>EpmEt-db-UsEr</datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>5</spring.redis.index>
-                <spring.redis.host>r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>Elink833066</spring.redis.password>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.0.53:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
                 <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
@@ -359,7 +359,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.16.0.53:9876;172.16.0.51:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
 
                 <!--线程池-->
                 <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml
index 3c5a3debf2..d0428fcee3 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/heart"/>
 
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml
index 6848af35bc..36cbaf8d12 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/job"/>
 
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java
index 13f409ca36..b60b3b8fe1 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java
@@ -165,4 +165,9 @@ public interface SystemMessageType {
      */
     String FINISH_USER_DEMAND="finish_user_demand";
 
+    /**
+     * 党员身份的居民信息导入
+     */
+    String PARTYMEMBER_RESI_IMPORT = "partymember_resi_import";
+
 }
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index 816ccd6d71..79f017f5d2 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -169,6 +169,16 @@ public interface UserMessageTypeConstant {
      */
     String ANTIEPIDEMIC="antiepidemic";
 
+    /**
+     * 核酸检测点通知
+     */
+    String NUCLEIC="nucleic";
+
+    /**
+     * 疫苗接种点通知
+     */
+    String VACCINES="vaccines";
+
 
     /**
      * 发布党建声音
diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml
index 0d6e2ab849..e374217adb 100644
--- a/epmet-module/epmet-message/epmet-message-server/pom.xml
+++ b/epmet-module/epmet-message/epmet-message-server/pom.xml
@@ -170,7 +170,7 @@
                 <spring.datasource.druid.username>epmet_message_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
+                <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -224,7 +224,7 @@
                 <spring.datasource.druid.username>epmet_message_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
+                <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -273,19 +273,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>root</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Abc@123456</spring.datasource.druid.password>
+                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
-                <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.port>10001</spring.redis.port>
-                <spring.redis.password>elink!888</spring.redis.password>
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
-                <nacos.discovery.namespace>fd1029d1-0caa-4e3b-a62d-0d4a03a2f693</nacos.discovery.namespace>
+                <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
+                <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -312,7 +312,7 @@
                 </dingTalk.robot.secret>
 
                 <!--rocketmq-->
-                <rocketmq.nameserver>114.215.125.123:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.10.165:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>
@@ -324,18 +324,18 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>epmet_message_user</spring.datasource.druid.username>
+                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>5</spring.redis.index>
-                <spring.redis.host>r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>Elink833066</spring.redis.password>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.0.53:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
                 <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
@@ -364,7 +364,7 @@
                 </dingTalk.robot.secret>
 
                 <!--rocketmq-->
-                <rocketmq.nameserver>172.16.0.53:9876;172.16.0.51:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java
index 3e210d13a0..d43fc223dc 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java
@@ -234,6 +234,9 @@ public class SystemMessageServiceImpl implements SystemMessageService {
             case SystemMessageType.VOLUNTEER_CHANGED:
                 topic=TopicConstants.VOLUNTEER;
                 break;
+            case SystemMessageType.PARTYMEMBER_RESI_IMPORT:
+                topic=TopicConstants.PARTYMEMBER_RESI;
+                break;
             default:
                 logger.error("getTopicByMsgType msgType:{} is not support for any topic", msgType);
         }
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml
index 21fea3ca9a..6b34183b22 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/message"/>
 
diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml
index e60686a853..8a71d1a810 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/oss"/>
 
diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml
index 964476fbf9..df58cccbef 100644
--- a/epmet-module/epmet-point/epmet-point-server/pom.xml
+++ b/epmet-module/epmet-point/epmet-point-server/pom.xml
@@ -142,7 +142,7 @@
                 <datasource.druid.username>epmet_point_user</datasource.druid.username>
                 <datasource.druid.password>EpmEt-db-UsEr</datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
+                <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -193,7 +193,7 @@
                 <datasource.druid.username>epmet_point_user</datasource.druid.username>
                 <datasource.druid.password>EpmEt-db-UsEr</datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
+                <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -239,19 +239,19 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.url>
-                <datasource.druid.username>root</datasource.druid.username>
-                <datasource.druid.password>Abc@123456</datasource.druid.password>
+                <datasource.druid.username>epmet</datasource.druid.username>
+                <datasource.druid.password>elink@833066</datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
-                <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.port>10001</spring.redis.port>
-                <spring.redis.password>elink!888</spring.redis.password>
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
-                <nacos.discovery.namespace>fd1029d1-0caa-4e3b-a62d-0d4a03a2f693</nacos.discovery.namespace>
+                <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
+                <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -276,7 +276,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>114.215.125.123:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.10.165:9876</rocketmq.nameserver>
             </properties>
         </profile>
         <profile>
@@ -290,18 +290,18 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.url>
-                <datasource.druid.username>epdc</datasource.druid.username>
-                <datasource.druid.password>Elink@833066</datasource.druid.password>
+                <datasource.druid.username>epmet_point_user</datasource.druid.username>
+                <datasource.druid.password>EpmEt-db-UsEr</datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>5</spring.redis.index>
-                <spring.redis.host>r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>Elink833066</spring.redis.password>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.0.53:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
                 <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
@@ -327,7 +327,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.16.0.53:9876;172.16.0.51:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml
index 63a188f67c..e279b43303 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/point"/>
 
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml
index 79238c1aa2..31d6de459d 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/third"/>
 
diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/logback-spring.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/logback-spring.xml
index e1ef42b796..9070f33f63 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-access/gov-access-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/gov-access"/>
 
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml b/epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml
index da2b1e092b..b54d66f380 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/gov-grid"/>
 
diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml
index 6c3174a5cb..7741561d9f 100644
--- a/epmet-module/gov-issue/gov-issue-server/pom.xml
+++ b/epmet-module/gov-issue/gov-issue-server/pom.xml
@@ -154,7 +154,7 @@
                 <spring.datasource.druid.username>epmet_gov_issue_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
+                <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -206,7 +206,7 @@
                 <spring.datasource.druid.username>epmet_gov_issue_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
+                <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -253,19 +253,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>root</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Abc@123456</spring.datasource.druid.password>
+                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
-                <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.port>10001</spring.redis.port>
-                <spring.redis.password>elink!888</spring.redis.password>
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
-                <nacos.discovery.namespace>fd1029d1-0caa-4e3b-a62d-0d4a03a2f693</nacos.discovery.namespace>
+                <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
+                <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -290,7 +290,7 @@
                 <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
 
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>114.215.125.123:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.10.165:9876</rocketmq.nameserver>
             </properties>
         </profile>
         <profile>
@@ -301,18 +301,18 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>epmet_gov_issue_user</spring.datasource.druid.username>
+                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>5</spring.redis.index>
-                <spring.redis.host>r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>Elink833066</spring.redis.password>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.0.53:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
                 <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
@@ -342,7 +342,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.16.0.53:9876;172.16.0.51:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml
index 10b38db4be..26e92fef88 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/gov-issue"/>
 
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml b/epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml
index b5cbd899a6..33466c3178 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/gov-mine"/>
 
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityInfoResultDTO.java
new file mode 100644
index 0000000000..46300096d5
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityInfoResultDTO.java
@@ -0,0 +1,41 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 社区所属组织基本信息
+ * @Author wgf
+ * @Date 2020/4/26 22:35
+ */
+@Data
+public class CommunityInfoResultDTO implements Serializable {
+    private static final long serialVersionUID = 4360690752084258055L;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 社区组织ID
+     */
+    private String deptId;
+
+    /**
+     * 社区名称
+     */
+    private String deptName;
+
+    /**
+     * 网格的上级组织
+     */
+    private String pid;
+
+    /**
+     * 网格的所有上级组织
+     */
+    private String pids;
+}
+
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgListTreeResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgListTreeResultDTO.java
new file mode 100644
index 0000000000..d6df3d9b87
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgListTreeResultDTO.java
@@ -0,0 +1,34 @@
+package com.epmet.dto.result;
+
+
+import com.epmet.commons.tools.utils.NodeTree;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrgListTreeResultDTO extends NodeTree implements Serializable {
+
+    private static final long serialVersionUID = -1993037593855768962L;
+
+    /**
+     * 父id
+     */
+    private String pid;
+
+    /**
+     * 名字
+     */
+    private String label;
+
+    /**
+     * 值
+     */
+    private String value;
+
+}
diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml
index 3f9996fc02..e937308c22 100644
--- a/epmet-module/gov-org/gov-org-server/pom.xml
+++ b/epmet-module/gov-org/gov-org-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.167</version>
+    <version>0.3.186</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>
@@ -194,7 +194,7 @@
                 <spring.datasource.druid.username>epmet_gov_org_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
+                <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -248,7 +248,7 @@
                 <spring.datasource.druid.username>epmet_gov_org_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
+                <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -297,19 +297,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>root</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Abc@123456</spring.datasource.druid.password>
+                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
-                <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.port>10001</spring.redis.port>
-                <spring.redis.password>elink!888</spring.redis.password>
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
-                <nacos.discovery.namespace>fd1029d1-0caa-4e3b-a62d-0d4a03a2f693</nacos.discovery.namespace>
+                <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
+                <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -336,7 +336,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>114.215.125.123:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.10.165:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>
@@ -348,18 +348,18 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>epmet_gov_org_user</spring.datasource.druid.username>
+                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>5</spring.redis.index>
-                <spring.redis.host>r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>Elink833066</spring.redis.password>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.0.53:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
                 <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
@@ -388,7 +388,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.16.0.53:9876;172.16.0.51:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
index e917eacf59..1ff1bc303c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
@@ -467,6 +467,30 @@ public class AgencyController {
         return new Result<List<CommunityListResultDTO>>().ok(agencyService.getCommunityList(tokenDto));
     }
 
+    /**
+     * Desc: 查询客户下的所有社区
+     *
+     * @param tokenDto
+     * @author wgf
+     * @date 2022/6/23 09:13
+     */
+    @PostMapping("communityListByCustomerId")
+    public Result<List<CommunityListResultDTO>> communityListByCustomerId(@LoginUser TokenDto tokenDto) {
+        return new Result<List<CommunityListResultDTO>>().ok(agencyService.communityListByCustomerId(tokenDto));
+    }
+
+    /**
+     * Desc: 查询客户下的所有街道社区
+     *
+     * @param tokenDto
+     * @author wgf
+     * @date 2022/6/23 09:13
+     */
+    @PostMapping("getOrgTreeListByCustomerId")
+    public Result<List<OrgListTreeResultDTO>> getOrgTreeListByCustomerId(@LoginUser TokenDto tokenDto) {
+        return new Result<List<OrgListTreeResultDTO>>().ok(agencyService.getOrgTreeListByCustomerId(tokenDto));
+    }
+
     /**
      * 通讯录树状结构
      *
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
index 5325163074..ec9d682d76 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
@@ -463,5 +463,29 @@ public class CustomerAgencyController {
         return new Result<DelAgencyGridIdResultDTO>().ok(customerAgencyService.getDelAgencyGridIdList(agencyId));
     }
 
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.CommunityInfoResultDTO>
+     * @Author wgf
+     * @Description 根据社区名称查询所属组织信息
+     * @Date 2022/6/21 22:41
+     **/
+    @PostMapping("getCommunityInfo")
+    public Result<CommunityInfoResultDTO> getCommunityInfo(@RequestBody OrgInfoPointFormDTO formDTO) {
+        return customerAgencyService.getCommunityInfo(formDTO);
+    }
+
+    /**
+     * @param userId
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.CommunityInfoResultDTO>
+     * @Author wgf
+     * @Description 根据用户ID查询所属组织信息
+     * @Date 2022/6/21 22:41
+     **/
+    @GetMapping("getCommunityInfoByUserId/{userId}")
+    public Result<CommunityInfoResultDTO> getCommunityInfoByUserId(@PathVariable("userId") String userId) {
+        return customerAgencyService.getCommunityInfoByUserId(userId);
+    }
+
 
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
index 58ce113aa1..bd04087da4 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
@@ -138,6 +138,7 @@ public class HouseController implements ResultDataResolver {
      */
     @PostMapping("search")
     public Result<PageData<IcHouseListResultDTO>> searchHouse(@RequestBody IcHouseListFormDTO formDTO, @LoginUser TokenDto loginUser) {
+        log.debug("xxx");
         String keyword = formDTO.getKeyword();
         if (StringUtils.isBlank(keyword)) {
             return new Result<PageData<IcHouseListResultDTO>>().ok(new PageData<>(new ArrayList<>(), NumConstant.ZERO));
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
index 02e483d9f2..1c4aa9394c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.form.OrgInfoPointFormDTO;
 import com.epmet.dto.form.OrgTreeByUserAndTypeFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
@@ -320,6 +321,8 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      */
     List<CommunityListResultDTO> getCommunityList(@Param("customerId") String customerId, @Param("agencyId") String agencyId);
 
+    List<CommunityListResultDTO> communityListByCustomerId(@Param("customerId") String customerId);
+
     List<SubOrgResDTO> selectSubOrg(String agencyId);
 
     /**
@@ -331,6 +334,8 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      */
     List<PartyOrgTreeResultDTO> getOrgTreeByUserAndType(OrgTreeByUserAndTypeFormDTO formDto);
 
+    List<OrgListTreeResultDTO> getOrgTreeListByCustomerId(@Param("customerId") String customerId);
+
     /**
      * 通讯录树
      *
@@ -344,5 +349,9 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
                                                         @Param("customerId") String customerId);
 
     List<String> getDelAgencyIdList(@Param("agencyId") String agencyId);
+
+    CommunityInfoResultDTO getCommunityInfo(OrgInfoPointFormDTO formDTO);
+
+    CommunityInfoResultDTO getCommunityInfoByUserId(@Param("userId") String userId);
 }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java
index cd0758a98f..83adfa87b8 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java
@@ -5,6 +5,7 @@ import com.epmet.dto.form.IcDangerousChemicalsListFormDTO;
 import com.epmet.dto.result.IcDangerousChemicalsListResultDTO;
 import com.epmet.entity.IcDangerousChemicalsEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -21,7 +22,7 @@ public interface IcDangerousChemicalsDao extends BaseDao<IcDangerousChemicalsEnt
 
     void del(IcDangerousChemicalsEntity entity);
 
-    void importInsert(List<IcDangerousChemicalsEntity> entityList);
+    void importInsert(@Param("entityList") List<IcDangerousChemicalsEntity> entityList);
 
     void delByAgencyAndName(IcDangerousChemicalsEntity entity);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
index ea43abd53e..4ae4672647 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
@@ -150,6 +150,24 @@ public interface AgencyService {
      */
     List<CommunityListResultDTO> getCommunityList(TokenDto tokenDto);
 
+    /**
+     * Desc: 查询客户下的所有社区
+     *
+     * @param tokenDto
+     * @author wgf
+     * @date 2022/6/23 09:13
+     */
+    List<CommunityListResultDTO> communityListByCustomerId(TokenDto tokenDto);
+
+    /**
+     * Desc: 查询客户下的所有街道社区
+     *
+     * @param tokenDto
+     * @author wgf
+     * @date 2022/6/23 09:13
+     */
+    List<OrgListTreeResultDTO> getOrgTreeListByCustomerId(TokenDto tokenDto);
+
     /**
      * 通讯录树状结构
      *
@@ -160,4 +178,4 @@ public interface AgencyService {
      * @date 2022/5/16 10:43
      */
     List<AgencyAddressBookTreeResultDTO> getAddressTree(String name, String customerId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
index dcdc1d44a8..21e6f17320 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
@@ -24,6 +24,7 @@ import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 import java.util.Map;
@@ -317,4 +318,22 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      * @Description 获取当前组织及下级无效组织、网格Id列表
      **/
     DelAgencyGridIdResultDTO getDelAgencyGridIdList(String agencyId);
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.CommunityInfoResultDTO>
+     * @Author wgf
+     * @Description 根据社区名称查询所属组织信息
+     * @Date 2022/6/21 22:41
+     **/
+    Result<CommunityInfoResultDTO> getCommunityInfo(OrgInfoPointFormDTO formDTO);
+
+    /**
+     * @param userId
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.CommunityInfoResultDTO>
+     * @Author wgf
+     * @Description 根据用户ID查询所属组织信息
+     * @Date 2022/6/21 22:41
+     **/
+    Result<CommunityInfoResultDTO> getCommunityInfoByUserId(String userId);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
index ceee6804eb..cf2016de58 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
@@ -870,6 +870,23 @@ public class AgencyServiceImpl implements AgencyService {
         return customerAgencyDao.getCommunityList(tokenDto.getCustomerId(), agencyId);
     }
 
+    @Override
+    public List<CommunityListResultDTO> communityListByCustomerId(TokenDto tokenDto) {
+        if (null == tokenDto.getCustomerId()) {
+            throw new EpmetException("未查询到客户信息");
+        }
+        return customerAgencyDao.communityListByCustomerId(tokenDto.getCustomerId());
+    }
+
+    @Override
+    public List<OrgListTreeResultDTO> getOrgTreeListByCustomerId(TokenDto tokenDto) {
+        if (null == tokenDto.getCustomerId()) {
+            throw new EpmetException("未查询到客户信息");
+        }
+        List<OrgListTreeResultDTO> list = customerAgencyDao.getOrgTreeListByCustomerId(tokenDto.getCustomerId());
+        return NodeTreeUtils.build(list);
+    }
+
     /**
      * 通讯录树
      *
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index adaf547abf..6d46ba3b3a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
@@ -1566,4 +1566,18 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         return resultDTO;
     }
 
+    @Override
+    public Result<CommunityInfoResultDTO> getCommunityInfo(OrgInfoPointFormDTO formDTO) {
+        CommunityInfoResultDTO communityInfoResultDTO = baseDao.getCommunityInfo(formDTO);
+
+        return new Result<CommunityInfoResultDTO>().ok(communityInfoResultDTO);
+    }
+
+    @Override
+    public Result<CommunityInfoResultDTO> getCommunityInfoByUserId(String userId) {
+        CommunityInfoResultDTO communityInfoResultDTO = baseDao.getCommunityInfoByUserId(userId);
+
+        return new Result<CommunityInfoResultDTO>().ok(communityInfoResultDTO);
+    }
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml
index 49d364c747..f366605fba 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/gov-org"/>
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index 2fd5aa5feb..136341dc18 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -756,6 +756,27 @@
           AND CUSTOMER_ID = #{customerId}
           AND CONCAT(PIDS,':',ID) LIKE CONCAT('%',#{agencyId},'%')
     </select>
+
+    <select id="communityListByCustomerId" resultType="com.epmet.dto.result.CommunityListResultDTO">
+        SELECT
+            ID AS orgId,
+            ORGANIZATION_NAME AS orgName
+        FROM customer_agency
+        WHERE DEL_FLAG = '0'
+          AND `LEVEL` = 'community'
+          AND CUSTOMER_ID = #{customerId}
+    </select>
+
+    <select id="getOrgTreeListByCustomerId" resultType="com.epmet.dto.result.OrgListTreeResultDTO">
+        select
+            ID,
+            PID,
+            ID as value,
+            ORGANIZATION_NAME as label
+        from customer_agency
+        where DEL_FLAG = '0'
+        AND CUSTOMER_ID = #{customerId}
+    </select>
     <select id="getAddressTree" resultType="com.epmet.dto.result.AgencyAddressBookTreeResultDTO">
         SELECT
             a.id,
@@ -880,4 +901,33 @@
         AND pids LIKE CONCAT('%', #{agencyId}, '%')
     </select>
 
+    <select id="getCommunityInfo" resultType="com.epmet.dto.result.CommunityInfoResultDTO" parameterType="com.epmet.dto.form.OrgInfoPointFormDTO">
+        select
+        ID as deptId,
+        CUSTOMER_ID,
+        PID,
+        PIDS,
+        ORGANIZATION_NAME as deptName
+        from customer_agency
+        where DEL_FLAG = '0'
+        and ORGANIZATION_NAME = #{orgName}
+        and CUSTOMER_ID = #{customerId}
+        limit 1
+    </select>
+
+    <select id="getCommunityInfoByUserId" resultType="com.epmet.dto.result.CommunityInfoResultDTO">
+        select
+        ca.ID as deptId,
+        ctf.CUSTOMER_ID,
+        ca.PID,
+        ca.PIDS,
+        ca.ORGANIZATION_NAME as deptName
+        from customer_staff_agency ctf
+        left join customer_agency ca on ca.ID = ctf.AGENCY_ID and ca.DEL_FLAG = 0
+        where ctf.DEL_FLAG = 0
+        and ca.LEVEL = 'community'
+        and ctf.USER_ID = #{userId}
+        limit 1
+    </select>
+
 </mapper>
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml
index a851ad256c..a1e8c5f1b0 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/gov-project"/>
 
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml
index 27b2c7c048..6c230be6bf 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/gov-voice"/>
 
diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml
index 24962fb0e8..1411be9d41 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml
@@ -125,7 +125,7 @@
                 <spring.datasource.druid.username>epmet_open_data_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
+                <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -177,7 +177,7 @@
                 <spring.datasource.druid.username>epmet_open_data_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
+                <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -224,19 +224,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_open_data?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_open_data?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>root</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Abc@123456</spring.datasource.druid.password>
+                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
-                <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.port>10001</spring.redis.port>
-                <spring.redis.password>elink!888</spring.redis.password>
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
-                <nacos.discovery.namespace>fd1029d1-0caa-4e3b-a62d-0d4a03a2f693</nacos.discovery.namespace>
+                <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
+                <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -262,7 +262,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>114.215.125.123:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.10.165:9876</rocketmq.nameserver>
             </properties>
         </profile>
         <profile>
@@ -273,18 +273,18 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_open_data?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_open_data?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>epmet_open_data_user</spring.datasource.druid.username>
+                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>5</spring.redis.index>
-                <spring.redis.host>r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>Elink833066</spring.redis.password>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.0.53:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
                 <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
@@ -311,7 +311,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.16.0.53:9876;172.16.0.51:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml
index 9b1c2efa20..36ddc6f222 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/open-data"/>
 
diff --git a/epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml b/epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml
index 3cf0e3cefa..e22bb16a66 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/oper-access"/>
 
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml
index fe3ecdc558..b670ba07bf 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/oper-crm"/>
 
diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml
index 30173478e7..55fd617ca9 100644
--- a/epmet-module/oper-customize/oper-customize-server/pom.xml
+++ b/epmet-module/oper-customize/oper-customize-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.67</version>
+    <version>0.3.72</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-customize</artifactId>
@@ -134,7 +134,7 @@
                 <spring.datasource.druid.username>epmet_oper_customize_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
+                <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -188,7 +188,7 @@
                 <spring.datasource.druid.username>epmet_oper_customize_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
+                <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -237,19 +237,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>root</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Abc@123456</spring.datasource.druid.password>
+                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
-                <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.port>10001</spring.redis.port>
-                <spring.redis.password>elink!888</spring.redis.password>
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
-                <nacos.discovery.namespace>fd1029d1-0caa-4e3b-a62d-0d4a03a2f693</nacos.discovery.namespace>
+                <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
+                <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -276,7 +276,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>114.215.125.123:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.10.165:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>
@@ -288,18 +288,18 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>epmet_oper_customize_user</spring.datasource.druid.username>
+                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>5</spring.redis.index>
-                <spring.redis.host>r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>Elink833066</spring.redis.password>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.0.53:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
                 <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
@@ -328,7 +328,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.16.0.53:9876;172.16.0.51:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml
index 594456d25f..cedd663d22 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/oper-customize"/>
 
diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml
index 763c2aab32..b2a6785612 100644
--- a/epmet-module/resi-group/resi-group-server/pom.xml
+++ b/epmet-module/resi-group/resi-group-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.131</version>
+    <version>0.3.132</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>
@@ -169,7 +169,7 @@
                 <spring.datasource.druid.username>epmet_resi_group_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
+                <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -231,7 +231,7 @@
                 <spring.datasource.druid.username>epmet_resi_group_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
+                <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -286,19 +286,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>root</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Abc@123456</spring.datasource.druid.password>
+                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
-                <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.port>10001</spring.redis.port>
-                <spring.redis.password>elink!888</spring.redis.password>
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
-                <nacos.discovery.namespace>fd1029d1-0caa-4e3b-a62d-0d4a03a2f693</nacos.discovery.namespace>
+                <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
+                <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -333,7 +333,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>114.215.125.123:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.10.165:9876</rocketmq.nameserver>
             </properties>
         </profile>
         <profile>
@@ -344,18 +344,18 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>epmet_resi_group_user</spring.datasource.druid.username>
+                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>5</spring.redis.index>
-                <spring.redis.host>r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>Elink833066</spring.redis.password>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.0.53:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
                 <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
@@ -392,7 +392,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.16.0.53:9876;172.16.0.51:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml
index 3eb3b4432f..6a517afaff 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/resi-group"/>
 
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml
index aecd596059..126316c645 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/resi-guide"/>
 
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml
index f563d2f511..a5db66cb09 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/resi-hall"/>
 
diff --git a/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml b/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml
index 5b795cd61f..0b5eedfde0 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/resi-home"/>
 
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml b/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
index 960bb7f009..f797654dbd 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/resi-mine"/>
 
diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
index 7e5dd0187d..4b09133968 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
@@ -116,6 +116,13 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+
+        <!--rocketmq-->
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-rocketmq</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -197,6 +204,10 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
                 </dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.enable>true</rocketmq.enable>
+                <rocketmq.nameserver>192.168.1.140:9876;192.168.1.141:9876</rocketmq.nameserver>
             </properties>
         </profile>
         <profile>
@@ -247,6 +258,10 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
                 </dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.enable>false</rocketmq.enable>
+                <rocketmq.nameserver>192.168.1.140:9876;192.168.1.141:9876</rocketmq.nameserver>
             </properties>
         </profile>
         <profile>
@@ -297,6 +312,10 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
                 </dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.enable>true</rocketmq.enable>
+                <rocketmq.nameserver>192.168.10.165:9876</rocketmq.nameserver>
             </properties>
         </profile>
         <profile>
@@ -346,6 +365,10 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
                 </dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.enable>true</rocketmq.enable>
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java
new file mode 100644
index 0000000000..67ceeb7651
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java
@@ -0,0 +1,19 @@
+package com.epmet.mq;
+
+import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants;
+import com.epmet.commons.rocketmq.constants.TopicConstants;
+import com.epmet.commons.rocketmq.register.MQAbstractRegister;
+import com.epmet.commons.rocketmq.register.MQConsumerProperties;
+import com.epmet.mq.listener.ResiPartyMemberSyncListener;
+import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RocketMQConsumerRegister extends MQAbstractRegister {
+
+    @Override
+    public void registerAllListeners(String env, MQConsumerProperties consumerProperties) {
+        register(consumerProperties, ConsomerGroupConstants.CREATE_RESI_PARTYMEMBER_SYNC_GROUP, MessageModel.CLUSTERING,
+                TopicConstants.PARTYMEMBER_RESI, "*", new ResiPartyMemberSyncListener());
+    }
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/listener/ResiPartyMemberSyncListener.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/listener/ResiPartyMemberSyncListener.java
new file mode 100644
index 0000000000..4304f94f95
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/listener/ResiPartyMemberSyncListener.java
@@ -0,0 +1,106 @@
+package com.epmet.mq.listener;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.rocketmq.constants.MQUserPropertys;
+import com.epmet.commons.rocketmq.messages.PartymemberSyncMQMsg;
+import com.epmet.commons.tools.exception.ExceptionUtils;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.SpringContextUtils;
+import com.epmet.modules.partymember.service.IcPartyMemberService;
+import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
+import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
+import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
+import org.apache.rocketmq.common.message.MessageExt;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+/**
+ * @author wxz
+ * @Description 创建党员居民信息消费者组，将user库的党员信息同步到partymember库的党员表。
+
+ * @return
+ * @date 2021.06.07 16:12
+ */
+public class ResiPartyMemberSyncListener implements MessageListenerConcurrently {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    private RedisUtils redisUtils;
+
+    @Override
+    public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext context) {
+
+        if (redisUtils == null) {
+            redisUtils = SpringContextUtils.getBean(RedisUtils.class);
+        }
+
+        try {
+            msgs.forEach(msg -> consumeMessage(msg));
+        } catch (Exception e) {
+            logger.error(ExceptionUtils.getErrorStackTrace(e));
+            return ConsumeConcurrentlyStatus.RECONSUME_LATER;
+        }
+        return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
+    }
+
+    /**
+     * 逐条消费
+     * @param messageExt
+     */
+    private void consumeMessage(MessageExt messageExt) {
+        //String tags = messageExt.getTags();
+        String msg = new String(messageExt.getBody());
+        String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.BLOCKED_MSG_LABEL);
+        logger.info("居民-党员信息同步监听器-收到消息内容:{}", msg);
+        PartymemberSyncMQMsg msgObj = JSON.parseObject(msg, PartymemberSyncMQMsg.class);
+
+        List<PartymemberSyncMQMsg.PartyMemberSyncForm> partymemberList = msgObj.getPartymemberList();
+        if (CollectionUtils.isEmpty(partymemberList)) {
+            return;
+        }
+        partymemberList.stream().forEach(p -> {
+            IcPartyMemberDTO icPartyMemberDTO = ConvertUtils.sourceToTarget(p, IcPartyMemberDTO.class);
+            try {
+                SpringContextUtils.getBean(IcPartyMemberService.class).icPartyMemberSync(icPartyMemberDTO);
+            } catch (RenException e) {
+                // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
+                logger.error("【居民-党员信息同步】同步失败，居民id:{},错误信息:{}", p.getIcResiUser(), ExceptionUtils.getErrorStackTrace(e));
+            } catch (Exception e) {
+                // 不是我们自己抛出的异常，可以让MQ重试
+                logger.error("【居民-党员信息同步】同步失败居民id:{},错误信息:{}", p.getIcResiUser(), ExceptionUtils.getErrorStackTrace(e));
+                throw e;
+            }
+        });
+
+        if (StringUtils.isNotBlank(pendingMsgLabel)) {
+            try {
+                removePendingMqMsgCache(pendingMsgLabel);
+            } catch (Exception e) {
+                logger.error("【居民-党员信息同步】-删除mq阻塞消息缓存失败:{}", ExceptionUtils.getErrorStackTrace(e));
+            }
+        }
+
+        logger.info("【居民-党员信息同步】处理完成，条数:{}", partymemberList.size());
+    }
+
+    /**
+     * @description
+     *
+     * @param pendingMsgLabel
+     * @return
+     * @author wxz
+     * @date 2021.10.14 16:32:32
+     */
+    private void removePendingMqMsgCache(String pendingMsgLabel) {
+        String key = RedisKeys.blockedMqMsgKey(pendingMsgLabel);
+        Boolean rst = redisUtils.delete(key);
+    }
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml
index ee185fa822..751620e91d 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml
@@ -142,4 +142,9 @@ thread:
     queueCapacity: @thread.threadPool.queue-capacity@
     keepAliveSeconds: @thread.threadPool.keep-alive-seconds@
     threadNamePrefix: @thread.threadPool.thread-name-prefix@
-    rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@
\ No newline at end of file
+    rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@
+
+# rocketmq
+rocketmq:
+  enable: @rocketmq.enable@
+  name-server: @rocketmq.nameserver@
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml
index 8ea5787698..3bbff08587 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/resi-partymember"/>
 
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml
index c2b6857a10..9724cefbf5 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml
@@ -70,7 +70,7 @@
             ORDER BY
                 a.YEAR DESC,
                 u.sszb ASC,
-                sum( a.total_score ) DESC,
+                AVG( a.total_score ) DESC,
                 a.CREATED_TIME
     </select>
     <select id="getListCount"
diff --git a/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml b/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml
index d6b46b3e2c..408ee874df 100644
--- a/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/resi-voice"/>
 
diff --git a/epmet-openapi/epmet-openapi-scan/src/main/resources/logback-spring.xml b/epmet-openapi/epmet-openapi-scan/src/main/resources/logback-spring.xml
index d30eb155a1..080a91adb0 100644
--- a/epmet-openapi/epmet-openapi-scan/src/main/resources/logback-spring.xml
+++ b/epmet-openapi/epmet-openapi-scan/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/epmet/openapi/scan"/>
 
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java
new file mode 100644
index 0000000000..3a29fb0afc
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java
@@ -0,0 +1,109 @@
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 核酸监测点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@Data
+public class IcPointNucleicMonitoringDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 所属组织ID
+     */
+	private String orgId;
+
+    /**
+     * 所属组织名称
+     */
+	private String orgName;
+
+    /**
+     * 组织ID上级
+     */
+	private String pid;
+
+    /**
+     * 组织ID所有上级
+     */
+	private String pids;
+
+    /**
+     * 核酸监测点名称
+     */
+	private String name;
+
+    /**
+     * 服务时间
+     */
+	private String serveTime;
+
+    /**
+     * 咨询电话
+     */
+	private String mobile;
+
+    /**
+     * 监测点地址
+     */
+	private String address;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 纬度
+     */
+	private String latitude;
+
+    /**
+     * 
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointVaccinesInoculationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointVaccinesInoculationDTO.java
new file mode 100644
index 0000000000..2d1c465ecb
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointVaccinesInoculationDTO.java
@@ -0,0 +1,134 @@
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 疫苗接种点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@Data
+public class IcPointVaccinesInoculationDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 所属组织ID
+     */
+	private String orgId;
+
+    /**
+     * 所属组织名称
+     */
+	private String orgName;
+
+    /**
+     * 组织ID上级
+     */
+	private String pid;
+
+    /**
+     * 组织ID所有上级
+     */
+	private String pids;
+
+    /**
+     * 疫苗接种点名称
+     */
+	private String name;
+
+    /**
+     * 接种日期
+     */
+	private String inoculationDate;
+
+    /**
+     * 接种上午开始时间
+     */
+	private String moStartTime;
+
+    /**
+     * 接种上午结束时间
+     */
+	private String moEndTime;
+
+    /**
+     * 接种下午开始时间
+     */
+	private String afStartTime;
+
+    /**
+     * 接种下午结束时间
+     */
+	private String afEndTime;
+
+    /**
+     * 暂无疫苗（1：是；2：否）
+     */
+	private String noAvailableVaccines;
+
+    /**
+     * 咨询电话
+     */
+	private String mobile;
+
+    /**
+     * 接种点地址
+     */
+	private String address;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 纬度
+     */
+	private String latitude;
+
+    /**
+     *
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MapInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MapInfoFormDTO.java
new file mode 100644
index 0000000000..662c4c459d
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MapInfoFormDTO.java
@@ -0,0 +1,51 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 获取地图信息入参
+ *
+ * @author wgf
+ * @since v1.0.0 2022-06-20
+ */
+@Data
+public class MapInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 地点类型（1：核酸检测点；   2：疫苗接种点）
+     */
+    @NotBlank(message = "地点类型不能为空")
+	private String type;
+
+    /**
+     * 经度
+     */
+    @NotBlank(message = "经度不能为空")
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    @NotBlank(message = "纬度不能为空")
+    private String latitude;
+
+    /**
+     * 地点名称
+     */
+    private String name;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+
+
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OrgInfoPointFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OrgInfoPointFormDTO.java
new file mode 100644
index 0000000000..6c306b5429
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OrgInfoPointFormDTO.java
@@ -0,0 +1,32 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 所属部门
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@Data
+public class OrgInfoPointFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 所属组织名称
+     */
+	private String orgName;
+
+
+
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PointHSYMFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PointHSYMFormDTO.java
new file mode 100644
index 0000000000..d7a2228e0c
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PointHSYMFormDTO.java
@@ -0,0 +1,33 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/3/28 10:30
+ * @DESC
+ */
+@Data
+public class PointHSYMFormDTO extends PageFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -498378993902522370L;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 地点名称
+     */
+    private String name;
+
+    /**
+     * user所属组织ID
+     */
+    private String orgId;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendPointNoticeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendPointNoticeFormDTO.java
new file mode 100644
index 0000000000..52eb7ca00a
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendPointNoticeFormDTO.java
@@ -0,0 +1,63 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author wgf
+ * @Date 2022/3/28 14:14
+ */
+@NoArgsConstructor
+@Data
+public class SendPointNoticeFormDTO implements Serializable {
+    private static final long serialVersionUID = 4800907725063604885L;
+    private String customerId;
+    private String staffId;
+    /**
+     * 用户列表
+     */
+    private List<UserListBean> userList;
+    /**
+     * 通知渠道通知渠道 0小程序通知，1短信通知
+     */
+    @NotEmpty(message = "请选择通知渠道", groups = CustomerClientShowGroup.class)
+    private List<String> channel;
+    /**
+     * 通知来源 0 行程上报，1 疫苗接种，2 核酸检测,3核酸检测点，4疫苗接种点
+     */
+    @NotEmpty(message = "通知来源不能为空", groups = CustomerClientShowGroup.class)
+    private String origin;
+    /**
+     * 通知内容
+     */
+    @Size(min = 1, max = 500, message = "通知内容不超过500字", groups = CustomerClientShowGroup.class)
+    private String content;
+    /**
+     * 组织名
+     */
+    private String orgName;
+
+    @NoArgsConstructor
+    @Data
+    public static class UserListBean {
+        /**
+         * 用户ID
+         */
+        private String userId;
+        /**
+         * 手机号
+         */
+        private String mobile;
+        /**
+         * 身份证
+         */
+        private String idCard;
+    }
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java
new file mode 100644
index 0000000000..896d1195fc
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java
@@ -0,0 +1,82 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * 获取地图信息返参
+ *
+ * @author wgf
+ * @since v1.0.0 2022-06-20
+ */
+@Data
+public class MapInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 时间随机数标识
+     */
+    private Integer markerId;
+
+    /**
+     * 疫苗接种点名称
+     */
+    private String name;
+
+    /**
+     * 距离当前位置千米数
+     */
+    private String km;
+
+    /**
+     * 暂无疫苗（1：是；2：否）
+     */
+    private String noAvailableVaccines;
+
+    /**
+     * 距离（1：1公里以内；3：3公里以内；5：5公里以内；99：5公里以外）
+     */
+    private String kmNum;
+
+    /**
+     * 日期
+     */
+    private String date;
+
+    /**
+     * 上午时间
+     */
+    private String moTime;
+
+    /**
+     * 下午时间
+     */
+    private String afTime;
+
+    /**
+     * 电话
+     */
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+
+
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SendPointNoticeResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SendPointNoticeResultDTO.java
new file mode 100644
index 0000000000..04f8b2b4f9
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SendPointNoticeResultDTO.java
@@ -0,0 +1,34 @@
+package com.epmet.dto.result;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author wgf
+ * @Date 2022/3/28 14:14
+ */
+@Data
+public class SendPointNoticeResultDTO implements Serializable {
+    private static final long serialVersionUID = 4800907725063604885L;
+
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+    /**
+     * 手机号
+     */
+    private String mobile;
+    /**
+     * 身份证
+     */
+    private String idCard;
+}
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index 862f53985e..ba67ff8170 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.232</version>
+    <version>0.3.276</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>
@@ -18,25 +18,6 @@
             <artifactId>epmet-admin-client</artifactId>
             <version>2.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>easyexcel</artifactId>
-            <version>3.0.3</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>poi</artifactId>
-                    <groupId>org.apache.poi</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>poi-ooxml</artifactId>
-                    <groupId>org.apache.poi</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>poi-ooxml-schemas</artifactId>
-                    <groupId>org.apache.poi</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
             <artifactId>epmet-user-client</artifactId>
@@ -216,7 +197,7 @@
                 <spring.datasource.druid.username>epmet_user_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
+                <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -269,7 +250,7 @@
                 <spring.datasource.druid.username>epmet_user_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
+                <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -318,19 +299,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>root</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Abc@123456</spring.datasource.druid.password>
+                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>13</spring.redis.index>
-                <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.port>10001</spring.redis.port>
-                <spring.redis.password>elink!888</spring.redis.password>
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
-                <nacos.discovery.namespace>fd1029d1-0caa-4e3b-a62d-0d4a03a2f693</nacos.discovery.namespace>
+                <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
+                <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -348,7 +329,7 @@
                 </dingTalk.robot.secret>
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>114.215.125.123:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.10.165:9876</rocketmq.nameserver>
 
                 <!--线程池-->
                 <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
@@ -368,18 +349,18 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>epmet_user_user</spring.datasource.druid.username>
+                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>5</spring.redis.index>
-                <spring.redis.host>r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>Elink833066</spring.redis.password>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.0.53:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
                 <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
@@ -400,7 +381,7 @@
                 </dingTalk.robot.secret>
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.16.0.53:9876;172.16.0.51:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
 
                 <!--线程池-->
                 <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNoticeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNoticeController.java
index ab0529b158..325eb71c31 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNoticeController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNoticeController.java
@@ -4,6 +4,7 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -14,10 +15,16 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcNoticeDTO;
 import com.epmet.dto.form.IcNoticeFormDTO;
 import com.epmet.dto.form.SendNoticeFormDTO;
+import com.epmet.dto.form.SendPointNoticeFormDTO;
+import com.epmet.dto.result.CommunityInfoResultDTO;
+import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.service.IcNoticeService;
+import com.epmet.service.IcResiUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 
 /**
  * 防疫通知
@@ -32,6 +39,12 @@ public class IcNoticeController {
     @Autowired
     private IcNoticeService icNoticeService;
 
+    @Autowired
+    private GovOrgFeignClient govOrgFeignClient;
+
+    @Autowired
+    private IcResiUserService icResiUserService;
+
     @RequestMapping("page")
     public Result<PageData<IcNoticeDTO>> page(@LoginUser TokenDto tokenDto, @RequestBody IcNoticeFormDTO formDTO){
         formDTO.setCustomerId(tokenDto.getCustomerId());
@@ -80,4 +93,19 @@ public class IcNoticeController {
         return new Result();
     }
 
+    @PostMapping("sendPointNotice")
+    public Result sendPointNotice(@LoginUser TokenDto tokenDto, @RequestBody SendPointNoticeFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, CustomerClientShowGroup.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        // 查询用户列表
+        Result<CommunityInfoResultDTO> communityInfoResultDTOResult = govOrgFeignClient.getCommunityInfoByUserId(tokenDto.getUserId());
+        // 能点击发送按钮的人肯定有社区ID
+        String communityId = communityInfoResultDTOResult.getData().getDeptId();
+        List<SendPointNoticeFormDTO.UserListBean> userList = icResiUserService.getUserListByCommunityId(communityId);
+        formDTO.setUserList(userList);
+        icNoticeService.sendPointNotice(formDTO);
+        return new Result();
+    }
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java
new file mode 100644
index 0000000000..b6f3edb0a7
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java
@@ -0,0 +1,50 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.form.MapInfoFormDTO;
+import com.epmet.dto.result.MapInfoResultDTO;
+import com.epmet.service.IcPointAppService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 核酸监测点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@RestController
+@RequestMapping("appPoint")
+@Slf4j
+public class IcPointAppController {
+
+    @Autowired
+    private IcPointAppService icPointAppService;
+
+    /**
+     * 根据地点类型获取地图数据
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("getMapInfoByPointType")
+    public Result<List<MapInfoResultDTO>> getMapInfoByPointType(@RequestBody MapInfoFormDTO formDTO, @LoginUser TokenDto tokenDto){
+        // 效验数据
+        ValidatorUtils.validateEntity(formDTO, AddGroup.class, DefaultGroup.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+
+        return icPointAppService.getMapInfoByPointType(formDTO);
+    }
+
+
+
+
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java
new file mode 100644
index 0000000000..b3f97f7437
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java
@@ -0,0 +1,197 @@
+package com.epmet.controller;
+
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ExcelPoiUtils;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.constants.ImportTaskConstants;
+import com.epmet.dao.IcPointNucleicMonitoringDao;
+import com.epmet.dto.IcPointNucleicMonitoringDTO;
+import com.epmet.dto.form.ImportTaskCommonFormDTO;
+import com.epmet.dto.form.PointHSYMFormDTO;
+import com.epmet.dto.form.VaccinationListFormDTO;
+import com.epmet.dto.result.CommunityInfoResultDTO;
+import com.epmet.dto.result.ImportTaskCommonResultDTO;
+import com.epmet.excel.IcPointNucleicMonitoringExcel;
+import com.epmet.excel.NatExportExcel;
+import com.epmet.excel.VaccinationExportExcel;
+import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
+import com.epmet.feign.GovOrgFeignClient;
+import com.epmet.service.IcPointNucleicMonitoringService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 核酸监测点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@RestController
+@RequestMapping("icPointNucleicMonitoring")
+@Slf4j
+public class IcPointNucleicMonitoringController {
+
+    @Autowired
+    private IcPointNucleicMonitoringService icPointNucleicMonitoringService;
+
+    @Autowired
+    private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
+
+    @Autowired
+    private GovOrgFeignClient govOrgFeignClient;
+
+    @Autowired
+    private IcPointNucleicMonitoringDao icPointNucleicMonitoringDao;
+
+    @RequestMapping("page")
+    public Result<PageData<IcPointNucleicMonitoringDTO>> page(@RequestParam Map<String, Object> params, @LoginUser TokenDto tokenDto){
+//        PageData<IcPointNucleicMonitoringDTO> page = icPointNucleicMonitoringService.page(params);
+        params.put("customerId",tokenDto.getCustomerId());
+        PageData<IcPointNucleicMonitoringDTO> page = icPointNucleicMonitoringService.getPhrasePage(params);
+        return new Result<PageData<IcPointNucleicMonitoringDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    public Result<IcPointNucleicMonitoringDTO> get(@PathVariable("id") String id){
+        IcPointNucleicMonitoringDTO data = icPointNucleicMonitoringService.get(id);
+        return new Result<IcPointNucleicMonitoringDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping
+    public Result save(@RequestBody IcPointNucleicMonitoringDTO dto, @LoginUser TokenDto tokenDto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        dto.setCustomerId(tokenDto.getCustomerId());
+        icPointNucleicMonitoringService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PutMapping
+    public Result update(@RequestBody IcPointNucleicMonitoringDTO dto, @LoginUser TokenDto tokenDto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        dto.setCustomerId(tokenDto.getCustomerId());
+        icPointNucleicMonitoringService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icPointNucleicMonitoringService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IcPointNucleicMonitoringDTO> list = icPointNucleicMonitoringDao.getPhrasePage(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcPointNucleicMonitoringExcel.class);
+    }
+
+    /**
+     * Desc: 【核酸检测点】导出
+     * @param response
+     * @param formDTO
+     * @param tokenDto
+     * @author wgf
+     * @date 2022/6/24 13:57
+     */
+    @PostMapping("point-export")
+    public void vaccinationExport(HttpServletResponse response, @RequestBody PointHSYMFormDTO formDTO, @LoginUser TokenDto tokenDto) throws Exception {
+        ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class);
+        List<IcPointNucleicMonitoringDTO> list = icPointNucleicMonitoringDao.getPhrasePageByDTO(formDTO);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcPointNucleicMonitoringExcel.class);
+
+    }
+
+    /**
+     * 获取【发送通知】按钮显示隐藏状态
+     * @param tokenDto
+     * @return
+     */
+    @PostMapping("getShowType")
+    public Result getShowType(@LoginUser TokenDto tokenDto){
+        return govOrgFeignClient.getCommunityInfoByUserId(tokenDto.getUserId());
+    }
+
+
+    /**
+     * Desc: 【核酸检测点】导入
+     * @param
+     * @author wgf
+     * @date 2022/6/21 13:40
+     */
+    @PostMapping("pointImport")
+    public Result pointImport(@LoginUser TokenDto tokenDto, @RequestParam("file") MultipartFile file){
+        if (file.isEmpty()) {
+            throw new EpmetException("请上传文件");
+        }
+        // 校验文件类型
+        String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+        if (!"xls".equals(extension) && !"xlsx".equals(extension)) {
+            throw new EpmetException("文件类型不匹配");
+        }
+
+        ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO();
+        importTaskForm.setOriginFileName(file.getOriginalFilename());
+        importTaskForm.setOperatorId(tokenDto.getUserId());
+        importTaskForm.setBizType(ImportTaskConstants.IC_POINT_NUCLEIC_MONITORING);
+        Result<ImportTaskCommonResultDTO> result = commonServiceOpenFeignClient.createImportTask(importTaskForm);
+        if (!result.success()) {
+            throw new EpmetException(9999,"存在进行中的导入");
+        }
+        InputStream inputStream = null;
+        try {
+            inputStream = file.getInputStream();
+        }catch (Exception e){
+            ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO();
+            input.setOperatorId(tokenDto.getUserId());
+            input.setTaskId(result.getData().getTaskId());
+            input.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL);
+            commonServiceOpenFeignClient.finishImportTask(input);
+            log.error("读取文件失败");
+        }
+        icPointNucleicMonitoringService.importFile(tokenDto,inputStream,result.getData().getTaskId());
+        return new Result();
+    }
+
+    /**
+     * 导出模板
+     * @param response
+     * @throws Exception
+     */
+    @PostMapping("exporttemplate")
+    public void exportTemplate( HttpServletResponse response) throws Exception {
+        TemplateExportParams templatePath = new TemplateExportParams("excel/ic_point_nucleic_monitoring.xlsx");
+        ExcelPoiUtils.exportExcel(templatePath ,new HashMap<>(),"核酸检测点录入表",response);
+    }
+
+
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointVaccinesInoculationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointVaccinesInoculationController.java
new file mode 100644
index 0000000000..6bde7117b4
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointVaccinesInoculationController.java
@@ -0,0 +1,179 @@
+package com.epmet.controller;
+
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ExcelPoiUtils;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.constants.ImportTaskConstants;
+import com.epmet.dao.IcPointVaccinesInoculationDao;
+import com.epmet.dto.IcPointNucleicMonitoringDTO;
+import com.epmet.dto.IcPointVaccinesInoculationDTO;
+import com.epmet.dto.form.ImportTaskCommonFormDTO;
+import com.epmet.dto.form.PointHSYMFormDTO;
+import com.epmet.dto.result.ImportTaskCommonResultDTO;
+import com.epmet.excel.IcPointNucleicMonitoringExcel;
+import com.epmet.excel.IcPointVaccinesInoculationExcel;
+import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
+import com.epmet.service.IcPointVaccinesInoculationService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 疫苗接种点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@RestController
+@RequestMapping("icPointVaccinesInoculation")
+@Slf4j
+public class IcPointVaccinesInoculationController {
+
+    @Autowired
+    private IcPointVaccinesInoculationService icPointVaccinesInoculationService;
+
+    @Autowired
+    private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
+
+    @Autowired
+    private IcPointVaccinesInoculationDao icPointVaccinesInoculationDao;
+
+    @RequestMapping("page")
+    public Result<PageData<IcPointVaccinesInoculationDTO>> page(@RequestParam Map<String, Object> params, @LoginUser TokenDto tokenDto){
+//        PageData<IcPointVaccinesInoculationDTO> page = icPointVaccinesInoculationService.page(params);
+        params.put("customerId",tokenDto.getCustomerId());
+        PageData<IcPointVaccinesInoculationDTO> page = icPointVaccinesInoculationService.getPhrasePage(params);
+        return new Result<PageData<IcPointVaccinesInoculationDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    public Result<IcPointVaccinesInoculationDTO> get(@PathVariable("id") String id){
+        IcPointVaccinesInoculationDTO data = icPointVaccinesInoculationService.get(id);
+        return new Result<IcPointVaccinesInoculationDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping()
+    public Result save(@RequestBody IcPointVaccinesInoculationDTO dto, @LoginUser TokenDto tokenDto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        dto.setCustomerId(tokenDto.getCustomerId());
+        icPointVaccinesInoculationService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PutMapping()
+    public Result update(@RequestBody IcPointVaccinesInoculationDTO dto, @LoginUser TokenDto tokenDto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        dto.setCustomerId(tokenDto.getCustomerId());
+        icPointVaccinesInoculationService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icPointVaccinesInoculationService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IcPointVaccinesInoculationDTO> list = icPointVaccinesInoculationService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcPointVaccinesInoculationExcel.class);
+    }
+
+    /**
+     * Desc: 【疫苗接种点】导出
+     * @param response
+     * @param formDTO
+     * @param tokenDto
+     * @author wgf
+     * @date 2022/6/24 13:57
+     */
+    @PostMapping("point-export")
+    public void vaccinationExport(HttpServletResponse response, @RequestBody PointHSYMFormDTO formDTO, @LoginUser TokenDto tokenDto) throws Exception {
+        ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class);
+        List<IcPointVaccinesInoculationDTO> list = icPointVaccinesInoculationDao.getPhrasePageByDTO(formDTO);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcPointVaccinesInoculationExcel.class);
+
+    }
+
+    /**
+     * Desc: 【疫苗接种点】导入
+     * @param
+     * @author wgf
+     * @date 2022/6/21 13:40
+     */
+    @PostMapping("pointImport")
+    public Result pointImport(@LoginUser TokenDto tokenDto, @RequestParam("file") MultipartFile file){
+        if (file.isEmpty()) {
+            throw new EpmetException("请上传文件");
+        }
+        // 校验文件类型
+        String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+        if (!"xls".equals(extension) && !"xlsx".equals(extension)) {
+            throw new EpmetException("文件类型不匹配");
+        }
+
+        ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO();
+        importTaskForm.setOriginFileName(file.getOriginalFilename());
+        importTaskForm.setOperatorId(tokenDto.getUserId());
+        importTaskForm.setBizType(ImportTaskConstants.IC_POINT_VACCINES_INOCULATION);
+        Result<ImportTaskCommonResultDTO> result = commonServiceOpenFeignClient.createImportTask(importTaskForm);
+        if (!result.success()) {
+            throw new EpmetException(9999,"存在进行中的导入");
+        }
+        InputStream inputStream = null;
+        try {
+            inputStream = file.getInputStream();
+        }catch (Exception e){
+            ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO();
+            input.setOperatorId(tokenDto.getUserId());
+            input.setTaskId(result.getData().getTaskId());
+            input.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL);
+            commonServiceOpenFeignClient.finishImportTask(input);
+            log.error("读取文件失败");
+        }
+        icPointVaccinesInoculationService.importFile(tokenDto,inputStream,result.getData().getTaskId());
+        return new Result();
+    }
+
+    /**
+     * 导出模板
+     * @param response
+     * @throws Exception
+     */
+    @PostMapping("exporttemplate")
+    public void exportTemplate( HttpServletResponse response) throws Exception {
+        TemplateExportParams templatePath = new TemplateExportParams("excel/ic_point_vaccines_inoculation.xlsx");
+        ExcelPoiUtils.exportExcel(templatePath ,new HashMap<>(),"疫苗接种点录入表",response);
+    }
+
+
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java
new file mode 100644
index 0000000000..eae4085362
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java
@@ -0,0 +1,52 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.IcPointNucleicMonitoringDTO;
+import com.epmet.dto.form.MapInfoFormDTO;
+import com.epmet.dto.form.PointHSYMFormDTO;
+import com.epmet.dto.result.MapInfoResultDTO;
+import com.epmet.entity.IcPointNucleicMonitoringEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 核酸监测点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@Mapper
+public interface IcPointNucleicMonitoringDao extends BaseDao<IcPointNucleicMonitoringEntity> {
+
+    /**
+     * 获取所有地点名称
+     * @return
+     */
+    List<String> getAllAddressName(@Param("customerId") String customerId);
+    List<String> getAllAddressNameNoCurrent(@Param("customerId") String customerId,@Param("id") String id);
+
+    /**
+     * 条件查询
+     * @param params
+     * @return
+     */
+    List<IcPointNucleicMonitoringDTO> getPhrasePage(Map<String, Object> params);
+
+    /**
+     * 条件查询
+     * @param formDTO
+     * @return
+     */
+    List<IcPointNucleicMonitoringDTO> getPhrasePageByDTO(PointHSYMFormDTO formDTO);
+
+    /**
+     * 获取地图信息
+     * @param formDTO
+     * @return
+     */
+    List<MapInfoResultDTO> getMapInfoList(MapInfoFormDTO formDTO);
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java
new file mode 100644
index 0000000000..d495fd6da1
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java
@@ -0,0 +1,52 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.IcPointVaccinesInoculationDTO;
+import com.epmet.dto.form.MapInfoFormDTO;
+import com.epmet.dto.form.PointHSYMFormDTO;
+import com.epmet.dto.result.MapInfoResultDTO;
+import com.epmet.entity.IcPointVaccinesInoculationEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 疫苗接种点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@Mapper
+public interface IcPointVaccinesInoculationDao extends BaseDao<IcPointVaccinesInoculationEntity> {
+
+    /**
+     * 获取所有地点名称
+     * @return
+     */
+    List<String> getAllAddressName(@Param("customerId") String customerId);
+    List<String> getAllAddressNameNoCurrent(@Param("customerId") String customerId,@Param("id") String id);
+
+    /**
+     * 条件查询
+     * @param params
+     * @return
+     */
+    List<IcPointVaccinesInoculationDTO> getPhrasePage(Map<String, Object> params);
+
+    /**
+     * 条件查询
+     * @param formDTO
+     * @return
+     */
+    List<IcPointVaccinesInoculationDTO> getPhrasePageByDTO(PointHSYMFormDTO formDTO);
+
+    /**
+     * 获取地图信息
+     * @param formDTO
+     * @return
+     */
+    List<MapInfoResultDTO> getMapInfoList(MapInfoFormDTO formDTO);
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
index 31e1db8e9b..8a7c5feb2a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
@@ -22,10 +22,7 @@ import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
 import com.epmet.dto.IcResiUserConfirmDTO;
 import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.IcVolunteerPolyDTO;
-import com.epmet.dto.form.EpidemicPreventionFormDTO;
-import com.epmet.dto.form.MoveOutMemberFormDTO;
-import com.epmet.dto.form.RentTenantDataFormDTO;
-import com.epmet.dto.form.ResiUserQueryValueDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcResiUserEntity;
 import org.apache.ibatis.annotations.MapKey;
@@ -412,4 +409,11 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      */
     List<Map<String, Object>> getResiUserCountGroupHomeId(@Param("customerId") String customerId);
 
+
+    /**
+     * 通过社区ID获取所属人员
+     * @param communityId
+     * @return
+     */
+    List<SendPointNoticeResultDTO> getUserListByCommunityId(@Param("communityId") String communityId);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java
new file mode 100644
index 0000000000..4a05b5d850
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java
@@ -0,0 +1,79 @@
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 核酸监测点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_point_nucleic_monitoring")
+public class IcPointNucleicMonitoringEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 所属组织ID
+     */
+	private String orgId;
+
+    /**
+     * 所属组织名称
+     */
+	private String orgName;
+
+    /**
+     * 组织ID上级
+     */
+	private String pid;
+
+    /**
+     * 组织ID所有上级
+     */
+	private String pids;
+
+    /**
+     * 核酸监测点名称
+     */
+	private String name;
+
+    /**
+     * 服务时间
+     */
+	private String serveTime;
+
+    /**
+     * 咨询电话
+     */
+	private String mobile;
+
+    /**
+     * 监测点地址
+     */
+	private String address;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 纬度
+     */
+	private String latitude;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointVaccinesInoculationEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointVaccinesInoculationEntity.java
new file mode 100644
index 0000000000..3f31a38485
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointVaccinesInoculationEntity.java
@@ -0,0 +1,104 @@
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 疫苗接种点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_point_vaccines_inoculation")
+public class IcPointVaccinesInoculationEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 所属组织ID
+     */
+	private String orgId;
+
+    /**
+     * 所属组织名称
+     */
+	private String orgName;
+
+    /**
+     * 组织ID上级
+     */
+	private String pid;
+
+    /**
+     * 组织ID所有上级
+     */
+	private String pids;
+
+    /**
+     * 疫苗接种点名称
+     */
+	private String name;
+
+    /**
+     * 接种日期
+     */
+	private String inoculationDate;
+
+    /**
+     * 接种上午开始时间
+     */
+	private String moStartTime;
+
+    /**
+     * 接种上午结束时间
+     */
+	private String moEndTime;
+
+    /**
+     * 接种下午开始时间
+     */
+	private String afStartTime;
+
+    /**
+     * 接种下午结束时间
+     */
+	private String afEndTime;
+
+    /**
+     * 暂无疫苗（1：是；2：否）
+     */
+	private String noAvailableVaccines;
+
+    /**
+     * 咨询电话
+     */
+	private String mobile;
+
+    /**
+     * 接种点地址
+     */
+	private String address;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 纬度
+     */
+	private String latitude;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointNucleicMonitoringExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointNucleicMonitoringExcel.java
new file mode 100644
index 0000000000..40854857e4
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointNucleicMonitoringExcel.java
@@ -0,0 +1,35 @@
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 核酸监测点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@Data
+public class IcPointNucleicMonitoringExcel {
+
+    @Excel(name = "所属组织名称")
+    private String orgName;
+
+    @Excel(name = "核酸监测点名称")
+    private String name;
+
+    @Excel(name = "服务时间")
+    private String serveTime;
+
+    @Excel(name = "咨询电话")
+    private String mobile;
+
+    @Excel(name = "监测点地址")
+    private String address;
+
+
+
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointNucleicMonitoringImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointNucleicMonitoringImportExcel.java
new file mode 100644
index 0000000000..22c04a2b51
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointNucleicMonitoringImportExcel.java
@@ -0,0 +1,58 @@
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelIgnore;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 核酸监测点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@Data
+public class IcPointNucleicMonitoringImportExcel {
+
+    @Excel(name = "所属组织名称")
+    private String orgName;
+
+    @Excel(name = "核酸监测点名称")
+    private String name;
+
+    @Excel(name = "服务时间")
+    private String serveTime;
+
+    @Excel(name = "咨询电话")
+    private String mobile;
+
+    @Excel(name = "监测点地址")
+    private String address;
+
+    @ExcelIgnore
+    private Boolean addStatus = false;
+
+    @ExcelIgnore
+    private Integer num;
+
+    /**
+     * 所属组织ID
+     */
+    @ExcelIgnore
+    private String orgId;
+
+    /**
+     * 组织ID上级
+     */
+    @ExcelIgnore
+    private String pid;
+
+    /**
+     * 组织ID所有上级
+     */
+    @ExcelIgnore
+    private String pids;
+
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationExcel.java
new file mode 100644
index 0000000000..39bc9540db
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationExcel.java
@@ -0,0 +1,47 @@
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 疫苗接种点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@Data
+public class IcPointVaccinesInoculationExcel {
+
+    @Excel(name = "疫苗接种点名称")
+    private String name;
+
+    @Excel(name = "接种日期")
+    private String inoculationDate;
+
+    @Excel(name = "接种上午开始时间")
+    private String moStartTime;
+
+    @Excel(name = "接种上午结束时间")
+    private String moEndTime;
+
+    @Excel(name = "接种下午开始时间")
+    private String afStartTime;
+
+    @Excel(name = "接种下午结束时间")
+    private String afEndTime;
+
+    @Excel(name = "暂无疫苗", replace = {"是_1","否_2"})
+    private String noAvailableVaccines;
+
+    @Excel(name = "咨询电话")
+    private String mobile;
+
+    @Excel(name = "接种点地址")
+    private String address;
+
+
+
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationImportExcel.java
new file mode 100644
index 0000000000..11e22ff0fe
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationImportExcel.java
@@ -0,0 +1,71 @@
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelIgnore;
+import lombok.Data;
+
+/**
+ * 疫苗接种点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@Data
+public class IcPointVaccinesInoculationImportExcel {
+
+//    @Excel(name = "所属组织名称")
+//    private String orgName;
+
+    @Excel(name = "疫苗接种点名称")
+    private String name;
+
+    @Excel(name = "接种日期")
+    private String inoculationDate;
+
+    @Excel(name = "接种上午开始时间")
+    private String moStartTime;
+
+    @Excel(name = "接种上午结束时间")
+    private String moEndTime;
+
+    @Excel(name = "接种下午开始时间")
+    private String afStartTime;
+
+    @Excel(name = "接种下午结束时间")
+    private String afEndTime;
+
+    @Excel(name = "暂无疫苗", replace = {"是_1","否_2"})
+    private String noAvailableVaccines;
+
+    @Excel(name = "咨询电话")
+    private String mobile;
+
+    @Excel(name = "接种点地址")
+    private String address;
+
+    @ExcelIgnore
+    private Boolean addStatus = false;
+
+    @ExcelIgnore
+    private Integer num;
+
+    /**
+     * 所属组织ID
+     */
+//    @ExcelIgnore
+//    private String orgId;
+
+    /**
+     * 组织ID上级
+     */
+//    @ExcelIgnore
+//    private String pid;
+
+    /**
+     * 组织ID所有上级
+     */
+//    @ExcelIgnore
+//    private String pids;
+
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/PointNucleicMonitoringErrorModel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/PointNucleicMonitoringErrorModel.java
new file mode 100644
index 0000000000..722142e35b
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/PointNucleicMonitoringErrorModel.java
@@ -0,0 +1,35 @@
+package com.epmet.excel.error;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+/**
+ * @Author wgf
+ * @DateTime 2022/6/21 16:57
+ * @DESC
+ */
+@Data
+public class PointNucleicMonitoringErrorModel {
+
+    @Excel(name = "行号",width = 10)
+    private Integer num;
+
+    @Excel(name = "所属组织名称",width = 30)
+    private String orgName;
+
+    @Excel(name = "核酸监测点名称",width = 30)
+    private String name;
+
+    @Excel(name = "服务时间",width = 20)
+    private String serveTime;
+
+    @Excel(name = "电话",width = 30)
+    private String mobile;
+
+    @Excel(name = "监测点地址",width = 40)
+    private String address;
+
+    @Excel(name = "错误信息", width = 200)
+    private String errorMsg;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/PointVaccinesInoculationErrorModel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/PointVaccinesInoculationErrorModel.java
new file mode 100644
index 0000000000..7f7d3c3109
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/PointVaccinesInoculationErrorModel.java
@@ -0,0 +1,50 @@
+package com.epmet.excel.error;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+/**
+ * @Author wgf
+ * @DateTime 2022/6/21 16:57
+ * @DESC
+ */
+@Data
+public class PointVaccinesInoculationErrorModel {
+
+    @Excel(name = "行号",width = 10)
+    private Integer num;
+
+//    @Excel(name = "所属组织名称",width = 30)
+//    private String orgName;
+
+    @Excel(name = "核酸监测点名称",width = 30)
+    private String name;
+
+    @Excel(name = "接种日期",width = 30)
+    private String inoculationDate;
+
+    @Excel(name = "接种上午开始时间",width = 30)
+    private String moStartTime;
+
+    @Excel(name = "接种上午结束时间",width = 30)
+    private String moEndTime;
+
+    @Excel(name = "接种下午开始时间",width = 30)
+    private String afStartTime;
+
+    @Excel(name = "接种下午结束时间",width = 30)
+    private String afEndTime;
+
+    @Excel(name = "暂无疫苗",width = 20, replace = {"否_1","是_2"})
+    private String noAvailableVaccines;
+
+    @Excel(name = "电话",width = 30)
+    private String mobile;
+
+    @Excel(name = "监测点地址",width = 40)
+    private String address;
+
+    @Excel(name = "错误信息", width = 200)
+    private String errorMsg;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcResiImportDynamicExcelListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcResiImportDynamicExcelListener.java
index 2e98774f6e..1d06fe5707 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcResiImportDynamicExcelListener.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcResiImportDynamicExcelListener.java
@@ -195,6 +195,9 @@ public class IcResiImportDynamicExcelListener extends AnalysisEventListener<Map<
                 SendMqMsgUtil.build()
                         .openFeignClient(SpringContextUtils.getBean(EpmetMessageOpenFeignClient.class))
                         .sendRocketMqMsg(SystemMessageType.VOLUNTEER_CHANGED, msg);
+            } else if (sheetEnumObject == IcResiUserTableEnum.IC_PARTY_MEMBER && !CollectionUtils.isEmpty(successIdCards)) {
+                // 针对党员，需要发送mq消息，同步到党员库
+                icResiUserImportService.syncPartyMemberInfo(successIdCards);
             }
         }
         dataList.clear();
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
index e0f881766e..8f3c43251c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -5,6 +5,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.form.CommonGridIdFormDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
+import com.epmet.dto.form.OrgInfoPointFormDTO;
+import com.epmet.dto.result.CommunityInfoResultDTO;
 import com.epmet.dto.result.GridInfoResultDTO;
 import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -63,4 +65,24 @@ public interface GovOrgFeignClient {
     //@PostMapping("/gov/org/grid/getbaseinfo")
     //Result<CustomerGridDTO> getGridBaseInfoByGridId(CustomerGridFormDTO customerGridFormDTO);
 
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.CommunityInfoResultDTO>
+     * @Author wgf
+     * @Description 根据社区名称查询所属组织信息
+     * @Date 2020/4/26 23:16
+     **/
+    @PostMapping("/gov/org/customeragency/getCommunityInfo")
+    Result<CommunityInfoResultDTO> getCommunityInfo(OrgInfoPointFormDTO formDTO);
+
+    /**
+     * @param userId
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.CommunityInfoResultDTO>
+     * @Author wgf
+     * @Description 根据社区名称查询所属组织信息
+     * @Date 2020/4/26 23:16
+     **/
+    @GetMapping("/gov/org/customeragency/getCommunityInfoByUserId/{userId}")
+    Result<CommunityInfoResultDTO> getCommunityInfoByUserId(@PathVariable("userId") String userId);
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
index 047208bdc4..0c1f3a6342 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
@@ -6,6 +6,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.form.CommonGridIdFormDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
+import com.epmet.dto.form.OrgInfoPointFormDTO;
+import com.epmet.dto.result.CommunityInfoResultDTO;
 import com.epmet.dto.result.GridInfoResultDTO;
 import com.epmet.feign.GovOrgFeignClient;
 import org.springframework.stereotype.Component;
@@ -39,4 +41,14 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
     //public Result<CustomerGridDTO> getGridBaseInfoByGridId(CustomerGridFormDTO customerGridFormDTO) {
     //    return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridBaseInfoByGridId", customerGridFormDTO);
     //}
+
+    @Override
+    public Result<CommunityInfoResultDTO> getCommunityInfo(OrgInfoPointFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCommunityInfo",formDTO);
+    }
+
+    @Override
+    public Result<CommunityInfoResultDTO> getCommunityInfoByUserId(String userId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCommunityInfoByUserId",userId);
+    }
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcPointNucleicMonitoringRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcPointNucleicMonitoringRedis.java
new file mode 100644
index 0000000000..2ad1347ab1
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcPointNucleicMonitoringRedis.java
@@ -0,0 +1,30 @@
+package com.epmet.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 核酸监测点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@Component
+public class IcPointNucleicMonitoringRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcPointVaccinesInoculationRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcPointVaccinesInoculationRedis.java
new file mode 100644
index 0000000000..ed32ef375f
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcPointVaccinesInoculationRedis.java
@@ -0,0 +1,30 @@
+package com.epmet.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 疫苗接种点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@Component
+public class IcPointVaccinesInoculationRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcNoticeService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcNoticeService.java
index 3f72855558..9c65229972 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcNoticeService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcNoticeService.java
@@ -5,6 +5,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcNoticeDTO;
 import com.epmet.dto.form.IcNoticeFormDTO;
 import com.epmet.dto.form.SendNoticeFormDTO;
+import com.epmet.dto.form.SendPointNoticeFormDTO;
 import com.epmet.entity.IcNoticeEntity;
 
 import java.util.Date;
@@ -89,6 +90,16 @@ public interface IcNoticeService extends BaseService<IcNoticeEntity> {
      */
     void sendNotice(SendNoticeFormDTO formDTO);
 
+    /**
+     * 发送通知(疫苗，核酸地点)
+     *
+     * @Param formDTO
+     * @Return
+     * @Author wgf
+     * @Date 2022/6/23 14:19
+     */
+    void sendPointNotice(SendPointNoticeFormDTO formDTO);
+
     /**
      * 获取人员最新一条通知
      * @Param idCard
@@ -104,4 +115,4 @@ public interface IcNoticeService extends BaseService<IcNoticeEntity> {
      * @return
      */
     Map<String, Date> getUserLatestNoticeTime(String customerId,List<String> idCardSet);
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java
new file mode 100644
index 0000000000..6d6f7626d9
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java
@@ -0,0 +1,33 @@
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.IcPointNucleicMonitoringDTO;
+import com.epmet.dto.form.MapInfoFormDTO;
+import com.epmet.dto.result.MapInfoResultDTO;
+import com.epmet.entity.IcPointNucleicMonitoringEntity;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 地图信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+public interface IcPointAppService {
+
+    /**
+     * 根据地点类型获取地图数据
+     * @param formDTO
+     * @return
+     */
+    Result<List<MapInfoResultDTO>> getMapInfoByPointType(MapInfoFormDTO formDTO);
+
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java
new file mode 100644
index 0000000000..8aaf21fe7d
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java
@@ -0,0 +1,108 @@
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.IcPointNucleicMonitoringDTO;
+import com.epmet.dto.form.MapInfoFormDTO;
+import com.epmet.dto.result.MapInfoResultDTO;
+import com.epmet.entity.IcPointNucleicMonitoringEntity;
+
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 核酸监测点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+public interface IcPointNucleicMonitoringService extends BaseService<IcPointNucleicMonitoringEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IcPointNucleicMonitoringDTO>
+     * @author generator
+     * @date 2022-06-20
+     */
+    PageData<IcPointNucleicMonitoringDTO> page(Map<String, Object> params);
+
+    /**
+     * 分页条件查询
+     * @param params
+     * @return
+     */
+    PageData<IcPointNucleicMonitoringDTO> getPhrasePage(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IcPointNucleicMonitoringDTO>
+     * @author generator
+     * @date 2022-06-20
+     */
+    List<IcPointNucleicMonitoringDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IcPointNucleicMonitoringDTO
+     * @author generator
+     * @date 2022-06-20
+     */
+    IcPointNucleicMonitoringDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-06-20
+     */
+    void save(IcPointNucleicMonitoringDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-06-20
+     */
+    void update(IcPointNucleicMonitoringDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2022-06-20
+     */
+    void delete(String[] ids);
+
+    /**
+     * Desc: 【核酸检测点】导入
+     * @param tokenDto
+     * @param inputStream
+     * @author zxc
+     * @date 2022/3/29 15:35
+     */
+    void importFile(TokenDto tokenDto, InputStream inputStream, String taskId);
+
+    /**
+     * 获取地图信息
+     *
+     * @param formDTO
+     * @return java.util.List<MapInfoResultDTO>
+     * @author wgf
+     * @date 2022-06-20
+     */
+    List<MapInfoResultDTO> getMapInfoList(MapInfoFormDTO formDTO);
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointVaccinesInoculationService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointVaccinesInoculationService.java
new file mode 100644
index 0000000000..9dc56f6779
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointVaccinesInoculationService.java
@@ -0,0 +1,110 @@
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.IcPointVaccinesInoculationDTO;
+import com.epmet.dto.form.MapInfoFormDTO;
+import com.epmet.dto.result.MapInfoResultDTO;
+import com.epmet.entity.IcPointVaccinesInoculationEntity;
+
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 疫苗接种点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+public interface IcPointVaccinesInoculationService extends BaseService<IcPointVaccinesInoculationEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IcPointVaccinesInoculationDTO>
+     * @author generator
+     * @date 2022-06-20
+     */
+    PageData<IcPointVaccinesInoculationDTO> page(Map<String, Object> params);
+
+    /**
+     * 分页条件查询
+     * @param params
+     * @return
+     */
+    PageData<IcPointVaccinesInoculationDTO> getPhrasePage(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IcPointVaccinesInoculationDTO>
+     * @author generator
+     * @date 2022-06-20
+     */
+    List<IcPointVaccinesInoculationDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IcPointVaccinesInoculationDTO
+     * @author generator
+     * @date 2022-06-20
+     */
+    IcPointVaccinesInoculationDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-06-20
+     */
+    void save(IcPointVaccinesInoculationDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-06-20
+     */
+    void update(IcPointVaccinesInoculationDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2022-06-20
+     */
+    void delete(String[] ids);
+
+    /**
+     * Desc: 【疫苗接种点】导入
+     * @param tokenDto
+     * @param inputStream
+     * @author zxc
+     * @date 2022/3/29 15:35
+     */
+    void importFile(TokenDto tokenDto, InputStream inputStream, String taskId);
+
+    /**
+     * 获取地图信息
+     *
+     * @param formDTO
+     * @return java.util.List<MapInfoResultDTO>
+     * @author wgf
+     * @date 2022-06-20
+     */
+    List<MapInfoResultDTO> getMapInfoList(MapInfoFormDTO formDTO);
+
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
index 520f4fa195..86849f1eef 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
@@ -475,4 +475,11 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      */
     void updateIcHouseResiNumber(String customerId);
 
+
+    /**
+     * 根据社区ID获取该社区下的所有用户
+     * @param communityId
+     * @return
+     */
+    List<SendPointNoticeFormDTO.UserListBean> getUserListByCommunityId(String communityId);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java
index 28fd02753b..1abb00b5f3 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java
@@ -16,10 +16,7 @@ import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dao.IcNoticeDao;
 import com.epmet.dto.IcNoticeDTO;
 import com.epmet.dto.UserBaseInfoDTO;
-import com.epmet.dto.form.IcNoticeFormDTO;
-import com.epmet.dto.form.ProjectSendMsgFormDTO;
-import com.epmet.dto.form.SendNoticeFormDTO;
-import com.epmet.dto.form.UserMessageFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.entity.IcNoticeEntity;
 import com.epmet.feign.MessageFeignClient;
 import com.epmet.service.IcNoticeService;
@@ -197,6 +194,91 @@ public class IcNoticeServiceImpl extends BaseServiceImpl<IcNoticeDao, IcNoticeEn
         //TODO 发送短信
     }
 
+    /**
+     * 发送通知
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return
+     * @Author wgf
+     * @Date 2022/6/23 14:19
+     */
+    @Override
+    public void sendPointNotice(SendPointNoticeFormDTO formDTO) {
+        String orgName = "";
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        if (null != staffInfo) {
+            orgName = staffInfo.getAgencyName();
+        }
+        //保存消息
+        String channel = StringUtils.join(formDTO.getChannel(), StrConstant.COMMA);
+        String finalOrgName = orgName;
+        List<SendPointNoticeFormDTO.UserListBean> userBeanList = formDTO.getUserList().stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(
+                        Comparator.comparing( SendPointNoticeFormDTO.UserListBean::getIdCard))), ArrayList::new));
+        List<IcNoticeEntity> entityList = userBeanList.stream().map(item -> {
+            IcNoticeEntity entity = new IcNoticeEntity();
+            entity.setCustomerId(formDTO.getCustomerId());
+            entity.setChannel(channel);
+            entity.setContent(formDTO.getContent());
+            entity.setOrigin(formDTO.getOrigin());
+            entity.setUserId(item.getUserId());
+            entity.setMobile(item.getMobile());
+            entity.setIdCard(item.getIdCard());
+            entity.setOrgName(finalOrgName);
+            return entity;
+        }).collect(Collectors.toList());
+        insertBatch(entityList);
+
+        //通知
+        List<UserMessageFormDTO> msgList = new ArrayList<>();
+        //短信消息
+        List<ProjectSendMsgFormDTO> smsList = new ArrayList<>();
+
+        entityList.forEach(item -> {
+            if (StringUtils.isNotBlank(item.getIdCard())) {
+                //根据身份证获取居民ID
+                List<UserBaseInfoDTO> userList = userBaseInfoService.getCommonIdNumUser(item.getCustomerId(), item.getIdCard());
+                if (CollectionUtils.isNotEmpty(userList)) {
+                    userList.forEach(user -> {
+                        UserMessageFormDTO messageFormDTO = new UserMessageFormDTO();
+                        messageFormDTO.setCustomerId(item.getCustomerId());
+                        messageFormDTO.setApp(AppClientConstant.APP_GOV);
+                        messageFormDTO.setGridId(StrConstant.STAR);
+                        messageFormDTO.setUserId(user.getUserId());
+                        messageFormDTO.setTitle("您有一条通知消息！");
+                        messageFormDTO.setMessageContent(item.getContent());
+                        messageFormDTO.setReadFlag(Constant.UNREAD);
+                        if("3".equals(formDTO.getOrigin())){
+                            // 核酸检测点
+                            messageFormDTO.setMessageType(UserMessageTypeConstant.NUCLEIC);
+                        }else{
+                            // 疫苗接种点
+                            messageFormDTO.setMessageType(UserMessageTypeConstant.VACCINES);
+                        }
+                        messageFormDTO.setTargetId(item.getId());
+                        msgList.add(messageFormDTO);
+                    });
+                }
+            }
+            //TODO 短信消息
+            if (StringUtils.isNotBlank(item.getMobile())) {
+                ProjectSendMsgFormDTO sms = new ProjectSendMsgFormDTO();
+                sms.setCustomerId(item.getCustomerId());
+                sms.setMobile(item.getMobile());
+                sms.setAliyunTemplateCode(SmsTemplateConstant.PROJECT_OVERDUE);
+                sms.setParameterKey("send_msg");
+                smsList.add(sms);
+            }
+        });
+        //发送小程序消息
+        Result result = messageFeignClient.saveUserMessageList(msgList);
+        if (!result.success()) {
+            log.error("发送小程序消息失败" + JSON.toJSONString(result));
+        }
+        //TODO 发送短信
+    }
+
     /**
      * 获取人员最新一条通知
      *
@@ -244,4 +326,4 @@ public class IcNoticeServiceImpl extends BaseServiceImpl<IcNoticeDao, IcNoticeEn
         return map;
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointAppServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointAppServiceImpl.java
new file mode 100644
index 0000000000..7927aea977
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointAppServiceImpl.java
@@ -0,0 +1,88 @@
+package com.epmet.service.impl;
+
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.exception.ExceptionUtils;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.ExcelPoiUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.constants.ImportTaskConstants;
+import com.epmet.dao.IcPointVaccinesInoculationDao;
+import com.epmet.dto.IcPointVaccinesInoculationDTO;
+import com.epmet.dto.form.ImportTaskCommonFormDTO;
+import com.epmet.dto.form.MapInfoFormDTO;
+import com.epmet.dto.result.MapInfoResultDTO;
+import com.epmet.dto.result.UploadImgResultDTO;
+import com.epmet.entity.IcPointVaccinesInoculationEntity;
+import com.epmet.excel.IcPointVaccinesInoculationImportExcel;
+import com.epmet.excel.error.PointVaccinesInoculationErrorModel;
+import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
+import com.epmet.feign.GovOrgFeignClient;
+import com.epmet.feign.OssFeignClient;
+import com.epmet.redis.IcPointVaccinesInoculationRedis;
+import com.epmet.service.IcPointAppService;
+import com.epmet.service.IcPointNucleicMonitoringService;
+import com.epmet.service.IcPointVaccinesInoculationService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileItemFactory;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.entity.ContentType;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 地图信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@Service
+@Slf4j
+public class IcPointAppServiceImpl implements IcPointAppService {
+
+    @Autowired
+    private IcPointNucleicMonitoringService icPointNucleicMonitoringService;
+
+    @Autowired
+    private IcPointVaccinesInoculationService icPointVaccinesInoculationService;
+
+
+    @Override
+    public Result<List<MapInfoResultDTO>> getMapInfoByPointType(MapInfoFormDTO formDTO) {
+        List<MapInfoResultDTO> mapInfoResultDTO = new ArrayList<MapInfoResultDTO>();
+        // 地点类型（1：核酸检测点；   2：疫苗接种点）
+        if("1".equals(formDTO.getType())){
+            // 核酸检测点地图数据
+            mapInfoResultDTO = icPointNucleicMonitoringService.getMapInfoList(formDTO);
+
+        }else if("2".equals(formDTO.getType())){
+            // 疫苗接种点地图数据
+            mapInfoResultDTO = icPointVaccinesInoculationService.getMapInfoList(formDTO);
+        }
+        return new Result<List<MapInfoResultDTO>>().ok(mapInfoResultDTO);
+    }
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java
new file mode 100644
index 0000000000..cb2b516b13
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java
@@ -0,0 +1,377 @@
+package com.epmet.service.impl;
+
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.exception.ExceptionUtils;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.ExcelPoiUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.constants.ImportTaskConstants;
+import com.epmet.dao.IcPointNucleicMonitoringDao;
+import com.epmet.dto.IcPointNucleicMonitoringDTO;
+import com.epmet.dto.form.ImportTaskCommonFormDTO;
+import com.epmet.dto.form.MapInfoFormDTO;
+import com.epmet.dto.form.OrgInfoPointFormDTO;
+import com.epmet.dto.result.CommunityInfoResultDTO;
+import com.epmet.dto.result.MapInfoResultDTO;
+import com.epmet.dto.result.UploadImgResultDTO;
+import com.epmet.entity.IcEpidemicSpecialAttentionEntity;
+import com.epmet.entity.IcPointNucleicMonitoringEntity;
+import com.epmet.excel.IcPointNucleicMonitoringImportExcel;
+import com.epmet.excel.error.EpidemicSpecialAttentionErrorModel;
+import com.epmet.excel.error.PointNucleicMonitoringErrorModel;
+import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
+import com.epmet.feign.GovOrgFeignClient;
+import com.epmet.feign.OssFeignClient;
+import com.epmet.redis.IcPointNucleicMonitoringRedis;
+import com.epmet.service.IcPointNucleicMonitoringService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileItemFactory;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.entity.ContentType;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 核酸监测点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@Service
+@Slf4j
+public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl<IcPointNucleicMonitoringDao, IcPointNucleicMonitoringEntity> implements IcPointNucleicMonitoringService {
+
+    @Autowired
+    private IcPointNucleicMonitoringRedis icPointNucleicMonitoringRedis;
+
+    @Autowired
+    private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
+
+    @Autowired
+    private OssFeignClient ossFeignClient;
+
+    @Autowired
+    private GovOrgFeignClient govOrgFeignClient;
+
+    @Override
+    public PageData<IcPointNucleicMonitoringDTO> page(Map<String, Object> params) {
+        IPage<IcPointNucleicMonitoringEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IcPointNucleicMonitoringDTO.class);
+    }
+
+    /**
+     * 条件查询
+     * @param params
+     * @return
+     */
+    @Override
+    public PageData<IcPointNucleicMonitoringDTO> getPhrasePage(Map<String, Object> params) {
+        IPage<IcPointNucleicMonitoringDTO> page = getPage(params);
+        List<IcPointNucleicMonitoringDTO> list = baseDao.getPhrasePage(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
+    @Override
+    public List<IcPointNucleicMonitoringDTO> list(Map<String, Object> params) {
+        List<IcPointNucleicMonitoringEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IcPointNucleicMonitoringDTO.class);
+    }
+
+    private QueryWrapper<IcPointNucleicMonitoringEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IcPointNucleicMonitoringEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IcPointNucleicMonitoringDTO get(String id) {
+        IcPointNucleicMonitoringEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcPointNucleicMonitoringDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IcPointNucleicMonitoringDTO dto) {
+        // 获取所有地点名称
+        List<String> addressList = baseDao.getAllAddressName(dto.getCustomerId());
+        // 校验数据库是否存在该地点名称
+        if (addressList.contains(dto.getName())){
+            throw new RenException("该监测点名称已存在，请重新输入");
+        }
+        if(StringUtils.isNotBlank(dto.getOrgName())){
+            // 赋值pid  pids
+            OrgInfoPointFormDTO formDTO = ConvertUtils.sourceToTarget(dto, OrgInfoPointFormDTO.class);
+            Result<CommunityInfoResultDTO> resultDTOResult = govOrgFeignClient.getCommunityInfo(formDTO);
+            CommunityInfoResultDTO communityInfoResultDTO = resultDTOResult.getData();
+            dto.setPid(communityInfoResultDTO.getPid());
+            dto.setPids(communityInfoResultDTO.getPids());
+        }
+        IcPointNucleicMonitoringEntity entity = ConvertUtils.sourceToTarget(dto, IcPointNucleicMonitoringEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IcPointNucleicMonitoringDTO dto) {
+        // 获取所有地点名称
+        List<String> addressList = baseDao.getAllAddressNameNoCurrent(dto.getCustomerId(),dto.getId());
+        // 校验数据库是否存在该地点名称
+        if (addressList.contains(dto.getName())){
+            throw new RenException("该监测点名称已存在，请重新输入");
+        }
+        if(StringUtils.isNotBlank(dto.getOrgName())){
+            // 赋值pid  pids
+            OrgInfoPointFormDTO formDTO = ConvertUtils.sourceToTarget(dto, OrgInfoPointFormDTO.class);
+            Result<CommunityInfoResultDTO> resultDTOResult = govOrgFeignClient.getCommunityInfo(formDTO);
+            CommunityInfoResultDTO communityInfoResultDTO = resultDTOResult.getData();
+            dto.setPid(communityInfoResultDTO.getPid());
+            dto.setPids(communityInfoResultDTO.getPids());
+        }
+        IcPointNucleicMonitoringEntity entity = ConvertUtils.sourceToTarget(dto, IcPointNucleicMonitoringEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * Desc: 【核酸检测点】导入
+     * @param tokenDto
+     * @param inputStream
+     * @param taskId
+     * @author wgf
+     * @date 2022/3/29 15:35
+     */
+    @Override
+    @Async
+    public void importFile(TokenDto tokenDto, InputStream inputStream, String taskId) {
+        List<PointNucleicMonitoringErrorModel> errorInfo = new ArrayList<>();
+
+        try {
+            List<IcPointNucleicMonitoringImportExcel> list = ExcelPoiUtils.importExcel(inputStream, 0,1,IcPointNucleicMonitoringImportExcel.class);
+            if (CollectionUtils.isEmpty(list)){
+                closeTask(taskId,tokenDto.getUserId(), ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL,"");
+                return;
+            }
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+            if (null == staffInfo){
+                throw new EpmetException("未查询到工作人员信息"+tokenDto.getUserId());
+            }
+            AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId());
+            if (null == agencyInfo){
+                throw new EpmetException("未查询到组织信息"+staffInfo.getAgencyId());
+            }
+            // 获取所有地点名称
+            List<String> addressList = baseDao.getAllAddressName(tokenDto.getUserId());
+            for (int i = 0; i < list.size(); i++) {
+                list.get(i).setNum(i+1);
+                if (StringUtils.isBlank(list.get(i).getOrgName()) && !list.get(i).getAddStatus()){
+                    errorInfo.add(getErrorInfo(list.get(i), "所属组织名称不能为空",i+1));
+                    list.get(i).setAddStatus(true);
+                    continue;
+                }
+                if (StringUtils.isBlank(list.get(i).getName()) && !list.get(i).getAddStatus()){
+                    errorInfo.add(getErrorInfo(list.get(i), "核酸监测点名称不能为空",i+1));
+                    list.get(i).setAddStatus(true);
+                    continue;
+                }
+                if (StringUtils.isBlank(list.get(i).getServeTime()) && !list.get(i).getAddStatus()){
+                    errorInfo.add(getErrorInfo(list.get(i), "服务时间不能为空",i+1));
+                    list.get(i).setAddStatus(true);
+                    continue;
+                }
+                if (StringUtils.isBlank(list.get(i).getMobile()) && !list.get(i).getAddStatus()){
+                    errorInfo.add(getErrorInfo(list.get(i), "咨询电话不能为空",i+1));
+                    list.get(i).setAddStatus(true);
+                    continue;
+                }
+                if (StringUtils.isBlank(list.get(i).getAddress()) && !list.get(i).getAddStatus()){
+                    errorInfo.add(getErrorInfo(list.get(i), "监测点地址不能为空",i+1));
+                    list.get(i).setAddStatus(true);
+                    continue;
+                }
+                // 校验数据库是否存在该地点名称
+                if (addressList.contains(list.get(i).getName()) && !list.get(i).getAddStatus()){
+                    errorInfo.add(getErrorInfo(list.get(i), "核酸监测点名称已存在",i+1));
+                    list.get(i).setAddStatus(true);
+                    continue;
+                }
+
+                // 校验所属组织通过名称能否匹配到ID
+                OrgInfoPointFormDTO formDTO = new OrgInfoPointFormDTO();
+                formDTO.setOrgName(list.get(i).getOrgName());
+                formDTO.setCustomerId(tokenDto.getCustomerId());
+                Result<CommunityInfoResultDTO> resultDTOResult = govOrgFeignClient.getCommunityInfo(formDTO);
+                CommunityInfoResultDTO communityInfoResultDTO = resultDTOResult.getData();
+                if(communityInfoResultDTO == null && !list.get(i).getAddStatus()){
+                    errorInfo.add(getErrorInfo(list.get(i), "所属组织匹配失败",i+1));
+                    list.get(i).setAddStatus(true);
+                    continue;
+                }else{
+                    list.get(i).setOrgId(communityInfoResultDTO.getDeptId());
+                    list.get(i).setPid(communityInfoResultDTO.getPid());
+                    list.get(i).setPids(communityInfoResultDTO.getPids());
+                }
+
+            }
+            if (list.size() > errorInfo.size()){
+                Map<String, Long> groupByName = list.stream().collect(Collectors.groupingBy(IcPointNucleicMonitoringImportExcel::getName, Collectors.counting()));
+                groupByName.forEach((name,count) -> {
+                    if (Integer.valueOf(count.toString()).compareTo(1) != 0){
+                        for (IcPointNucleicMonitoringImportExcel i : list) {
+                            if (name.equals(i.getName()) && !i.getAddStatus()){
+                                errorInfo.add(getErrorInfo(i,"数据重复",i.getNum()));
+                                i.setAddStatus(true);
+                            }
+                        }
+                    }
+                });
+            }
+            Map<Boolean, List<IcPointNucleicMonitoringImportExcel>> groupByStatus = list.stream().collect(Collectors.groupingBy(IcPointNucleicMonitoringImportExcel::getAddStatus));
+            List<IcPointNucleicMonitoringImportExcel> needInsert = groupByStatus.get(false);
+            if (CollectionUtils.isNotEmpty(needInsert)){
+                List<IcPointNucleicMonitoringEntity> entities = ConvertUtils.sourceToTarget(needInsert, IcPointNucleicMonitoringEntity.class);
+                entities.forEach(e -> {
+                    // 设置客户ID
+                    e.setCustomerId(tokenDto.getCustomerId());
+                });
+                insertBatch(entities);
+            }
+            if (CollectionUtils.isNotEmpty(errorInfo)){
+                String url = importOssUpload(errorInfo, PointNucleicMonitoringErrorModel.class);
+                closeTask(taskId,tokenDto.getUserId(), ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL,url);
+            }else {
+                closeTask(taskId,tokenDto.getUserId(),ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS,"");
+            }
+        }catch (Exception e){
+            log.error(e.getMessage());
+            closeTask(taskId,tokenDto.getUserId(),ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL,"");
+        }
+    }
+
+    /**
+     * Desc: 关闭任务
+     * @param taskId
+     * @param userId
+     * @param status
+     * @param url
+     * @author wgf
+     * @date 2022/3/30 09:05
+     */
+    public void closeTask(String taskId,String userId,String status,String url){
+        ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO();
+        input.setOperatorId(userId);
+        input.setTaskId(taskId);
+        input.setProcessStatus(status);
+        input.setResultDescFilePath(url);
+        commonServiceOpenFeignClient.finishImportTask(input);
+    }
+
+    /**
+     * Desc: 构造错误信息
+     * @param dto
+     * @param info
+     * @param num
+     * @author wgf
+     * @date 2022/3/29 17:17
+     */
+    public PointNucleicMonitoringErrorModel getErrorInfo(IcPointNucleicMonitoringImportExcel dto, String info, Integer num){
+        PointNucleicMonitoringErrorModel result = ConvertUtils.sourceToTarget(dto, PointNucleicMonitoringErrorModel.class);
+        result.setErrorMsg(info);
+        result.setNum(num);
+        return result;
+    }
+
+    /**
+     * Desc: 文件上传并返回url
+     * @param errorRows
+     * @param tClass
+     * @author zxc
+     * @date 2022/3/30 09:16
+     */
+    public <T> String importOssUpload(Collection<?> errorRows, Class<T> tClass) throws IOException {
+        Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams("导入失败的数据列表","导入失败的数据列表"),
+                tClass, errorRows);
+
+        // 文件名
+        String resultDescFileName = UUID.randomUUID().toString().concat(".xls");
+
+        FileItemFactory factory = new DiskFileItemFactory(16, null);
+        FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, resultDescFileName);
+        OutputStream os = fileItem.getOutputStream();
+        Result<UploadImgResultDTO> uploadResult = null;
+        try {
+            workbook.write(os);
+            uploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem));
+        } catch (Exception e) {
+            String errormsg = ExceptionUtils.getErrorStackTrace(e);
+            log.error("上传错误描述文件:{}", errormsg);
+        } finally {
+            try {
+                os.close();
+            } catch (IOException e) {
+                String errormsg = ExceptionUtils.getErrorStackTrace(e);
+                log.error("上传错误描述文件关闭输出流:{}", errormsg);
+            }
+            try {
+                fileItem.delete();
+            } catch (Exception e) {
+                String errormsg = ExceptionUtils.getErrorStackTrace(e);
+                log.error("上传错误描述文件删除临时文件:{}", errormsg);
+            }
+        }
+
+        if (uploadResult == null || !uploadResult.success()) {
+            log.error("调用OSS上传结果描述文件失败");
+            return null;
+        }
+        return uploadResult.getData().getUrl();
+    }
+
+
+    @Override
+    public List<MapInfoResultDTO> getMapInfoList(MapInfoFormDTO formDTO) {
+        List<MapInfoResultDTO> list = baseDao.getMapInfoList(formDTO);
+        return list;
+    }
+
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java
new file mode 100644
index 0000000000..b1ccaede98
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java
@@ -0,0 +1,382 @@
+package com.epmet.service.impl;
+
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.exception.ExceptionUtils;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.ExcelPoiUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.constants.ImportTaskConstants;
+import com.epmet.dao.IcPointVaccinesInoculationDao;
+import com.epmet.dto.IcPointVaccinesInoculationDTO;
+import com.epmet.dto.form.ImportTaskCommonFormDTO;
+import com.epmet.dto.form.MapInfoFormDTO;
+import com.epmet.dto.result.CommunityInfoResultDTO;
+import com.epmet.dto.result.MapInfoResultDTO;
+import com.epmet.dto.result.UploadImgResultDTO;
+import com.epmet.entity.IcPointVaccinesInoculationEntity;
+import com.epmet.excel.IcPointVaccinesInoculationImportExcel;
+import com.epmet.excel.error.PointVaccinesInoculationErrorModel;
+import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
+import com.epmet.feign.GovOrgFeignClient;
+import com.epmet.feign.OssFeignClient;
+import com.epmet.redis.IcPointVaccinesInoculationRedis;
+import com.epmet.service.IcPointVaccinesInoculationService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileItemFactory;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.entity.ContentType;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 疫苗接种点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@Service
+@Slf4j
+public class IcPointVaccinesInoculationServiceImpl extends BaseServiceImpl<IcPointVaccinesInoculationDao, IcPointVaccinesInoculationEntity> implements IcPointVaccinesInoculationService {
+
+    @Autowired
+    private IcPointVaccinesInoculationRedis icPointVaccinesInoculationRedis;
+
+    @Autowired
+    private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
+
+    @Autowired
+    private OssFeignClient ossFeignClient;
+
+    @Autowired
+    private GovOrgFeignClient govOrgFeignClient;
+
+    @Override
+    public PageData<IcPointVaccinesInoculationDTO> page(Map<String, Object> params) {
+        IPage<IcPointVaccinesInoculationEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IcPointVaccinesInoculationDTO.class);
+    }
+
+    /**
+     * 条件查询
+     * @param params
+     * @return
+     */
+    @Override
+    public PageData<IcPointVaccinesInoculationDTO> getPhrasePage(Map<String, Object> params) {
+        IPage<IcPointVaccinesInoculationDTO> page = getPage(params);
+        List<IcPointVaccinesInoculationDTO> list = baseDao.getPhrasePage(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
+    @Override
+    public List<IcPointVaccinesInoculationDTO> list(Map<String, Object> params) {
+        List<IcPointVaccinesInoculationEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IcPointVaccinesInoculationDTO.class);
+    }
+
+    private QueryWrapper<IcPointVaccinesInoculationEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IcPointVaccinesInoculationEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IcPointVaccinesInoculationDTO get(String id) {
+        IcPointVaccinesInoculationEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcPointVaccinesInoculationDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IcPointVaccinesInoculationDTO dto) {
+        // 获取所有地点名称
+        List<String> addressList = baseDao.getAllAddressName(dto.getCustomerId());
+        // 校验数据库是否存在该地点名称
+        if (addressList.contains(dto.getName())){
+            throw new RenException("该接种点名称已存在，请重新输入");
+        }
+        IcPointVaccinesInoculationEntity entity = ConvertUtils.sourceToTarget(dto, IcPointVaccinesInoculationEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IcPointVaccinesInoculationDTO dto) {
+        // 获取所有地点名称
+        List<String> addressList = baseDao.getAllAddressNameNoCurrent(dto.getCustomerId(),dto.getId());
+        // 校验数据库是否存在该地点名称
+        if (addressList.contains(dto.getName())){
+            throw new RenException("该接种点名称已存在，请重新输入");
+        }
+        IcPointVaccinesInoculationEntity entity = ConvertUtils.sourceToTarget(dto, IcPointVaccinesInoculationEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * Desc: 【核酸检测点】导入
+     * @param tokenDto
+     * @param inputStream
+     * @param taskId
+     * @author wgf
+     * @date 2022/3/29 15:35
+     */
+    @Override
+    @Async
+    public void importFile(TokenDto tokenDto, InputStream inputStream, String taskId) {
+        List<PointVaccinesInoculationErrorModel> errorInfo = new ArrayList<>();
+
+        try {
+            List<IcPointVaccinesInoculationImportExcel> list = ExcelPoiUtils.importExcel(inputStream, 0,1,IcPointVaccinesInoculationImportExcel.class);
+            if (CollectionUtils.isEmpty(list)){
+                closeTask(taskId,tokenDto.getUserId(), ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL,"");
+                return;
+            }
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+            if (null == staffInfo){
+                throw new EpmetException("未查询到工作人员信息"+tokenDto.getUserId());
+            }
+            AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId());
+            if (null == agencyInfo){
+                throw new EpmetException("未查询到组织信息"+staffInfo.getAgencyId());
+            }
+            // 获取所有地点名称
+            List<String> addressList = baseDao.getAllAddressName(tokenDto.getCustomerId());
+            for (int i = 0; i < list.size(); i++) {
+                list.get(i).setNum(i+1);
+//                if (StringUtils.isBlank(list.get(i).getOrgName()) && !list.get(i).getAddStatus()){
+//                    errorInfo.add(getErrorInfo(list.get(i), "所属组织名称不能为空",i+1));
+//                    list.get(i).setAddStatus(true);
+//                    continue;
+//                }
+                if (StringUtils.isBlank(list.get(i).getName()) && !list.get(i).getAddStatus()){
+                    errorInfo.add(getErrorInfo(list.get(i), "核酸监测点名称不能为空",i+1));
+                    list.get(i).setAddStatus(true);
+                    continue;
+                }
+                if (list.get(i).getNoAvailableVaccines() == null && !list.get(i).getAddStatus()){
+                    errorInfo.add(getErrorInfo(list.get(i), "暂无疫苗不能为空",i+1));
+                    list.get(i).setAddStatus(true);
+                    continue;
+                }else{
+                    // 暂无疫苗为否，才校验日期
+                    if("2".equals(list.get(i).getNoAvailableVaccines())){
+                        if (StringUtils.isBlank(list.get(i).getInoculationDate()) && !list.get(i).getAddStatus()){
+                            errorInfo.add(getErrorInfo(list.get(i), "接种日期不能为空",i+1));
+                            list.get(i).setAddStatus(true);
+                            continue;
+                        }
+                        if (StringUtils.isBlank(list.get(i).getMoStartTime()) && !list.get(i).getAddStatus()){
+                            errorInfo.add(getErrorInfo(list.get(i), "接种上午开始时间不能为空",i+1));
+                            list.get(i).setAddStatus(true);
+                            continue;
+                        }
+                        if (StringUtils.isBlank(list.get(i).getMoEndTime()) && !list.get(i).getAddStatus()){
+                            errorInfo.add(getErrorInfo(list.get(i), "接种上午结束时间不能为空",i+1));
+                            list.get(i).setAddStatus(true);
+                            continue;
+                        }
+                        if (StringUtils.isBlank(list.get(i).getAfStartTime()) && !list.get(i).getAddStatus()){
+                            errorInfo.add(getErrorInfo(list.get(i), "接种下午开始时间不能为空",i+1));
+                            list.get(i).setAddStatus(true);
+                            continue;
+                        }
+                        if (StringUtils.isBlank(list.get(i).getAfEndTime()) && !list.get(i).getAddStatus()){
+                            errorInfo.add(getErrorInfo(list.get(i), "接种下午结束时间不能为空",i+1));
+                            list.get(i).setAddStatus(true);
+                            continue;
+                        }
+                    }
+
+                }
+                if (StringUtils.isBlank(list.get(i).getMobile()) && !list.get(i).getAddStatus()){
+                    errorInfo.add(getErrorInfo(list.get(i), "咨询电话不能为空",i+1));
+                    list.get(i).setAddStatus(true);
+                    continue;
+                }
+                if (StringUtils.isBlank(list.get(i).getAddress()) && !list.get(i).getAddStatus()){
+                    errorInfo.add(getErrorInfo(list.get(i), "监测点地址不能为空",i+1));
+                    list.get(i).setAddStatus(true);
+                    continue;
+                }
+                // 校验数据库是否存在该地点名称
+                if (addressList.contains(list.get(i).getName()) && !list.get(i).getAddStatus()){
+                    errorInfo.add(getErrorInfo(list.get(i), "核酸监测点名称已存在",i+1));
+                    list.get(i).setAddStatus(true);
+                    continue;
+                }
+
+                // 校验所属组织通过名称能否匹配到ID
+//                Result<CommunityInfoResultDTO> resultDTOResult = govOrgFeignClient.getCommunityInfo(list.get(i).getOrgName());
+//                CommunityInfoResultDTO communityInfoResultDTO = resultDTOResult.getData();
+//                if(communityInfoResultDTO == null && !list.get(i).getAddStatus()){
+//                    errorInfo.add(getErrorInfo(list.get(i), "所属组织匹配失败",i+1));
+//                    list.get(i).setAddStatus(true);
+//                    continue;
+//                }else{
+//                    list.get(i).setOrgId(communityInfoResultDTO.getDeptId());
+//                    list.get(i).setPid(communityInfoResultDTO.getPid());
+//                    list.get(i).setPids(communityInfoResultDTO.getPids());
+//                }
+
+            }
+            if (list.size() > errorInfo.size()){
+                Map<String, Long> groupByName = list.stream().collect(Collectors.groupingBy(IcPointVaccinesInoculationImportExcel::getName, Collectors.counting()));
+                groupByName.forEach((name,count) -> {
+                    if (Integer.valueOf(count.toString()).compareTo(1) != 0){
+                        for (IcPointVaccinesInoculationImportExcel i : list) {
+                            if (name.equals(i.getName()) && !i.getAddStatus()){
+                                errorInfo.add(getErrorInfo(i,"数据重复",i.getNum()));
+                                i.setAddStatus(true);
+                            }
+                        }
+                    }
+                });
+            }
+            Map<Boolean, List<IcPointVaccinesInoculationImportExcel>> groupByStatus = list.stream().collect(Collectors.groupingBy(IcPointVaccinesInoculationImportExcel::getAddStatus));
+            List<IcPointVaccinesInoculationImportExcel> needInsert = groupByStatus.get(false);
+            if (CollectionUtils.isNotEmpty(needInsert)){
+                List<IcPointVaccinesInoculationEntity> entities = ConvertUtils.sourceToTarget(needInsert, IcPointVaccinesInoculationEntity.class);
+                entities.forEach(e -> {
+                    // 设置客户ID
+                    e.setCustomerId(tokenDto.getCustomerId());
+                });
+                insertBatch(entities);
+            }
+            if (CollectionUtils.isNotEmpty(errorInfo)){
+                String url = importOssUpload(errorInfo, PointVaccinesInoculationErrorModel.class);
+                closeTask(taskId,tokenDto.getUserId(), ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL,url);
+            }else {
+                closeTask(taskId,tokenDto.getUserId(),ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS,"");
+            }
+        }catch (Exception e){
+            log.error(e.getMessage());
+            closeTask(taskId,tokenDto.getUserId(),ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL,"");
+        }
+    }
+
+    /**
+     * Desc: 关闭任务
+     * @param taskId
+     * @param userId
+     * @param status
+     * @param url
+     * @author wgf
+     * @date 2022/3/30 09:05
+     */
+    public void closeTask(String taskId,String userId,String status,String url){
+        ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO();
+        input.setOperatorId(userId);
+        input.setTaskId(taskId);
+        input.setProcessStatus(status);
+        input.setResultDescFilePath(url);
+        commonServiceOpenFeignClient.finishImportTask(input);
+    }
+
+    /**
+     * Desc: 构造错误信息
+     * @param dto
+     * @param info
+     * @param num
+     * @author wgf
+     * @date 2022/3/29 17:17
+     */
+    public PointVaccinesInoculationErrorModel getErrorInfo(IcPointVaccinesInoculationImportExcel dto, String info, Integer num){
+        PointVaccinesInoculationErrorModel result = ConvertUtils.sourceToTarget(dto, PointVaccinesInoculationErrorModel.class);
+        result.setErrorMsg(info);
+        result.setNum(num);
+        return result;
+    }
+
+    /**
+     * Desc: 文件上传并返回url
+     * @param errorRows
+     * @param tClass
+     * @author zxc
+     * @date 2022/3/30 09:16
+     */
+    public <T> String importOssUpload(Collection<?> errorRows, Class<T> tClass) throws IOException {
+        Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams("导入失败的数据列表","导入失败的数据列表"),
+                tClass, errorRows);
+
+        // 文件名
+        String resultDescFileName = UUID.randomUUID().toString().concat(".xls");
+
+        FileItemFactory factory = new DiskFileItemFactory(16, null);
+        FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, resultDescFileName);
+        OutputStream os = fileItem.getOutputStream();
+        Result<UploadImgResultDTO> uploadResult = null;
+        try {
+            workbook.write(os);
+            uploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem));
+        } catch (Exception e) {
+            String errormsg = ExceptionUtils.getErrorStackTrace(e);
+            log.error("上传错误描述文件:{}", errormsg);
+        } finally {
+            try {
+                os.close();
+            } catch (IOException e) {
+                String errormsg = ExceptionUtils.getErrorStackTrace(e);
+                log.error("上传错误描述文件关闭输出流:{}", errormsg);
+            }
+            try {
+                fileItem.delete();
+            } catch (Exception e) {
+                String errormsg = ExceptionUtils.getErrorStackTrace(e);
+                log.error("上传错误描述文件删除临时文件:{}", errormsg);
+            }
+        }
+
+        if (uploadResult == null || !uploadResult.success()) {
+            log.error("调用OSS上传结果描述文件失败");
+            return null;
+        }
+        return uploadResult.getData().getUrl();
+    }
+
+    @Override
+    public List<MapInfoResultDTO> getMapInfoList(MapInfoFormDTO formDTO) {
+        List<MapInfoResultDTO> list = baseDao.getMapInfoList(formDTO);
+        return list;
+    }
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
index 0d25761062..e854bb493d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
@@ -6,10 +6,12 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.EasyExcelFactory;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.bean.ResiImportCategoryData;
 import com.epmet.bean.ResiImportChangedData;
 import com.epmet.bean.ResiImportResiCategoryChangedCache;
+import com.epmet.commons.rocketmq.messages.PartymemberSyncMQMsg;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.constant.StrConstant;
@@ -27,30 +29,23 @@ import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
-import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.EpmetRequestHolder;
-import com.epmet.commons.tools.utils.FileUtils;
-import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.*;
+import com.epmet.constant.SystemMessageType;
 import com.epmet.constants.ImportTaskConstants;
-import com.epmet.dao.IcResiUserDao;
-import com.epmet.dao.IcUserChangeDetailedDao;
-import com.epmet.dao.IcUserChangeRecordDao;
-import com.epmet.dao.IcUserTransferRecordDao;
+import com.epmet.dao.*;
 import com.epmet.dto.*;
 import com.epmet.dto.form.GridOptionFormDTO;
 import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.form.IcResiUserOrgMsgFormDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
 import com.epmet.dto.result.*;
-import com.epmet.entity.IcResiUserEntity;
-import com.epmet.entity.IcUserChangeDetailedEntity;
-import com.epmet.entity.IcUserChangeRecordEntity;
-import com.epmet.entity.IcUserTransferRecordEntity;
+import com.epmet.entity.*;
 import com.epmet.enums.IcResiUserTableEnum;
 import com.epmet.excel.handler.IcResiImportDynamicExcelListener;
 import com.epmet.excel.handler.IcResiVirtualSheetImportListener;
 import com.epmet.feign.*;
 import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
+import com.epmet.send.SendMqMsgUtil;
 import com.epmet.service.IcResiUserImportService;
 import com.epmet.service.UserService;
 import com.google.common.cache.Cache;
@@ -172,6 +167,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
     private OssFeignClient ossFeignClient;
     @Autowired
     private ResiPartyMemberOpenFeignClient partyMemberOpenFeignClient;
+    @Autowired
+    private IcVolunteerDao icVolunteerDao;
+    @Autowired
+    private IcPartyMemberDao icPartyMemberDao;
+    @Autowired
+    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
     /**
      * 子表中不需要的列。因为主表中需要身份证号，网格等信息，但子表中不需要这些列必填，只要有身份证号即可，因此字表判断的时候需要排除这些列
@@ -820,6 +821,68 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         }
     }
 
+    /**
+     * 使用mq同步党员信息
+     */
+    public void syncPartyMemberInfo(List<String> idCards) {
+        String customerId = EpmetRequestHolder.getLoginUserCustomerId();
+        IcResiUserServiceImpl resiService = SpringContextUtils.getBean(IcResiUserServiceImpl.class);
+
+        PartymemberSyncMQMsg mqMsgBody = new PartymemberSyncMQMsg();
+        String loginUserCustomerId = EpmetRequestHolder.getLoginUserCustomerId();
+        idCards.stream().forEach(idCard -> {
+            // 检查用户是否存在
+            Map<String, String> existResiInfoMap = icResiUserDao.selectResiInfoMap(loginUserCustomerId, idCard, null);
+            if (existResiInfoMap == null || existResiInfoMap.size() == 0) {
+                return ;
+            }
+            String resiId = existResiInfoMap.get("ID");
+
+            // 查询党员信息
+            LambdaQueryWrapper<IcPartyMemberEntity> partymemberQuery = new LambdaQueryWrapper<IcPartyMemberEntity>().eq(IcPartyMemberEntity::getIcResiUser, resiId);
+            IcPartyMemberEntity partymemberEntity = icPartyMemberDao.selectOne(partymemberQuery);
+
+
+            String agencyId = existResiInfoMap.get("AGENCY_ID");
+            AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(agencyId);
+            if (agencyInfo == null) {
+                log.error("【居民信息导入】党员信息-根据组织id未找到组织信息。组织ID:{}", agencyId);
+                return ;
+            }
+            String houseAddress = resiService.getHouseAddress4PartymemberInfo(customerId, existResiInfoMap.get("GRID_ID"), existResiInfoMap.get("HOME_ID"));
+
+            PartymemberSyncMQMsg.PartyMemberSyncForm partymemberInfo = new PartymemberSyncMQMsg.PartyMemberSyncForm();
+            partymemberInfo.setCustomerId(existResiInfoMap.get("CUSTOMER_ID"));
+            partymemberInfo.setAgencyId(agencyId);
+            partymemberInfo.setAgencyPids(agencyInfo.getPids());
+            partymemberInfo.setIcResiUser(resiId);
+            partymemberInfo.setName(existResiInfoMap.get("NAME"));
+            partymemberInfo.setIdCard(existResiInfoMap.get("ID_CARD"));
+            partymemberInfo.setMobile(existResiInfoMap.get("MOBILE"));
+            partymemberInfo.setAddress(houseAddress);
+
+            partymemberInfo.setRdsj(partymemberEntity.getRdsj());
+            partymemberInfo.setSszb(partymemberEntity.getSszb());
+            partymemberInfo.setIsLd(partymemberEntity.getIsLd());
+            partymemberInfo.setLdzh(partymemberEntity.getLdzh());
+            partymemberInfo.setPartyZw(partymemberEntity.getPartyZw());
+            partymemberInfo.setIsTx(partymemberEntity.getIsTx());
+            partymemberInfo.setIsDyzxh(partymemberEntity.getIsDyzxh());
+
+            // 志愿者信息
+            LambdaQueryWrapper<IcVolunteerEntity> query = new LambdaQueryWrapper<>();
+            query.eq(IcVolunteerEntity::getIcResiUser, resiId);
+            List<String> volunteerCategories = icVolunteerDao.selectList(query).stream().map(v -> v.getVolunteerCategory()).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(volunteerCategories)) {
+                partymemberInfo.setVolunteerCategory(String.join(",", volunteerCategories));
+            }
+
+            mqMsgBody.getPartymemberList().add(partymemberInfo);
+        });
+
+        SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendRocketMqMsg(SystemMessageType.PARTYMEMBER_RESI_IMPORT, mqMsgBody);
+    }
+
     /**
      * 去掉多余的列
      * @param originColumnAndValues
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index 5a75d0f774..6e5ff6e382 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -314,23 +314,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     partyMemberDTO.setName(map.get("NAME"));
                     partyMemberDTO.setIdCard(map.get("ID_CARD"));
                     partyMemberDTO.setMobile(map.get("MOBILE"));
-                    //查询网格信息
-                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(map.get("GRID_ID"));
-                    //查询房屋信息
-                    HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(tokenDto.getCustomerId(), map.get("HOME_ID"));
-                    if (null != gridInfo && null != houseInfo) {
-                        String address;
-                        if (StringUtils.isNotBlank(gridInfo.getAllParentName())) {
-                            address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath())
-                                    .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
-                                    .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
-                        } else {
-                            address = gridInfo.getGridNamePath()
-                                    .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
-                                    .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
-                        }
-                        partyMemberDTO.setAddress(address);
-                    }
+
+                    String houseAddress = getHouseAddress4PartymemberInfo(tokenDto.getCustomerId(), map.get("GRID_ID"), map.get("HOME_ID"));
+                    partyMemberDTO.setAddress(houseAddress);
                 }
                 //2022.05.18 end zhaoqf
             }
@@ -380,6 +366,34 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     }
 
+    /**
+     * 为党员信息生成家庭地址
+     * @param customerId
+     * @param gridId
+     * @param homeId
+     * @return
+     */
+    public String getHouseAddress4PartymemberInfo(String customerId, String gridId, String homeId) {
+        //查询网格信息
+        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(gridId);
+        //查询房屋信息
+        HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(customerId, homeId);
+        if (null != gridInfo && null != houseInfo) {
+            String address;
+            if (StringUtils.isNotBlank(gridInfo.getAllParentName())) {
+                address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath())
+                        .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
+                        .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
+            } else {
+                address = gridInfo.getGridNamePath()
+                        .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
+                        .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
+            }
+            return address;
+        }
+        return null;
+    }
+
     /**
      * 3.变更记录表和变更记录明细表新增数据
      *
@@ -2887,4 +2901,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         }
         entity.setPids(agencyPath);
     }
+
+    @Override
+    public List<SendPointNoticeFormDTO.UserListBean> getUserListByCommunityId(String communityId) {
+        List<SendPointNoticeResultDTO> userList = baseDao.getUserListByCommunityId(communityId);
+        List<SendPointNoticeFormDTO.UserListBean> list = ConvertUtils.sourceToTarget(userList,SendPointNoticeFormDTO.UserListBean.class);
+        return list;
+    }
 }
diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.56__user_point_create.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.56__user_point_create.sql
new file mode 100644
index 0000000000..cfe2b30fa2
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.56__user_point_create.sql
@@ -0,0 +1,48 @@
+CREATE TABLE `ic_point_nucleic_monitoring` (
+  `ID` varchar(64) NOT NULL COMMENT 'ID',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+  `ORG_ID` varchar(64) NOT NULL COMMENT '所属组织ID',
+  `ORG_NAME` varchar(255) NOT NULL COMMENT '所属组织名称',
+  `PID` varchar(64) NOT NULL COMMENT '组织ID上级',
+  `PIDS` varchar(255) NOT NULL COMMENT '组织ID所有上级',
+  `NAME` varchar(255) NOT NULL COMMENT '核酸监测点名称',
+  `SERVE_TIME` varchar(64) NOT NULL COMMENT '服务时间',
+  `MOBILE` varchar(11) NOT NULL COMMENT '咨询电话',
+  `ADDRESS` varchar(255) NOT NULL COMMENT '监测点地址',
+  `LONGITUDE` varchar(64) DEFAULT NULL COMMENT '经度',
+  `LATITUDE` varchar(64) DEFAULT NULL COMMENT '纬度',
+  `DEL_FLAG` int(11) NOT NULL,
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='核酸监测点';
+
+CREATE TABLE `ic_point_vaccines_inoculation` (
+  `ID` varchar(64) NOT NULL COMMENT 'ID',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+  `ORG_ID` varchar(64) DEFAULT NULL COMMENT '所属组织ID',
+  `ORG_NAME` varchar(255) DEFAULT NULL COMMENT '所属组织名称',
+  `PID` varchar(64) DEFAULT NULL COMMENT '组织ID上级',
+  `PIDS` varchar(255) DEFAULT NULL COMMENT '组织ID所有上级',
+  `NAME` varchar(255) NOT NULL COMMENT '疫苗接种点名称',
+  `INOCULATION_DATE` varchar(64) NOT NULL COMMENT '接种日期',
+  `MO_START_TIME` varchar(64) NOT NULL COMMENT '接种上午开始时间',
+  `MO_END_TIME` varchar(64) NOT NULL COMMENT '接种上午结束时间',
+  `AF_START_TIME` varchar(64) NOT NULL COMMENT '接种下午开始时间',
+  `AF_END_TIME` varchar(64) NOT NULL COMMENT '接种下午结束时间',
+  `NO_AVAILABLE_VACCINES` char(1) NOT NULL COMMENT '暂无疫苗（1：是；2：否）',
+  `MOBILE` varchar(11) NOT NULL COMMENT '咨询电话',
+  `ADDRESS` varchar(255) NOT NULL COMMENT '接种点地址',
+  `LONGITUDE` varchar(64) DEFAULT NULL COMMENT '经度',
+  `LATITUDE` varchar(64) DEFAULT NULL COMMENT '纬度',
+  `DEL_FLAG` int(11) NOT NULL,
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='疫苗接种点';
diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.57__user_point_update.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.57__user_point_update.sql
new file mode 100644
index 0000000000..ca5e3dc32b
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.57__user_point_update.sql
@@ -0,0 +1,2 @@
+ALTER TABLE ic_point_nucleic_monitoring MODIFY COLUMN MOBILE  varchar(50) NOT NULL COMMENT '咨询电话';
+ALTER TABLE ic_point_vaccines_inoculation MODIFY COLUMN MOBILE  varchar(50) NOT NULL COMMENT '咨询电话';
diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.58__user_point_update_new.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.58__user_point_update_new.sql
new file mode 100644
index 0000000000..69ba7d0255
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.58__user_point_update_new.sql
@@ -0,0 +1,5 @@
+ALTER TABLE ic_point_vaccines_inoculation MODIFY COLUMN INOCULATION_DATE  varchar(64) COMMENT '接种日期';
+ALTER TABLE ic_point_vaccines_inoculation MODIFY COLUMN MO_START_TIME  varchar(64) COMMENT '接种上午开始时间';
+ALTER TABLE ic_point_vaccines_inoculation MODIFY COLUMN MO_END_TIME  varchar(64) COMMENT '接种上午结束时间';
+ALTER TABLE ic_point_vaccines_inoculation MODIFY COLUMN AF_START_TIME  varchar(64) COMMENT '接种下午开始时间';
+ALTER TABLE ic_point_vaccines_inoculation MODIFY COLUMN AF_END_TIME  varchar(64) COMMENT '接种下午结束时间';
diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_point_nucleic_monitoring.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_point_nucleic_monitoring.xlsx
new file mode 100644
index 0000000000..bec686be9d
Binary files /dev/null and b/epmet-user/epmet-user-server/src/main/resources/excel/ic_point_nucleic_monitoring.xlsx differ
diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_point_vaccines_inoculation.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_point_vaccines_inoculation.xlsx
new file mode 100644
index 0000000000..3901ecd5f4
Binary files /dev/null and b/epmet-user/epmet-user-server/src/main/resources/excel/ic_point_vaccines_inoculation.xlsx differ
diff --git a/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml b/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml
index c2a982739d..41f567fccf 100644
--- a/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="logback-base.xml"/>
 
     <property name="log.path" value="logs/epmetuser"/>
 
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml
new file mode 100644
index 0000000000..f57e3129bd
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml
@@ -0,0 +1,141 @@
+<?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.epmet.dao.IcPointNucleicMonitoringDao">
+
+    <resultMap type="com.epmet.entity.IcPointNucleicMonitoringEntity" id="icPointNucleicMonitoringMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="orgId" column="ORG_ID"/>
+        <result property="orgName" column="ORG_NAME"/>
+        <result property="pid" column="PID"/>
+        <result property="pids" column="PIDS"/>
+        <result property="name" column="NAME"/>
+        <result property="serveTime" column="SERVE_TIME"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="address" column="ADDRESS"/>
+        <result property="longitude" column="LONGITUDE"/>
+        <result property="latitude" column="LATITUDE"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <select id="getAllAddressName" resultType="java.lang.String">
+        select
+        NAME
+        from ic_point_nucleic_monitoring
+        where DEL_FLAG = 0
+        and CUSTOMER_ID = #{customerId}
+    </select>
+
+    <select id="getAllAddressNameNoCurrent" resultType="java.lang.String">
+        select
+        NAME
+        from ic_point_nucleic_monitoring
+        where DEL_FLAG = 0
+        and ID != #{id}
+        and CUSTOMER_ID = #{customerId}
+    </select>
+
+    <select id="getPhrasePage" resultType="com.epmet.dto.IcPointNucleicMonitoringDTO">
+        select
+        ID,
+        CUSTOMER_ID,
+        ORG_ID,
+        ORG_NAME,
+        PID,
+        PIDS,
+        NAME,
+        SERVE_TIME,
+        MOBILE,
+        ADDRESS,
+        LONGITUDE,
+        LATITUDE,
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        from ic_point_nucleic_monitoring
+        where DEL_FLAG = 0
+        and CUSTOMER_ID = #{customerId}
+        <if test="name != null and name != ''">
+            and NAME like CONCAT('%' ,#{name}, '%')
+        </if>
+        <if test="mobile != null and mobile != ''">
+            and MOBILE like CONCAT('%', #{mobile}, '%')
+        </if>
+        <if test="orgId != null and orgId != ''">
+            and (ORG_ID = #{orgId} or PIDS like CONCAT('%',#{orgId},'%'))
+        </if>
+        order by CREATED_TIME desc
+    </select>
+
+    <select id="getPhrasePageByDTO" resultType="com.epmet.dto.IcPointNucleicMonitoringDTO" parameterType="com.epmet.dto.form.PointHSYMFormDTO">
+        select
+        ID,
+        CUSTOMER_ID,
+        ORG_ID,
+        ORG_NAME,
+        PID,
+        PIDS,
+        NAME,
+        SERVE_TIME,
+        MOBILE,
+        ADDRESS,
+        LONGITUDE,
+        LATITUDE,
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        from ic_point_nucleic_monitoring
+        where DEL_FLAG = 0
+        <if test="name != null and name != ''">
+            and NAME like CONCAT('%' ,#{name}, '%')
+        </if>
+        <if test="mobile != null and mobile != ''">
+            and MOBILE like CONCAT('%', #{mobile}, '%')
+        </if>
+        <if test="orgId != null and orgId != ''">
+            and (ORG_ID = #{orgId} or PIDS like CONCAT('%',#{orgId},'%'))
+        </if>
+        order by CREATED_TIME desc
+    </select>
+
+    <select id="getMapInfoList" parameterType="com.epmet.dto.form.MapInfoFormDTO"
+            resultType="com.epmet.dto.result.MapInfoResultDTO">
+        select
+        UNIX_TIMESTAMP(now()) + FLOOR( 100 + RAND() * 1000) as markerId,
+        NAME,
+        round((st_distance_sphere(point(#{longitude},#{latitude}), point(LONGITUDE, LATITUDE))) / 1000 ,1) as km,
+        (case when round((st_distance_sphere(point(#{longitude},#{latitude}), point(LONGITUDE, LATITUDE))) / 1000 ,1) &lt;= 1 then '1'
+        when round((st_distance_sphere(point(#{longitude},#{latitude}), point(LONGITUDE, LATITUDE))) / 1000 ,1) &lt;= 3 then '3'
+        when round((st_distance_sphere(point(#{longitude},#{latitude}), point(LONGITUDE, LATITUDE))) / 1000 ,1) &lt;= 5 then '5'
+        else '99' end ) as kmNum,
+        SERVE_TIME as date,
+        MOBILE,
+        ADDRESS,
+        LONGITUDE,
+        LATITUDE
+        from ic_point_nucleic_monitoring
+        where DEL_FLAG = 0
+        and CUSTOMER_ID = #{customerId}
+        <if test="name != null and name != ''">
+            and NAME like CONCAT('%' ,#{name}, '%')
+        </if>
+        and LONGITUDE is not null
+        and LATITUDE is not null
+        order by (st_distance_sphere(point(#{longitude},#{latitude}), point(LONGITUDE, LATITUDE)))
+
+    </select>
+
+
+</mapper>
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointVaccinesInoculationDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointVaccinesInoculationDao.xml
new file mode 100644
index 0000000000..1f96e06769
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointVaccinesInoculationDao.xml
@@ -0,0 +1,153 @@
+<?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.epmet.dao.IcPointVaccinesInoculationDao">
+
+    <resultMap type="com.epmet.entity.IcPointVaccinesInoculationEntity" id="icPointVaccinesInoculationMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="orgId" column="ORG_ID"/>
+        <result property="orgName" column="ORG_NAME"/>
+        <result property="pid" column="PID"/>
+        <result property="pids" column="PIDS"/>
+        <result property="name" column="NAME"/>
+        <result property="inoculationDate" column="INOCULATION_DATE"/>
+        <result property="moStartTime" column="MO_START_TIME"/>
+        <result property="moEndTime" column="MO_END_TIME"/>
+        <result property="afStartTime" column="AF_START_TIME"/>
+        <result property="afEndTime" column="AF_END_TIME"/>
+        <result property="noAvailableVaccines" column="NO_AVAILABLE_VACCINES"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="address" column="ADDRESS"/>
+        <result property="longitude" column="LONGITUDE"/>
+        <result property="latitude" column="LATITUDE"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <select id="getAllAddressName" resultType="java.lang.String">
+        select
+        NAME
+        from ic_point_vaccines_inoculation
+        where DEL_FLAG = 0
+        and CUSTOMER_ID = #{customerId}
+    </select>
+
+    <select id="getAllAddressNameNoCurrent" resultType="java.lang.String">
+        select
+        NAME
+        from ic_point_vaccines_inoculation
+        where DEL_FLAG = 0
+        and ID != #{id}
+        and CUSTOMER_ID = #{customerId}
+    </select>
+
+    <select id="getPhrasePage" resultType="com.epmet.dto.IcPointVaccinesInoculationDTO">
+        select
+        ID,
+        CUSTOMER_ID,
+        ORG_ID,
+        ORG_NAME,
+        PID,
+        PIDS,
+        NAME,
+        INOCULATION_DATE,
+        MO_START_TIME,
+        MO_END_TIME,
+        AF_START_TIME,
+        AF_END_TIME,
+        (case NO_AVAILABLE_VACCINES when '1' then '是' when '2' then '否' else '' end ) as NO_AVAILABLE_VACCINES,
+        MOBILE,
+        ADDRESS,
+        LONGITUDE,
+        LATITUDE,
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        from ic_point_vaccines_inoculation
+        where DEL_FLAG = 0
+        and CUSTOMER_ID = #{customerId}
+        <if test="name != null and name != ''">
+            and NAME like CONCAT('%' ,#{name}, '%')
+        </if>
+        <if test="mobile != null and mobile != ''">
+            and MOBILE like CONCAT('%', #{mobile}, '%')
+        </if>
+        order by CREATED_TIME desc
+    </select>
+
+    <select id="getPhrasePageByDTO" resultType="com.epmet.dto.IcPointVaccinesInoculationDTO" parameterType="com.epmet.dto.form.PointHSYMFormDTO">
+        select
+        ID,
+        CUSTOMER_ID,
+        ORG_ID,
+        ORG_NAME,
+        PID,
+        PIDS,
+        NAME,
+        INOCULATION_DATE,
+        MO_START_TIME,
+        MO_END_TIME,
+        AF_START_TIME,
+        AF_END_TIME,
+        (case NO_AVAILABLE_VACCINES when '1' then '是' when '2' then '否' else '' end ) as NO_AVAILABLE_VACCINES,
+        MOBILE,
+        ADDRESS,
+        LONGITUDE,
+        LATITUDE,
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        from ic_point_vaccines_inoculation
+        where DEL_FLAG = 0
+        <if test="name != null and name != ''">
+            and NAME like CONCAT('%' ,#{name}, '%')
+        </if>
+        <if test="mobile != null and mobile != ''">
+            and MOBILE like CONCAT('%', #{mobile}, '%')
+        </if>
+        order by CREATED_TIME desc
+    </select>
+
+    <select id="getMapInfoList" parameterType="com.epmet.dto.form.MapInfoFormDTO"
+            resultType="com.epmet.dto.result.MapInfoResultDTO">
+        select
+        UNIX_TIMESTAMP(now()) + FLOOR( 100 + RAND() * 1000) as markerId,
+        NAME,
+        round((st_distance_sphere(point(#{longitude},#{latitude}), point(LONGITUDE, LATITUDE))) / 1000 ,1) as km,
+        (case when round((st_distance_sphere(point(#{longitude},#{latitude}), point(LONGITUDE, LATITUDE))) / 1000 ,1) &lt;= 1 then '1'
+        when round((st_distance_sphere(point(#{longitude},#{latitude}), point(LONGITUDE, LATITUDE))) / 1000 ,1) &lt;= 3 then '3'
+        when round((st_distance_sphere(point(#{longitude},#{latitude}), point(LONGITUDE, LATITUDE))) / 1000 ,1) &lt;= 5 then '5'
+        else '99' end ) as kmNum,
+        INOCULATION_DATE as date,
+        CONCAT(MO_START_TIME,'-',MO_END_TIME) as moTime,
+        CONCAT(AF_START_TIME,'-',AF_END_TIME) as afTime,
+        NO_AVAILABLE_VACCINES,
+        MOBILE,
+        ADDRESS,
+        LONGITUDE,
+        LATITUDE
+        from ic_point_vaccines_inoculation
+        where DEL_FLAG = 0
+        and CUSTOMER_ID = #{customerId}
+        <if test="name != null and name != ''">
+            and NAME like CONCAT('%' ,#{name}, '%')
+        </if>
+        and LONGITUDE is not null
+        and LATITUDE is not null
+        order by (st_distance_sphere(point(#{longitude},#{latitude}), point(LONGITUDE, LATITUDE)))
+
+    </select>
+
+
+</mapper>
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index b693502628..9105d1d48b 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -1178,4 +1178,18 @@
            id = #{icResiUserId}
         </foreach>
     </select>
+
+    <select id="getUserListByCommunityId" resultType="com.epmet.dto.result.SendPointNoticeResultDTO">
+        select
+            ru.ID_CARD,
+            ru.MOBILE,
+            ub.USER_ID
+        from ic_resi_user ru
+        left join user_base_info ub on ub.ID_NUM = ru.ID_CARD and ub.DEL_FLAG = 0
+        where ru.DEL_FLAG = 0
+        and ub.USER_ID is not null
+        and ru.MOBILE is not null
+        and ru.MOBILE != ''
+        and ru.PIDS like CONCAT('%',#{communityId},'%')
+    </select>
 </mapper>