From acbfda5c40fd081c5bafdc2a4ed4451af64c5e11 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Mon, 13 Sep 2021 16:28:00 +0800
Subject: [PATCH 01/68] =?UTF-8?q?gateway=E6=B7=BB=E5=8A=A0tduck=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-gateway/pom.xml                          |  3 +++
 epmet-gateway/src/main/resources/bootstrap.yml | 11 ++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index 1e9334b0b0..999e3a4aed 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -364,6 +364,9 @@
                 <!--宣传服务-->
                 <gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>
                 <!--<gateway.routes.epmet-openapi-adv-server.url>http://localhost:8115</gateway.routes.epmet-openapi-adv-server.url>-->
+                <!--问卷服务-->
+               <!-- <gateway.routes.tduck-api.url>lb://tduck-api</gateway.routes.tduck-api.url>-->
+                <gateway.routes.tduck-api.url>http://localhost:8116</gateway.routes.tduck-api.url>
                 <!--钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml
index 4f65034c7d..ca78ab64aa 100644
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/epmet-gateway/src/main/resources/bootstrap.yml
@@ -336,12 +336,20 @@ spring:
         # 宣传服务
         - id: epmet-openapi-adv-server
           uri: @gateway.routes.epmet-openapi-adv-server.url@
-          order: 35
+          order: 36
           predicates:
             - Path=${server.servlet.context-path}/adv/**
           filters:
             - StripPrefix=1
             - CpAuth=true
+        - id: tduck-api
+          uri: @gateway.routes.tduck-api.url@
+          order: 37
+          predicates:
+            - Path=${server.servlet.context-path}/tduck-api/**
+          filters:
+            - StripPrefix=1
+            - CpAuth=true
     nacos:
       discovery:
         server-addr: @nacos.server-addr@
@@ -472,6 +480,7 @@ epmet:
     - /epmetuser/customerstaff/customerlist
     - /gov/project/project/platformcallback
     - /oper/customize/customerstartpage/homestartpage
+    - /tduck-api/**
 
   # 外部应用认证，使用AccessToken等头进行认证
   externalOpenUrls:

From 5c558320d7e51c4f2317a1d778820feb0ef3e053 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 14 Sep 2021 16:21:22 +0800
Subject: [PATCH 02/68] =?UTF-8?q?gateway=E6=B7=BB=E5=8A=A0tduck=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-gateway/pom.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index 999e3a4aed..ee2c68962d 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -233,6 +233,9 @@
                 <!--宣传服务-->
                 <gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>
                 <!--<gateway.routes.epmet-ext-server.url>lb://127.0.0.1:8115</gateway.routes.epmet-ext-server.url>-->
+                <!--问卷服务-->
+                <gateway.routes.tduck-api.url>lb://tduck-api</gateway.routes.tduck-api.url>
+                <!--<gateway.routes.tduck-api.url>http://localhost:8116</gateway.routes.tduck-api.url>-->
                 <!--钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
@@ -365,8 +368,8 @@
                 <gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>
                 <!--<gateway.routes.epmet-openapi-adv-server.url>http://localhost:8115</gateway.routes.epmet-openapi-adv-server.url>-->
                 <!--问卷服务-->
-               <!-- <gateway.routes.tduck-api.url>lb://tduck-api</gateway.routes.tduck-api.url>-->
-                <gateway.routes.tduck-api.url>http://localhost:8116</gateway.routes.tduck-api.url>
+                <gateway.routes.tduck-api.url>lb://tduck-api</gateway.routes.tduck-api.url>
+                <!--<gateway.routes.tduck-api.url>http://localhost:8116</gateway.routes.tduck-api.url>-->
                 <!--钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
@@ -464,6 +467,8 @@
                 <gateway.routes.epmet-ext-server.url>lb://epmet-ext-server</gateway.routes.epmet-ext-server.url>
                 <!-- 35、多数据源服务 -->
                 <gateway.routes.data-aggregator-server.url>lb://data-aggregator-server</gateway.routes.data-aggregator-server.url>
+                <!--问卷服务-->
+                <gateway.routes.tduck-api.url>lb://tduck-api</gateway.routes.tduck-api.url>
 
                 <!--宣传服务-->
                 <gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>
@@ -564,6 +569,8 @@
 
                 <!--宣传服务-->
                 <gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>
+                <!--问卷服务-->
+                <gateway.routes.tduck-api.url>lb://tduck-api</gateway.routes.tduck-api.url>
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c</dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1</dingTalk.robot.secret>

From b5118a47f805690d5cfc67ffd9468e336715135d Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 15 Sep 2021 14:36:08 +0800
Subject: [PATCH 03/68] =?UTF-8?q?data-agg=E6=B7=BB=E5=8A=A0epmet-tduck?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-aggregator-server/pom.xml            | 28 +++++++++++++++++++
 .../src/main/resources/bootstrap.yml          |  5 ++++
 2 files changed, 33 insertions(+)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
index a08ce28aea..b9835924ff 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
@@ -200,6 +200,13 @@
                 <datasource.druid.epmetmessage.username>epmet_message_user</datasource.druid.epmetmessage.username>
                 <datasource.druid.epmetmessage.password>EpmEt-db-UsEr</datasource.druid.epmetmessage.password>
 
+                <!-- 问卷调查 -->
+                <datasource.druid.epmettduck.url>
+                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_tduck?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.epmettduck.url>
+                <datasource.druid.epmettduck.username>epmet_tduck_user</datasource.druid.epmettduck.username>
+                <datasource.druid.epmettduck.password>EpmEt-db-UsEr</datasource.druid.epmettduck.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -307,6 +314,13 @@
                 <datasource.druid.epmetmessage.username>epmet_message_user</datasource.druid.epmetmessage.username>
                 <datasource.druid.epmetmessage.password>EpmEt-db-UsEr</datasource.druid.epmetmessage.password>
 
+                <!-- 问卷调查 -->
+                <datasource.druid.epmettduck.url>
+                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_tduck?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.epmettduck.url>
+                <datasource.druid.epmettduck.username>epmet_tduck_user</datasource.druid.epmettduck.username>
+                <datasource.druid.epmettduck.password>EpmEt-db-UsEr</datasource.druid.epmettduck.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -414,6 +428,13 @@
                 <datasource.druid.epmetmessage.username>epmet</datasource.druid.epmetmessage.username>
                 <datasource.druid.epmetmessage.password>elink@833066</datasource.druid.epmetmessage.password>
 
+                <!-- 问卷调查 -->
+                <datasource.druid.epmettduck.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_tduck?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.epmettduck.url>
+                <datasource.druid.epmettduck.username>epmet</datasource.druid.epmettduck.username>
+                <datasource.druid.epmettduck.password>elink@833066</datasource.druid.epmettduck.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
@@ -521,6 +542,13 @@
                 <datasource.druid.epmetmessage.username>epmet_message_user</datasource.druid.epmetmessage.username>
                 <datasource.druid.epmetmessage.password>EpmEt-db-UsEr</datasource.druid.epmetmessage.password>
 
+                <!-- 问卷调查 -->
+                <datasource.druid.epmettduck.url>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_tduck?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.epmettduck.url>
+                <datasource.druid.epmettduck.username>epmet_tduck</datasource.druid.epmettduck.username>
+                <datasource.druid.epmettduck.password>EpmEt-db-UsEr</datasource.druid.epmettduck.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
index f84136b69a..102666f3d7 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
@@ -149,6 +149,11 @@ dynamic:
       url: @datasource.druid.epmetmessage.url@
       username: @datasource.druid.epmetmessage.username@
       password: @datasource.druid.epmetmessage.password@
+    epmettduck:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: @datasource.druid.epmettduck.url@
+      username: @datasource.druid.epmettduck.username@
+      password: @datasource.druid.epmettduck.password@
 feign:
   hystrix:
     enabled: true

From f8d4272389d2600c28d7e459700bc3b39ab8eadf Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 15 Sep 2021 15:44:48 +0800
Subject: [PATCH 04/68] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/epmettduck/AcUserAuthorizeDTO.java    |  64 +++++++
 .../dataaggre/dto/epmettduck/AcUserDTO.java   | 106 +++++++++++
 .../PrProjectTemplateCategoryDTO.java         |  66 +++++++
 .../dto/epmettduck/PrProjectTemplateDTO.java  |  91 ++++++++++
 .../epmettduck/PrProjectTemplateItemDTO.java  | 121 +++++++++++++
 .../dto/epmettduck/PrProjectThemeDTO.java     |  82 +++++++++
 .../dto/epmettduck/PrPublishRangeDTO.java     |  81 +++++++++
 .../dto/epmettduck/PrResultExtDTO.java        |  86 +++++++++
 .../dto/epmettduck/PrUserProjectDTO.java      | 106 +++++++++++
 .../dto/epmettduck/PrUserProjectItemDTO.java  | 121 +++++++++++++
 .../dto/epmettduck/PrUserProjectLogicDTO.java |  76 ++++++++
 .../epmettduck/PrUserProjectResultDTO.java    | 121 +++++++++++++
 .../epmettduck/PrUserProjectSettingDTO.java   | 166 +++++++++++++++++
 .../dto/epmettduck/PrUserProjectThemeDTO.java | 106 +++++++++++
 .../dto/epmettduck/PrVistRecordDTO.java       |  76 ++++++++
 .../dataaggre/dto/epmettduck/WxMpUserDTO.java | 106 +++++++++++
 .../controller/EpmetTDuckController.java      |  14 ++
 .../dao/epmettduck/AcUserAuthorizeDao.java    |  16 ++
 .../dataaggre/dao/epmettduck/AcUserDao.java   |  16 ++
 .../PrProjectTemplateCategoryDao.java         |  16 ++
 .../dao/epmettduck/PrProjectTemplateDao.java  |  16 ++
 .../epmettduck/PrProjectTemplateItemDao.java  |  16 ++
 .../dao/epmettduck/PrProjectThemeDao.java     |  16 ++
 .../dao/epmettduck/PrPublishRangeDao.java     |  16 ++
 .../dao/epmettduck/PrResultExtDao.java        |  16 ++
 .../dao/epmettduck/PrUserProjectDao.java      |  16 ++
 .../dao/epmettduck/PrUserProjectItemDao.java  |  16 ++
 .../dao/epmettduck/PrUserProjectLogicDao.java |  16 ++
 .../epmettduck/PrUserProjectResultDao.java    |  16 ++
 .../epmettduck/PrUserProjectSettingDao.java   |  16 ++
 .../dao/epmettduck/PrUserProjectThemeDao.java |  16 ++
 .../dao/epmettduck/PrVistRecordDao.java       |  16 ++
 .../dataaggre/dao/epmettduck/WxMpUserDao.java |  16 ++
 .../epmettduck/AcUserAuthorizeEntity.java     |  86 +++++++++
 .../entity/epmettduck/AcUserEntity.java       | 111 ++++++++++++
 .../PrProjectTemplateCategoryEntity.java      |  71 ++++++++
 .../epmettduck/PrProjectTemplateEntity.java   |  96 ++++++++++
 .../PrProjectTemplateItemEntity.java          | 126 +++++++++++++
 .../epmettduck/PrProjectThemeEntity.java      |  87 +++++++++
 .../epmettduck/PrPublishRangeEntity.java      |  86 +++++++++
 .../entity/epmettduck/PrResultExtEntity.java  |  91 ++++++++++
 .../epmettduck/PrUserProjectEntity.java       | 111 ++++++++++++
 .../epmettduck/PrUserProjectItemEntity.java   | 126 +++++++++++++
 .../epmettduck/PrUserProjectLogicEntity.java  |  81 +++++++++
 .../epmettduck/PrUserProjectResultEntity.java | 126 +++++++++++++
 .../PrUserProjectSettingEntity.java           | 171 ++++++++++++++++++
 .../epmettduck/PrUserProjectThemeEntity.java  | 111 ++++++++++++
 .../entity/epmettduck/PrVistRecordEntity.java |  81 +++++++++
 .../entity/epmettduck/WxMpUserEntity.java     | 111 ++++++++++++
 .../epmettduck/AcUserAuthorizeService.java    |  78 ++++++++
 .../service/epmettduck/AcUserService.java     |  78 ++++++++
 .../PrProjectTemplateCategoryService.java     |  14 ++
 .../PrProjectTemplateItemService.java         |  95 ++++++++++
 .../epmettduck/PrProjectTemplateService.java  |  95 ++++++++++
 .../epmettduck/PrProjectThemeService.java     |  95 ++++++++++
 .../epmettduck/PrPublishRangeService.java     |  95 ++++++++++
 .../epmettduck/PrResultExtService.java        |  95 ++++++++++
 .../epmettduck/PrUserProjectItemService.java  |  95 ++++++++++
 .../epmettduck/PrUserProjectLogicService.java |  95 ++++++++++
 .../PrUserProjectResultService.java           |  95 ++++++++++
 .../epmettduck/PrUserProjectService.java      |  95 ++++++++++
 .../PrUserProjectSettingService.java          |  78 ++++++++
 .../epmettduck/PrUserProjectThemeService.java |  95 ++++++++++
 .../epmettduck/PrVistRecordService.java       |  95 ++++++++++
 .../service/epmettduck/WxMpUserService.java   |  95 ++++++++++
 .../impl/AcUserAuthorizeServiceImpl.java      | 100 ++++++++++
 .../epmettduck/impl/AcUserServiceImpl.java    | 100 ++++++++++
 .../PrProjectTemplateCategoryServiceImpl.java |  32 ++++
 .../PrProjectTemplateItemServiceImpl.java     | 100 ++++++++++
 .../impl/PrProjectTemplateServiceImpl.java    | 100 ++++++++++
 .../impl/PrProjectThemeServiceImpl.java       | 100 ++++++++++
 .../impl/PrPublishRangeServiceImpl.java       | 100 ++++++++++
 .../impl/PrResultExtServiceImpl.java          | 100 ++++++++++
 .../impl/PrUserProjectItemServiceImpl.java    | 100 ++++++++++
 .../impl/PrUserProjectLogicServiceImpl.java   | 100 ++++++++++
 .../impl/PrUserProjectResultServiceImpl.java  | 100 ++++++++++
 .../impl/PrUserProjectServiceImpl.java        | 100 ++++++++++
 .../impl/PrUserProjectSettingServiceImpl.java | 100 ++++++++++
 .../impl/PrUserProjectThemeServiceImpl.java   | 100 ++++++++++
 .../impl/PrVistRecordServiceImpl.java         | 100 ++++++++++
 .../epmettduck/impl/WxMpUserServiceImpl.java  | 100 ++++++++++
 .../mapper/epmettduck/AcUserAuthorizeDao.xml  |   7 +
 .../resources/mapper/epmettduck/AcUserDao.xml |   6 +
 .../PrProjectTemplateCategoryDao.xml          |   6 +
 .../epmettduck/PrProjectTemplateDao.xml       |   6 +
 .../epmettduck/PrProjectTemplateItemDao.xml   |   6 +
 .../mapper/epmettduck/PrProjectThemeDao.xml   |   6 +
 .../mapper/epmettduck/PrPublishRangeDao.xml   |   6 +
 .../mapper/epmettduck/PrResultExtDao.xml      |   6 +
 .../mapper/epmettduck/PrUserProjectDao.xml    |   6 +
 .../epmettduck/PrUserProjectItemDao.xml       |   6 +
 .../epmettduck/PrUserProjectLogicDao.xml      |   6 +
 .../epmettduck/PrUserProjectResultDao.xml     |   6 +
 .../epmettduck/PrUserProjectSettingDao.xml    |   6 +
 .../epmettduck/PrUserProjectThemeDao.xml      |   6 +
 .../mapper/epmettduck/PrVistRecordDao.xml     |   6 +
 .../mapper/epmettduck/WxMpUserDao.xml         |   6 +
 97 files changed, 6534 insertions(+)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserAuthorizeDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateCategoryDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateItemDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectThemeDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrPublishRangeDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrResultExtDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectItemDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectLogicDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectResultDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectSettingDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectThemeDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrVistRecordDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/WxMpUserDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/AcUserAuthorizeDao.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/AcUserDao.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectTemplateCategoryDao.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectTemplateDao.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectTemplateItemDao.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectThemeDao.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrPublishRangeDao.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrResultExtDao.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectItemDao.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectLogicDao.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectResultDao.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectSettingDao.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectThemeDao.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/WxMpUserDao.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserAuthorizeEntity.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserEntity.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateCategoryEntity.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateEntity.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateItemEntity.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectThemeEntity.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrPublishRangeEntity.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrResultExtEntity.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectEntity.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectLogicEntity.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectResultEntity.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectSettingEntity.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectThemeEntity.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrVistRecordEntity.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/WxMpUserEntity.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/AcUserAuthorizeService.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/AcUserService.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrProjectTemplateCategoryService.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrProjectTemplateItemService.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrProjectTemplateService.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrProjectThemeService.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrPublishRangeService.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrResultExtService.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectItemService.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectLogicService.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectResultService.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectSettingService.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectThemeService.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrVistRecordService.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/WxMpUserService.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserAuthorizeServiceImpl.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserServiceImpl.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateCategoryServiceImpl.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateItemServiceImpl.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateServiceImpl.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectThemeServiceImpl.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrResultExtServiceImpl.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectLogicServiceImpl.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectResultServiceImpl.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectSettingServiceImpl.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectThemeServiceImpl.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/WxMpUserServiceImpl.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/AcUserAuthorizeDao.xml
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/AcUserDao.xml
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrProjectTemplateCategoryDao.xml
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrProjectTemplateDao.xml
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrProjectTemplateItemDao.xml
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrProjectThemeDao.xml
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrPublishRangeDao.xml
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrResultExtDao.xml
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectItemDao.xml
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectLogicDao.xml
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectResultDao.xml
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectSettingDao.xml
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectThemeDao.xml
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrVistRecordDao.xml
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/WxMpUserDao.xml

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserAuthorizeDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserAuthorizeDTO.java
new file mode 100644
index 0000000000..e987a07ea4
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserAuthorizeDTO.java
@@ -0,0 +1,64 @@
+package com.epmet.dataaggre.dto.epmettduck;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 第三方用户授权信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Data
+public class AcUserAuthorizeDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 第三方平台类型
+     */
+	private Integer type;
+
+    /**
+     * 平台AppId
+     */
+	private String appId;
+
+    /**
+     * 平台OpenId
+     */
+	private String openId;
+
+    /**
+     * 平台用户名
+     */
+	private String userName;
+
+    /**
+     * 用户Id
+     */
+	private String userId;
+
+    /**
+     * 平台用户信息
+     */
+	private String userInfo;
+
+    /**
+     * 
+     */
+	private Date createTime;
+
+    /**
+     * 
+     */
+	private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserDTO.java
new file mode 100644
index 0000000000..89b8157c9c
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserDTO.java
@@ -0,0 +1,106 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.epmettduck;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 用户
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Data
+public class AcUserDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 姓名
+     */
+	private String name;
+
+    /**
+     * 头像
+     */
+	private String avatar;
+
+    /**
+     * 性别0未知 1男2女
+     */
+	private Integer gender;
+
+    /**
+     * 邮箱
+     */
+	private String email;
+
+    /**
+     * 手机号
+     */
+	private String phoneNumber;
+
+    /**
+     * 密码
+     */
+	private String password;
+
+    /**
+     * 注册渠道
+     */
+	private String regChannel;
+
+    /**
+     * 最后登录渠道
+     */
+	private Integer lastLoginChannel;
+
+    /**
+     * 最后登录时间
+     */
+	private Date lastLoginTime;
+
+    /**
+     * 最后登录Ip
+     */
+	private String lastLoginIp;
+
+    /**
+     * 状态
+     */
+	private Integer deleted;
+
+    /**
+     * 
+     */
+	private Date createTime;
+
+    /**
+     * 
+     */
+	private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateCategoryDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateCategoryDTO.java
new file mode 100644
index 0000000000..476c97019b
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateCategoryDTO.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.epmettduck;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 项目模板分类
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Data
+public class PrProjectTemplateCategoryDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private Long id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 主题名称
+     */
+	private String name;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateDTO.java
new file mode 100644
index 0000000000..c5cab8a752
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateDTO.java
@@ -0,0 +1,91 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.epmettduck;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 项目表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Data
+public class PrProjectTemplateDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 模板唯一标识
+     */
+	private String key;
+
+    /**
+     * 封面图
+     */
+	private String coverImg;
+
+    /**
+     * 项目名称
+     */
+	private String name;
+
+    /**
+     * 项目描述
+     */
+	private String describe;
+
+    /**
+     * 喜欢数
+     */
+	private Integer likeCount;
+
+    /**
+     * 项目类型
+     */
+	private String categoryId;
+
+    /**
+     * 状态
+     */
+	private Integer status;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateItemDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateItemDTO.java
new file mode 100644
index 0000000000..c407e0c52d
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateItemDTO.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.epmettduck;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 项目表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Data
+public class PrProjectTemplateItemDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 项目key
+     */
+	private String projectKey;
+
+    /**
+     * 表单项Id
+     */
+	private String formItemId;
+
+    /**
+     * 表单项类型 
+     */
+	private String type;
+
+    /**
+     * 表单项标题
+     */
+	private String label;
+
+    /**
+     * 是否显示标签
+     */
+	private Integer showLabel;
+
+    /**
+     * 表单项默认值
+     */
+	private String defaultValue;
+
+    /**
+     * 是否必填
+     */
+	private Integer required;
+
+    /**
+     * 输入型提示文字
+     */
+	private String placeholder;
+
+    /**
+     * 排序
+     */
+	private Long sort;
+
+    /**
+     * 栅格宽度
+     */
+	private Integer span;
+
+    /**
+     * 扩展字段 表单项独有字段
+     */
+	private String expand;
+
+    /**
+     * 正则表达式 
+     */
+	private String regList;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+    /**
+     * 展示类型组件
+     */
+	private Integer isDisplayType;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectThemeDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectThemeDTO.java
new file mode 100644
index 0000000000..0c3168ff7e
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectThemeDTO.java
@@ -0,0 +1,82 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.epmettduck;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 项目主题外观模板
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Data
+public class PrProjectThemeDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 主题名称
+     */
+	private String name;
+
+    /**
+     * 主题风格
+
+     */
+	private String style;
+
+    /**
+     * 头部图片
+     */
+	private String headImgUrl;
+
+    /**
+     * 颜色代码
+     */
+	private String color;
+
+    /**
+     * 按钮颜色
+     */
+	private String btnsColor;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrPublishRangeDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrPublishRangeDTO.java
new file mode 100644
index 0000000000..5e5f8ef311
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrPublishRangeDTO.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.epmettduck;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 项目发布范围表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Data
+public class PrPublishRangeDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 项目key
+     */
+	private String projectKey;
+
+    /**
+     * 范围组织ids,格式与组织维度一致 冒号隔开 即选中节点的全路径id
+     */
+	private String orgIds;
+
+    /**
+     * 最后发布组织的ID
+     */
+	private String orgId;
+
+    /**
+     * 最后发布组织的类型；department，agency；grid
+     */
+	private String orgType;
+
+    /**
+     * 状态
+     */
+	private Integer deleted;
+
+    /**
+     * 
+     */
+	private Date createTime;
+
+    /**
+     * 
+     */
+	private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrResultExtDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrResultExtDTO.java
new file mode 100644
index 0000000000..85bc9f6ac9
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrResultExtDTO.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.epmettduck;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 问卷填写附属信息表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Data
+public class PrResultExtDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 姓名
+     */
+	private String userId;
+
+    /**
+     * 结果Id
+     */
+	private String resultId;
+
+    /**
+     * 工作端小程序:gov、居民端小程序:resi、运营端:oper、其他：other
+     */
+	private String userType;
+
+    /**
+     * 在哪个组织填写的
+     */
+	private String fromOrgId;
+
+    /**
+     * 组织：agency；部门：department；网格：grid
+     */
+	private String fromOrgType;
+
+    /**
+     * 状态
+     */
+	private Integer deleted;
+
+    /**
+     * 
+     */
+	private Date createTime;
+
+    /**
+     * 
+     */
+	private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectDTO.java
new file mode 100644
index 0000000000..2217879d96
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectDTO.java
@@ -0,0 +1,106 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.epmettduck;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 项目表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Data
+public class PrUserProjectDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 项目code
+     */
+	private String key;
+
+    /**
+     * 来源Id
+     */
+	private String sourceId;
+
+    /**
+     * 来源类型
+     */
+	private Integer sourceType;
+
+    /**
+     * 项目名称
+     */
+	private String name;
+
+    /**
+     * 项目描述
+     */
+	private String describe;
+
+    /**
+     * 用户ID
+     */
+	private String userId;
+
+    /**
+     * 项目类型
+     */
+	private Integer type;
+
+    /**
+     * 状态
+     */
+	private Integer status;
+
+    /**
+     * 适用于哪个端 resi：居民端用户；gov：工作端用户；运营端用户：oper
+     */
+	private String client;
+
+    /**
+     * 是否删除
+     */
+	private Integer isDeleted;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectItemDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectItemDTO.java
new file mode 100644
index 0000000000..3bd5f2eb1d
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectItemDTO.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.epmettduck;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 项目表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Data
+public class PrUserProjectItemDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 项目key
+     */
+	private String projectKey;
+
+    /**
+     * 表单项Id
+     */
+	private String formItemId;
+
+    /**
+     * 表单项类型 
+     */
+	private String type;
+
+    /**
+     * 表单项标题
+     */
+	private String label;
+
+    /**
+     * 展示类型组件
+     */
+	private Integer isDisplayType;
+
+    /**
+     * 是否显示标签
+     */
+	private Integer showLabel;
+
+    /**
+     * 表单项默认值
+     */
+	private String defaultValue;
+
+    /**
+     * 是否必填
+     */
+	private Integer required;
+
+    /**
+     * 输入型提示文字
+     */
+	private String placeholder;
+
+    /**
+     * 排序
+     */
+	private Long sort;
+
+    /**
+     * 栅格宽度
+     */
+	private Integer span;
+
+    /**
+     * 扩展字段 表单项独有字段
+     */
+	private String expand;
+
+    /**
+     * 正则表达式 
+     */
+	private String regList;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectLogicDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectLogicDTO.java
new file mode 100644
index 0000000000..d59b6617ea
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectLogicDTO.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.epmettduck;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 项目逻辑
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Data
+public class PrUserProjectLogicDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 逻辑Id
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 项目key
+     */
+	private String projectKey;
+
+    /**
+     * 问题Id
+     */
+	private String formItemId;
+
+    /**
+     * 条件选项 
+     */
+	private Integer expression;
+
+    /**
+     * 条件列表
+     */
+	private String conditionList;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectResultDTO.java
new file mode 100644
index 0000000000..fe59df25bb
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectResultDTO.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.epmettduck;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 项目表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Data
+public class PrUserProjectResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 项目key
+     */
+	private String projectKey;
+
+    /**
+     * 序号
+     */
+	private Integer serialNumber;
+
+    /**
+     * 填写结果
+     */
+	private String originalData;
+
+    /**
+     * 填写结果
+     */
+	private String processData;
+
+    /**
+     * 提交ua
+     */
+	private String submitUa;
+
+    /**
+     * 提交系统
+     */
+	private String submitOs;
+
+    /**
+     * 提交浏览器
+     */
+	private String submitBrowser;
+
+    /**
+     * 请求ip
+     */
+	private String submitRequestIp;
+
+    /**
+     * 提交地址
+     */
+	private String submitAddress;
+
+    /**
+     * 完成时间 毫秒
+     */
+	private Integer completeTime;
+
+    /**
+     * 用户Id
+     */
+	private String userId;
+
+    /**
+     * 微信openId
+     */
+	private String wxOpenId;
+
+    /**
+     * 微信用户信息
+     */
+	private String wxUserInfo;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectSettingDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectSettingDTO.java
new file mode 100644
index 0000000000..461d064f9a
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectSettingDTO.java
@@ -0,0 +1,166 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.epmettduck;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 项目表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Data
+public class PrUserProjectSettingDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 项目key
+     */
+	private String projectKey;
+
+    /**
+     * 提交提示图片
+     */
+	private String submitPromptImg;
+
+    /**
+     * 提交提示文字
+     */
+	private String submitPromptText;
+
+    /**
+     * 提交跳转连接
+     */
+	private String submitJumpUrl;
+
+    /**
+     * 公开提交结果
+     */
+	private Integer isPublicResult;
+
+    /**
+     * 只在微信填写
+     */
+	private Integer isWxWrite;
+
+    /**
+     * 
+     */
+	private Integer isWxWriteOnce;
+
+    /**
+     * 每人只能填写一次
+     */
+	private Integer isEveryoneWriteOnce;
+
+    /**
+     * 每人每天只能填写一次
+     */
+	private Integer isEveryoneDayWriteOnce;
+
+    /**
+     * 填写之后提示
+     */
+	private String writeOncePromptText;
+
+    /**
+     * 新反馈通知邮件
+     */
+	private String newWriteNotifyEmail;
+
+    /**
+     * 新反馈通知微信
+     */
+	private String newWriteNotifyWx;
+
+    /**
+     * 记录微信用户个人信息
+     */
+	private Integer isRecordWxUser;
+
+    /**
+     * 定时收集开始时间
+     */
+	private Date timedCollectionBeginTime;
+
+    /**
+     * 定时收集结束时间
+     */
+	private Date timedCollectionEndTime;
+
+    /**
+     * 定时未启动提示文字
+     */
+	private String timedNotEnabledPromptText;
+
+    /**
+     * 定时停用会提示文字
+     */
+	private String timedDeactivatePromptText;
+
+    /**
+     * 定时定量数量
+     */
+	private Integer timedQuantitativeQuantity;
+
+    /**
+     * 定时定量完成提示
+     */
+	private String timedEndPromptText;
+
+    /**
+     * 分享图片
+     */
+	private String shareImg;
+
+    /**
+     * 分享标题
+     */
+	private String shareTitle;
+
+    /**
+     * 分享描述
+     */
+	private String shareDesc;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectThemeDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectThemeDTO.java
new file mode 100644
index 0000000000..52575ded34
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectThemeDTO.java
@@ -0,0 +1,106 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.epmettduck;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 项目表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Data
+public class PrUserProjectThemeDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 项目key
+     */
+	private String projectKey;
+
+    /**
+     * 主题Id
+     */
+	private String themeId;
+
+    /**
+     * 提交按钮文字
+     */
+	private String submitBtnText;
+
+    /**
+     * logo图片
+     */
+	private String logoImg;
+
+    /**
+     * logo位置
+     */
+	private String logoPosition;
+
+    /**
+     * 背景颜色
+     */
+	private String backgroundColor;
+
+    /**
+     * 背景图片
+     */
+	private String backgroundImg;
+
+    /**
+     * 是否显示标题
+     */
+	private Integer showTitle;
+
+    /**
+     * 是否显示描述语
+     */
+	private Integer showDescribe;
+
+    /**
+     * 显示序号
+     */
+	private Integer showNumber;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrVistRecordDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrVistRecordDTO.java
new file mode 100644
index 0000000000..f35b8731a5
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrVistRecordDTO.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.epmettduck;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 用户访问问卷记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Data
+public class PrVistRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 姓名
+     */
+	private String userId;
+
+    /**
+     * 工作端小程序:gov、居民端小程序:resi、运营端:oper、其他：other
+     */
+	private String userType;
+
+    /**
+     * 项目key
+     */
+	private String projectKey;
+
+    /**
+     * 状态
+     */
+	private Integer deleted;
+
+    /**
+     * 
+     */
+	private Date createTime;
+
+    /**
+     * 
+     */
+	private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/WxMpUserDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/WxMpUserDTO.java
new file mode 100644
index 0000000000..bda847abdd
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/WxMpUserDTO.java
@@ -0,0 +1,106 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.epmettduck;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 微信公众号用户 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Data
+public class WxMpUserDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 公众号AppId
+     */
+	private String appid;
+
+    /**
+     * 昵称
+     */
+	private String nickname;
+
+    /**
+     * 性别
+     */
+	private Integer sex;
+
+    /**
+     * 头像
+     */
+	private String headImgUrl;
+
+    /**
+     * 
+     */
+	private String unionId;
+
+    /**
+     * 
+     */
+	private String openId;
+
+    /**
+     * 国家
+     */
+	private String country;
+
+    /**
+     * 省
+     */
+	private String province;
+
+    /**
+     * 城市
+     */
+	private String city;
+
+    /**
+     * 是否关注
+     */
+	private Integer isSubscribe;
+
+    /**
+     * 用户Id
+     */
+	private String userId;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
new file mode 100644
index 0000000000..746983fdef
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
@@ -0,0 +1,14 @@
+package com.epmet.dataaggre.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/15 2:43 下午
+ * @DESC
+ */
+@RestController
+@RequestMapping("questionnaire")
+public class EpmetTDuckController {
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/AcUserAuthorizeDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/AcUserAuthorizeDao.java
new file mode 100644
index 0000000000..e9ecd3404e
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/AcUserAuthorizeDao.java
@@ -0,0 +1,16 @@
+package com.epmet.dataaggre.dao.epmettduck;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.epmettduck.AcUserAuthorizeEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 第三方用户授权信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Mapper
+public interface AcUserAuthorizeDao extends BaseDao<AcUserAuthorizeEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/AcUserDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/AcUserDao.java
new file mode 100644
index 0000000000..80fc110012
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/AcUserDao.java
@@ -0,0 +1,16 @@
+package com.epmet.dataaggre.dao.epmettduck;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.epmettduck.AcUserEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 用户
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Mapper
+public interface AcUserDao extends BaseDao<AcUserEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectTemplateCategoryDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectTemplateCategoryDao.java
new file mode 100644
index 0000000000..4446abbd70
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectTemplateCategoryDao.java
@@ -0,0 +1,16 @@
+package com.epmet.dataaggre.dao.epmettduck;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.epmettduck.PrProjectTemplateCategoryEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目模板分类
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Mapper
+public interface PrProjectTemplateCategoryDao {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectTemplateDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectTemplateDao.java
new file mode 100644
index 0000000000..570e6a224b
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectTemplateDao.java
@@ -0,0 +1,16 @@
+package com.epmet.dataaggre.dao.epmettduck;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.epmettduck.PrProjectTemplateEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Mapper
+public interface PrProjectTemplateDao extends BaseDao<PrProjectTemplateEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectTemplateItemDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectTemplateItemDao.java
new file mode 100644
index 0000000000..cf857e5eea
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectTemplateItemDao.java
@@ -0,0 +1,16 @@
+package com.epmet.dataaggre.dao.epmettduck;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.epmettduck.PrProjectTemplateItemEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Mapper
+public interface PrProjectTemplateItemDao extends BaseDao<PrProjectTemplateItemEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectThemeDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectThemeDao.java
new file mode 100644
index 0000000000..bb2d70f35a
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectThemeDao.java
@@ -0,0 +1,16 @@
+package com.epmet.dataaggre.dao.epmettduck;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.epmettduck.PrProjectThemeEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目主题外观模板
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Mapper
+public interface PrProjectThemeDao extends BaseDao<PrProjectThemeEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrPublishRangeDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrPublishRangeDao.java
new file mode 100644
index 0000000000..8c34b43604
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrPublishRangeDao.java
@@ -0,0 +1,16 @@
+package com.epmet.dataaggre.dao.epmettduck;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.epmettduck.PrPublishRangeEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目发布范围表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Mapper
+public interface PrPublishRangeDao extends BaseDao<PrPublishRangeEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrResultExtDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrResultExtDao.java
new file mode 100644
index 0000000000..9fa0907418
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrResultExtDao.java
@@ -0,0 +1,16 @@
+package com.epmet.dataaggre.dao.epmettduck;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.epmettduck.PrResultExtEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 问卷填写附属信息表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Mapper
+public interface PrResultExtDao extends BaseDao<PrResultExtEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
new file mode 100644
index 0000000000..3076d5647f
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
@@ -0,0 +1,16 @@
+package com.epmet.dataaggre.dao.epmettduck;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Mapper
+public interface PrUserProjectDao extends BaseDao<PrUserProjectEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectItemDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectItemDao.java
new file mode 100644
index 0000000000..c98c794092
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectItemDao.java
@@ -0,0 +1,16 @@
+package com.epmet.dataaggre.dao.epmettduck;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Mapper
+public interface PrUserProjectItemDao extends BaseDao<PrUserProjectItemEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectLogicDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectLogicDao.java
new file mode 100644
index 0000000000..419f270dc9
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectLogicDao.java
@@ -0,0 +1,16 @@
+package com.epmet.dataaggre.dao.epmettduck;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectLogicEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目逻辑
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Mapper
+public interface PrUserProjectLogicDao extends BaseDao<PrUserProjectLogicEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectResultDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectResultDao.java
new file mode 100644
index 0000000000..15ae5f7c3a
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectResultDao.java
@@ -0,0 +1,16 @@
+package com.epmet.dataaggre.dao.epmettduck;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Mapper
+public interface PrUserProjectResultDao extends BaseDao<PrUserProjectResultEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectSettingDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectSettingDao.java
new file mode 100644
index 0000000000..02fe88207b
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectSettingDao.java
@@ -0,0 +1,16 @@
+package com.epmet.dataaggre.dao.epmettduck;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectSettingEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Mapper
+public interface PrUserProjectSettingDao extends BaseDao<PrUserProjectSettingEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectThemeDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectThemeDao.java
new file mode 100644
index 0000000000..1344849bc6
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectThemeDao.java
@@ -0,0 +1,16 @@
+package com.epmet.dataaggre.dao.epmettduck;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectThemeEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Mapper
+public interface PrUserProjectThemeDao extends BaseDao<PrUserProjectThemeEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java
new file mode 100644
index 0000000000..716daf1608
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java
@@ -0,0 +1,16 @@
+package com.epmet.dataaggre.dao.epmettduck;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.epmettduck.PrVistRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 用户访问问卷记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Mapper
+public interface PrVistRecordDao extends BaseDao<PrVistRecordEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/WxMpUserDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/WxMpUserDao.java
new file mode 100644
index 0000000000..2894fd9c61
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/WxMpUserDao.java
@@ -0,0 +1,16 @@
+package com.epmet.dataaggre.dao.epmettduck;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.epmettduck.WxMpUserEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 微信公众号用户 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Mapper
+public interface WxMpUserDao extends BaseDao<WxMpUserEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserAuthorizeEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserAuthorizeEntity.java
new file mode 100644
index 0000000000..d2b4fe4330
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserAuthorizeEntity.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.entity.epmettduck;
+
+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 2021-09-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ac_user_authorize")
+public class AcUserAuthorizeEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 第三方平台类型
+     */
+	private Integer type;
+
+    /**
+     * 平台AppId
+     */
+	private String appId;
+
+    /**
+     * 平台OpenId
+     */
+	private String openId;
+
+    /**
+     * 平台用户名
+     */
+	private String userName;
+
+    /**
+     * 用户Id
+     */
+	private String userId;
+
+    /**
+     * 平台用户信息
+     */
+	private String userInfo;
+
+    /**
+     * 
+     */
+	private Date createTime;
+
+    /**
+     * 
+     */
+	private Date updateTime;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserEntity.java
new file mode 100644
index 0000000000..a9f4e9d95f
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserEntity.java
@@ -0,0 +1,111 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.entity.epmettduck;
+
+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 2021-09-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ac_user")
+public class AcUserEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 姓名
+     */
+	private String name;
+
+    /**
+     * 头像
+     */
+	private String avatar;
+
+    /**
+     * 性别0未知 1男2女
+     */
+	private Integer gender;
+
+    /**
+     * 邮箱
+     */
+	private String email;
+
+    /**
+     * 手机号
+     */
+	private String phoneNumber;
+
+    /**
+     * 密码
+     */
+	private String password;
+
+    /**
+     * 注册渠道
+     */
+	private String regChannel;
+
+    /**
+     * 最后登录渠道
+     */
+	private Integer lastLoginChannel;
+
+    /**
+     * 最后登录时间
+     */
+	private Date lastLoginTime;
+
+    /**
+     * 最后登录Ip
+     */
+	private String lastLoginIp;
+
+    /**
+     * 状态
+     */
+	private Integer deleted;
+
+    /**
+     * 
+     */
+	private Date createTime;
+
+    /**
+     * 
+     */
+	private Date updateTime;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateCategoryEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateCategoryEntity.java
new file mode 100644
index 0000000000..1e0ccb3caa
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateCategoryEntity.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.entity.epmettduck;
+
+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 2021-09-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("pr_project_template_category")
+public class PrProjectTemplateCategoryEntity{
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private Long id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 主题名称
+     */
+	private String name;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateEntity.java
new file mode 100644
index 0000000000..bfaa3af466
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateEntity.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.entity.epmettduck;
+
+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 2021-09-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("pr_project_template")
+public class PrProjectTemplateEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 模板唯一标识
+     */
+	private String key;
+
+    /**
+     * 封面图
+     */
+	private String coverImg;
+
+    /**
+     * 项目名称
+     */
+	private String name;
+
+    /**
+     * 项目描述
+     */
+	private String describe;
+
+    /**
+     * 喜欢数
+     */
+	private Integer likeCount;
+
+    /**
+     * 项目类型
+     */
+	private String categoryId;
+
+    /**
+     * 状态
+     */
+	private Integer status;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateItemEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateItemEntity.java
new file mode 100644
index 0000000000..c20c913d91
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateItemEntity.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.entity.epmettduck;
+
+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 2021-09-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("pr_project_template_item")
+public class PrProjectTemplateItemEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 项目key
+     */
+	private String projectKey;
+
+    /**
+     * 表单项Id
+     */
+	private String formItemId;
+
+    /**
+     * 表单项类型 
+     */
+	private String type;
+
+    /**
+     * 表单项标题
+     */
+	private String label;
+
+    /**
+     * 是否显示标签
+     */
+	private Integer showLabel;
+
+    /**
+     * 表单项默认值
+     */
+	private String defaultValue;
+
+    /**
+     * 是否必填
+     */
+	private Integer required;
+
+    /**
+     * 输入型提示文字
+     */
+	private String placeholder;
+
+    /**
+     * 排序
+     */
+	private Long sort;
+
+    /**
+     * 栅格宽度
+     */
+	private Integer span;
+
+    /**
+     * 扩展字段 表单项独有字段
+     */
+	private String expand;
+
+    /**
+     * 正则表达式 
+     */
+	private String regList;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+    /**
+     * 展示类型组件
+     */
+	private Integer isDisplayType;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectThemeEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectThemeEntity.java
new file mode 100644
index 0000000000..35a3ec32ff
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectThemeEntity.java
@@ -0,0 +1,87 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.entity.epmettduck;
+
+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 2021-09-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("pr_project_theme")
+public class PrProjectThemeEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 主题名称
+     */
+	private String name;
+
+    /**
+     * 主题风格
+
+     */
+	private String style;
+
+    /**
+     * 头部图片
+     */
+	private String headImgUrl;
+
+    /**
+     * 颜色代码
+     */
+	private String color;
+
+    /**
+     * 按钮颜色
+     */
+	private String btnsColor;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrPublishRangeEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrPublishRangeEntity.java
new file mode 100644
index 0000000000..d19f53e636
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrPublishRangeEntity.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.entity.epmettduck;
+
+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 2021-09-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("pr_publish_range")
+public class PrPublishRangeEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 项目key
+     */
+	private String projectKey;
+
+    /**
+     * 范围组织ids,格式与组织维度一致 冒号隔开 即选中节点的全路径id
+     */
+	private String orgIds;
+
+    /**
+     * 最后发布组织的ID
+     */
+	private String orgId;
+
+    /**
+     * 最后发布组织的类型；department，agency；grid
+     */
+	private String orgType;
+
+    /**
+     * 状态
+     */
+	private Integer deleted;
+
+    /**
+     * 
+     */
+	private Date createTime;
+
+    /**
+     * 
+     */
+	private Date updateTime;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrResultExtEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrResultExtEntity.java
new file mode 100644
index 0000000000..da87abe0f0
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrResultExtEntity.java
@@ -0,0 +1,91 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.entity.epmettduck;
+
+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 2021-09-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("pr_result_ext")
+public class PrResultExtEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 姓名
+     */
+	private String userId;
+
+    /**
+     * 结果Id
+     */
+	private String resultId;
+
+    /**
+     * 工作端小程序:gov、居民端小程序:resi、运营端:oper、其他：other
+     */
+	private String userType;
+
+    /**
+     * 在哪个组织填写的
+     */
+	private String fromOrgId;
+
+    /**
+     * 组织：agency；部门：department；网格：grid
+     */
+	private String fromOrgType;
+
+    /**
+     * 状态
+     */
+	private Integer deleted;
+
+    /**
+     * 
+     */
+	private Date createTime;
+
+    /**
+     * 
+     */
+	private Date updateTime;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectEntity.java
new file mode 100644
index 0000000000..a898676a18
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectEntity.java
@@ -0,0 +1,111 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.entity.epmettduck;
+
+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 2021-09-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("pr_user_project")
+public class PrUserProjectEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 项目code
+     */
+	private String key;
+
+    /**
+     * 来源Id
+     */
+	private String sourceId;
+
+    /**
+     * 来源类型
+     */
+	private Integer sourceType;
+
+    /**
+     * 项目名称
+     */
+	private String name;
+
+    /**
+     * 项目描述
+     */
+	private String describe;
+
+    /**
+     * 用户ID
+     */
+	private String userId;
+
+    /**
+     * 项目类型
+     */
+	private Integer type;
+
+    /**
+     * 状态
+     */
+	private Integer status;
+
+    /**
+     * 适用于哪个端 resi：居民端用户；gov：工作端用户；运营端用户：oper
+     */
+	private String client;
+
+    /**
+     * 是否删除
+     */
+	private Integer isDeleted;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java
new file mode 100644
index 0000000000..19a67f5e65
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.entity.epmettduck;
+
+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 2021-09-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("pr_user_project_item")
+public class PrUserProjectItemEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 项目key
+     */
+	private String projectKey;
+
+    /**
+     * 表单项Id
+     */
+	private String formItemId;
+
+    /**
+     * 表单项类型 
+     */
+	private String type;
+
+    /**
+     * 表单项标题
+     */
+	private String label;
+
+    /**
+     * 展示类型组件
+     */
+	private Integer isDisplayType;
+
+    /**
+     * 是否显示标签
+     */
+	private Integer showLabel;
+
+    /**
+     * 表单项默认值
+     */
+	private String defaultValue;
+
+    /**
+     * 是否必填
+     */
+	private Integer required;
+
+    /**
+     * 输入型提示文字
+     */
+	private String placeholder;
+
+    /**
+     * 排序
+     */
+	private Long sort;
+
+    /**
+     * 栅格宽度
+     */
+	private Integer span;
+
+    /**
+     * 扩展字段 表单项独有字段
+     */
+	private String expand;
+
+    /**
+     * 正则表达式 
+     */
+	private String regList;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectLogicEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectLogicEntity.java
new file mode 100644
index 0000000000..0e1e8ce4f5
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectLogicEntity.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.entity.epmettduck;
+
+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 2021-09-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("pr_user_project_logic")
+public class PrUserProjectLogicEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 逻辑Id
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 项目key
+     */
+	private String projectKey;
+
+    /**
+     * 问题Id
+     */
+	private String formItemId;
+
+    /**
+     * 条件选项 
+     */
+	private Integer expression;
+
+    /**
+     * 条件列表
+     */
+	private String conditionList;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectResultEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectResultEntity.java
new file mode 100644
index 0000000000..5d1cfa1f7f
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectResultEntity.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.entity.epmettduck;
+
+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 2021-09-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("pr_user_project_result")
+public class PrUserProjectResultEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 项目key
+     */
+	private String projectKey;
+
+    /**
+     * 序号
+     */
+	private Integer serialNumber;
+
+    /**
+     * 填写结果
+     */
+	private String originalData;
+
+    /**
+     * 填写结果
+     */
+	private String processData;
+
+    /**
+     * 提交ua
+     */
+	private String submitUa;
+
+    /**
+     * 提交系统
+     */
+	private String submitOs;
+
+    /**
+     * 提交浏览器
+     */
+	private String submitBrowser;
+
+    /**
+     * 请求ip
+     */
+	private String submitRequestIp;
+
+    /**
+     * 提交地址
+     */
+	private String submitAddress;
+
+    /**
+     * 完成时间 毫秒
+     */
+	private Integer completeTime;
+
+    /**
+     * 用户Id
+     */
+	private String userId;
+
+    /**
+     * 微信openId
+     */
+	private String wxOpenId;
+
+    /**
+     * 微信用户信息
+     */
+	private String wxUserInfo;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectSettingEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectSettingEntity.java
new file mode 100644
index 0000000000..89de31449a
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectSettingEntity.java
@@ -0,0 +1,171 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.entity.epmettduck;
+
+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 2021-09-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("pr_user_project_setting")
+public class PrUserProjectSettingEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 项目key
+     */
+	private String projectKey;
+
+    /**
+     * 提交提示图片
+     */
+	private String submitPromptImg;
+
+    /**
+     * 提交提示文字
+     */
+	private String submitPromptText;
+
+    /**
+     * 提交跳转连接
+     */
+	private String submitJumpUrl;
+
+    /**
+     * 公开提交结果
+     */
+	private Integer isPublicResult;
+
+    /**
+     * 只在微信填写
+     */
+	private Integer isWxWrite;
+
+    /**
+     * 
+     */
+	private Integer isWxWriteOnce;
+
+    /**
+     * 每人只能填写一次
+     */
+	private Integer isEveryoneWriteOnce;
+
+    /**
+     * 每人每天只能填写一次
+     */
+	private Integer isEveryoneDayWriteOnce;
+
+    /**
+     * 填写之后提示
+     */
+	private String writeOncePromptText;
+
+    /**
+     * 新反馈通知邮件
+     */
+	private String newWriteNotifyEmail;
+
+    /**
+     * 新反馈通知微信
+     */
+	private String newWriteNotifyWx;
+
+    /**
+     * 记录微信用户个人信息
+     */
+	private Integer isRecordWxUser;
+
+    /**
+     * 定时收集开始时间
+     */
+	private Date timedCollectionBeginTime;
+
+    /**
+     * 定时收集结束时间
+     */
+	private Date timedCollectionEndTime;
+
+    /**
+     * 定时未启动提示文字
+     */
+	private String timedNotEnabledPromptText;
+
+    /**
+     * 定时停用会提示文字
+     */
+	private String timedDeactivatePromptText;
+
+    /**
+     * 定时定量数量
+     */
+	private Integer timedQuantitativeQuantity;
+
+    /**
+     * 定时定量完成提示
+     */
+	private String timedEndPromptText;
+
+    /**
+     * 分享图片
+     */
+	private String shareImg;
+
+    /**
+     * 分享标题
+     */
+	private String shareTitle;
+
+    /**
+     * 分享描述
+     */
+	private String shareDesc;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectThemeEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectThemeEntity.java
new file mode 100644
index 0000000000..09eb0a1f35
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectThemeEntity.java
@@ -0,0 +1,111 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.entity.epmettduck;
+
+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 2021-09-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("pr_user_project_theme")
+public class PrUserProjectThemeEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 项目key
+     */
+	private String projectKey;
+
+    /**
+     * 主题Id
+     */
+	private String themeId;
+
+    /**
+     * 提交按钮文字
+     */
+	private String submitBtnText;
+
+    /**
+     * logo图片
+     */
+	private String logoImg;
+
+    /**
+     * logo位置
+     */
+	private String logoPosition;
+
+    /**
+     * 背景颜色
+     */
+	private String backgroundColor;
+
+    /**
+     * 背景图片
+     */
+	private String backgroundImg;
+
+    /**
+     * 是否显示标题
+     */
+	private Integer showTitle;
+
+    /**
+     * 是否显示描述语
+     */
+	private Integer showDescribe;
+
+    /**
+     * 显示序号
+     */
+	private Integer showNumber;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrVistRecordEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrVistRecordEntity.java
new file mode 100644
index 0000000000..fb748bc4fd
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrVistRecordEntity.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.entity.epmettduck;
+
+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 2021-09-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("pr_vist_record")
+public class PrVistRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 姓名
+     */
+	private String userId;
+
+    /**
+     * 工作端小程序:gov、居民端小程序:resi、运营端:oper、其他：other
+     */
+	private String userType;
+
+    /**
+     * 项目key
+     */
+	private String projectKey;
+
+    /**
+     * 状态
+     */
+	private Integer deleted;
+
+    /**
+     * 
+     */
+	private Date createTime;
+
+    /**
+     * 
+     */
+	private Date updateTime;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/WxMpUserEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/WxMpUserEntity.java
new file mode 100644
index 0000000000..3562215829
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/WxMpUserEntity.java
@@ -0,0 +1,111 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.entity.epmettduck;
+
+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 2021-09-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("wx_mp_user")
+public class WxMpUserEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 公众号AppId
+     */
+	private String appid;
+
+    /**
+     * 昵称
+     */
+	private String nickname;
+
+    /**
+     * 性别
+     */
+	private Integer sex;
+
+    /**
+     * 头像
+     */
+	private String headImgUrl;
+
+    /**
+     * 
+     */
+	private String unionId;
+
+    /**
+     * 
+     */
+	private String openId;
+
+    /**
+     * 国家
+     */
+	private String country;
+
+    /**
+     * 省
+     */
+	private String province;
+
+    /**
+     * 城市
+     */
+	private String city;
+
+    /**
+     * 是否关注
+     */
+	private Integer isSubscribe;
+
+    /**
+     * 用户Id
+     */
+	private String userId;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/AcUserAuthorizeService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/AcUserAuthorizeService.java
new file mode 100644
index 0000000000..84b2002e8a
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/AcUserAuthorizeService.java
@@ -0,0 +1,78 @@
+package com.epmet.dataaggre.service.epmettduck;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dataaggre.dto.epmettduck.AcUserAuthorizeDTO;
+import com.epmet.dataaggre.entity.epmettduck.AcUserAuthorizeEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 第三方用户授权信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+public interface AcUserAuthorizeService extends BaseService<AcUserAuthorizeEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<AcUserAuthorizeDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    PageData<AcUserAuthorizeDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<AcUserAuthorizeDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    List<AcUserAuthorizeDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return AcUserAuthorizeDTO
+     * @author generator
+     * @date 2021-09-15
+     */
+    AcUserAuthorizeDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void save(AcUserAuthorizeDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void update(AcUserAuthorizeDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/AcUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/AcUserService.java
new file mode 100644
index 0000000000..3ab7e664e9
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/AcUserService.java
@@ -0,0 +1,78 @@
+package com.epmet.dataaggre.service.epmettduck;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dataaggre.dto.epmettduck.AcUserDTO;
+import com.epmet.dataaggre.entity.epmettduck.AcUserEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+public interface AcUserService extends BaseService<AcUserEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<AcUserDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    PageData<AcUserDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<AcUserDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    List<AcUserDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return AcUserDTO
+     * @author generator
+     * @date 2021-09-15
+     */
+    AcUserDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void save(AcUserDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void update(AcUserDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrProjectTemplateCategoryService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrProjectTemplateCategoryService.java
new file mode 100644
index 0000000000..360af280e9
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrProjectTemplateCategoryService.java
@@ -0,0 +1,14 @@
+package com.epmet.dataaggre.service.epmettduck;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dataaggre.entity.epmettduck.PrProjectTemplateCategoryEntity;
+
+/**
+ * 项目模板分类
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+public interface PrProjectTemplateCategoryService {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrProjectTemplateItemService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrProjectTemplateItemService.java
new file mode 100644
index 0000000000..26803febd3
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrProjectTemplateItemService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dataaggre.dto.epmettduck.PrProjectTemplateItemDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrProjectTemplateItemEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+public interface PrProjectTemplateItemService extends BaseService<PrProjectTemplateItemEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<PrProjectTemplateItemDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    PageData<PrProjectTemplateItemDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<PrProjectTemplateItemDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    List<PrProjectTemplateItemDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return PrProjectTemplateItemDTO
+     * @author generator
+     * @date 2021-09-15
+     */
+    PrProjectTemplateItemDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void save(PrProjectTemplateItemDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void update(PrProjectTemplateItemDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrProjectTemplateService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrProjectTemplateService.java
new file mode 100644
index 0000000000..52b6f23deb
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrProjectTemplateService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dataaggre.dto.epmettduck.PrProjectTemplateDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrProjectTemplateEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+public interface PrProjectTemplateService extends BaseService<PrProjectTemplateEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<PrProjectTemplateDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    PageData<PrProjectTemplateDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<PrProjectTemplateDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    List<PrProjectTemplateDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return PrProjectTemplateDTO
+     * @author generator
+     * @date 2021-09-15
+     */
+    PrProjectTemplateDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void save(PrProjectTemplateDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void update(PrProjectTemplateDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrProjectThemeService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrProjectThemeService.java
new file mode 100644
index 0000000000..5144ceb67a
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrProjectThemeService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dataaggre.dto.epmettduck.PrProjectThemeDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrProjectThemeEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目主题外观模板
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+public interface PrProjectThemeService extends BaseService<PrProjectThemeEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<PrProjectThemeDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    PageData<PrProjectThemeDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<PrProjectThemeDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    List<PrProjectThemeDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return PrProjectThemeDTO
+     * @author generator
+     * @date 2021-09-15
+     */
+    PrProjectThemeDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void save(PrProjectThemeDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void update(PrProjectThemeDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrPublishRangeService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrPublishRangeService.java
new file mode 100644
index 0000000000..403587d43d
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrPublishRangeService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dataaggre.dto.epmettduck.PrPublishRangeDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrPublishRangeEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目发布范围表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+public interface PrPublishRangeService extends BaseService<PrPublishRangeEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<PrPublishRangeDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    PageData<PrPublishRangeDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<PrPublishRangeDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    List<PrPublishRangeDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return PrPublishRangeDTO
+     * @author generator
+     * @date 2021-09-15
+     */
+    PrPublishRangeDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void save(PrPublishRangeDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void update(PrPublishRangeDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrResultExtService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrResultExtService.java
new file mode 100644
index 0000000000..98f7e0b713
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrResultExtService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dataaggre.dto.epmettduck.PrResultExtDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrResultExtEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 问卷填写附属信息表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+public interface PrResultExtService extends BaseService<PrResultExtEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<PrResultExtDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    PageData<PrResultExtDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<PrResultExtDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    List<PrResultExtDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return PrResultExtDTO
+     * @author generator
+     * @date 2021-09-15
+     */
+    PrResultExtDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void save(PrResultExtDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void update(PrResultExtDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectItemService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectItemService.java
new file mode 100644
index 0000000000..6ac1399035
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectItemService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dataaggre.dto.epmettduck.PrUserProjectItemDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+public interface PrUserProjectItemService extends BaseService<PrUserProjectItemEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<PrUserProjectItemDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    PageData<PrUserProjectItemDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<PrUserProjectItemDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    List<PrUserProjectItemDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return PrUserProjectItemDTO
+     * @author generator
+     * @date 2021-09-15
+     */
+    PrUserProjectItemDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void save(PrUserProjectItemDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void update(PrUserProjectItemDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectLogicService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectLogicService.java
new file mode 100644
index 0000000000..5440d9a334
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectLogicService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dataaggre.dto.epmettduck.PrUserProjectLogicDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectLogicEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目逻辑
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+public interface PrUserProjectLogicService extends BaseService<PrUserProjectLogicEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<PrUserProjectLogicDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    PageData<PrUserProjectLogicDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<PrUserProjectLogicDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    List<PrUserProjectLogicDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return PrUserProjectLogicDTO
+     * @author generator
+     * @date 2021-09-15
+     */
+    PrUserProjectLogicDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void save(PrUserProjectLogicDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void update(PrUserProjectLogicDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectResultService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectResultService.java
new file mode 100644
index 0000000000..aaa8a131e6
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectResultService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dataaggre.dto.epmettduck.PrUserProjectResultDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+public interface PrUserProjectResultService extends BaseService<PrUserProjectResultEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<PrUserProjectResultDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    PageData<PrUserProjectResultDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<PrUserProjectResultDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    List<PrUserProjectResultDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return PrUserProjectResultDTO
+     * @author generator
+     * @date 2021-09-15
+     */
+    PrUserProjectResultDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void save(PrUserProjectResultDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void update(PrUserProjectResultDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
new file mode 100644
index 0000000000..d778e1d9f4
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+public interface PrUserProjectService extends BaseService<PrUserProjectEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<PrUserProjectDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    PageData<PrUserProjectDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<PrUserProjectDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    List<PrUserProjectDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return PrUserProjectDTO
+     * @author generator
+     * @date 2021-09-15
+     */
+    PrUserProjectDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void save(PrUserProjectDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void update(PrUserProjectDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectSettingService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectSettingService.java
new file mode 100644
index 0000000000..67111d9eb4
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectSettingService.java
@@ -0,0 +1,78 @@
+package com.epmet.dataaggre.service.epmettduck;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dataaggre.dto.epmettduck.PrUserProjectSettingDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectSettingEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+public interface PrUserProjectSettingService extends BaseService<PrUserProjectSettingEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<PrUserProjectSettingDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    PageData<PrUserProjectSettingDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<PrUserProjectSettingDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    List<PrUserProjectSettingDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return PrUserProjectSettingDTO
+     * @author generator
+     * @date 2021-09-15
+     */
+    PrUserProjectSettingDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void save(PrUserProjectSettingDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void update(PrUserProjectSettingDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectThemeService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectThemeService.java
new file mode 100644
index 0000000000..48fc3f1d63
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectThemeService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dataaggre.dto.epmettduck.PrUserProjectThemeDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectThemeEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+public interface PrUserProjectThemeService extends BaseService<PrUserProjectThemeEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<PrUserProjectThemeDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    PageData<PrUserProjectThemeDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<PrUserProjectThemeDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    List<PrUserProjectThemeDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return PrUserProjectThemeDTO
+     * @author generator
+     * @date 2021-09-15
+     */
+    PrUserProjectThemeDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void save(PrUserProjectThemeDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void update(PrUserProjectThemeDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrVistRecordService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrVistRecordService.java
new file mode 100644
index 0000000000..a0d8f5a044
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrVistRecordService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dataaggre.dto.epmettduck.PrVistRecordDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrVistRecordEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户访问问卷记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+public interface PrVistRecordService extends BaseService<PrVistRecordEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<PrVistRecordDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    PageData<PrVistRecordDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<PrVistRecordDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    List<PrVistRecordDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return PrVistRecordDTO
+     * @author generator
+     * @date 2021-09-15
+     */
+    PrVistRecordDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void save(PrVistRecordDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void update(PrVistRecordDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/WxMpUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/WxMpUserService.java
new file mode 100644
index 0000000000..b65983748c
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/WxMpUserService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dataaggre.dto.epmettduck.WxMpUserDTO;
+import com.epmet.dataaggre.entity.epmettduck.WxMpUserEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 微信公众号用户 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+public interface WxMpUserService extends BaseService<WxMpUserEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<WxMpUserDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    PageData<WxMpUserDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<WxMpUserDTO>
+     * @author generator
+     * @date 2021-09-15
+     */
+    List<WxMpUserDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return WxMpUserDTO
+     * @author generator
+     * @date 2021-09-15
+     */
+    WxMpUserDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void save(WxMpUserDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void update(WxMpUserDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-15
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserAuthorizeServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserAuthorizeServiceImpl.java
new file mode 100644
index 0000000000..4cddcac638
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserAuthorizeServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck.impl;
+
+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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.dao.epmettduck.AcUserAuthorizeDao;
+import com.epmet.dataaggre.dto.epmettduck.AcUserAuthorizeDTO;
+import com.epmet.dataaggre.entity.epmettduck.AcUserAuthorizeEntity;
+import com.epmet.dataaggre.service.epmettduck.AcUserAuthorizeService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 第三方用户授权信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Service
+public class AcUserAuthorizeServiceImpl extends BaseServiceImpl<AcUserAuthorizeDao, AcUserAuthorizeEntity> implements AcUserAuthorizeService {
+
+    @Override
+    public PageData<AcUserAuthorizeDTO> page(Map<String, Object> params) {
+        IPage<AcUserAuthorizeEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, AcUserAuthorizeDTO.class);
+    }
+
+    @Override
+    public List<AcUserAuthorizeDTO> list(Map<String, Object> params) {
+        List<AcUserAuthorizeEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, AcUserAuthorizeDTO.class);
+    }
+
+    private QueryWrapper<AcUserAuthorizeEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<AcUserAuthorizeEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public AcUserAuthorizeDTO get(String id) {
+        AcUserAuthorizeEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, AcUserAuthorizeDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(AcUserAuthorizeDTO dto) {
+        AcUserAuthorizeEntity entity = ConvertUtils.sourceToTarget(dto, AcUserAuthorizeEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(AcUserAuthorizeDTO dto) {
+        AcUserAuthorizeEntity entity = ConvertUtils.sourceToTarget(dto, AcUserAuthorizeEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserServiceImpl.java
new file mode 100644
index 0000000000..b85ff41893
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck.impl;
+
+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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.dao.epmettduck.AcUserDao;
+import com.epmet.dataaggre.dto.epmettduck.AcUserDTO;
+import com.epmet.dataaggre.entity.epmettduck.AcUserEntity;
+import com.epmet.dataaggre.service.epmettduck.AcUserService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Service
+public class AcUserServiceImpl extends BaseServiceImpl<AcUserDao, AcUserEntity> implements AcUserService {
+
+    @Override
+    public PageData<AcUserDTO> page(Map<String, Object> params) {
+        IPage<AcUserEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, AcUserDTO.class);
+    }
+
+    @Override
+    public List<AcUserDTO> list(Map<String, Object> params) {
+        List<AcUserEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, AcUserDTO.class);
+    }
+
+    private QueryWrapper<AcUserEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<AcUserEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public AcUserDTO get(String id) {
+        AcUserEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, AcUserDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(AcUserDTO dto) {
+        AcUserEntity entity = ConvertUtils.sourceToTarget(dto, AcUserEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(AcUserDTO dto) {
+        AcUserEntity entity = ConvertUtils.sourceToTarget(dto, AcUserEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateCategoryServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateCategoryServiceImpl.java
new file mode 100644
index 0000000000..cd00fb7a9a
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateCategoryServiceImpl.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck.impl;
+
+import com.epmet.dataaggre.service.epmettduck.PrProjectTemplateCategoryService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目模板分类
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Service
+public class PrProjectTemplateCategoryServiceImpl implements PrProjectTemplateCategoryService {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateItemServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateItemServiceImpl.java
new file mode 100644
index 0000000000..cdee7cae3b
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateItemServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck.impl;
+
+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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.dao.epmettduck.PrProjectTemplateItemDao;
+import com.epmet.dataaggre.dto.epmettduck.PrProjectTemplateItemDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrProjectTemplateItemEntity;
+import com.epmet.dataaggre.service.epmettduck.PrProjectTemplateItemService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Service
+public class PrProjectTemplateItemServiceImpl extends BaseServiceImpl<PrProjectTemplateItemDao, PrProjectTemplateItemEntity> implements PrProjectTemplateItemService {
+
+    @Override
+    public PageData<PrProjectTemplateItemDTO> page(Map<String, Object> params) {
+        IPage<PrProjectTemplateItemEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, PrProjectTemplateItemDTO.class);
+    }
+
+    @Override
+    public List<PrProjectTemplateItemDTO> list(Map<String, Object> params) {
+        List<PrProjectTemplateItemEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, PrProjectTemplateItemDTO.class);
+    }
+
+    private QueryWrapper<PrProjectTemplateItemEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<PrProjectTemplateItemEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PrProjectTemplateItemDTO get(String id) {
+        PrProjectTemplateItemEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, PrProjectTemplateItemDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(PrProjectTemplateItemDTO dto) {
+        PrProjectTemplateItemEntity entity = ConvertUtils.sourceToTarget(dto, PrProjectTemplateItemEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PrProjectTemplateItemDTO dto) {
+        PrProjectTemplateItemEntity entity = ConvertUtils.sourceToTarget(dto, PrProjectTemplateItemEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateServiceImpl.java
new file mode 100644
index 0000000000..51c0932019
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck.impl;
+
+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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.dao.epmettduck.PrProjectTemplateDao;
+import com.epmet.dataaggre.dto.epmettduck.PrProjectTemplateDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrProjectTemplateEntity;
+import com.epmet.dataaggre.service.epmettduck.PrProjectTemplateService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Service
+public class PrProjectTemplateServiceImpl extends BaseServiceImpl<PrProjectTemplateDao, PrProjectTemplateEntity> implements PrProjectTemplateService {
+
+    @Override
+    public PageData<PrProjectTemplateDTO> page(Map<String, Object> params) {
+        IPage<PrProjectTemplateEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, PrProjectTemplateDTO.class);
+    }
+
+    @Override
+    public List<PrProjectTemplateDTO> list(Map<String, Object> params) {
+        List<PrProjectTemplateEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, PrProjectTemplateDTO.class);
+    }
+
+    private QueryWrapper<PrProjectTemplateEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<PrProjectTemplateEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PrProjectTemplateDTO get(String id) {
+        PrProjectTemplateEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, PrProjectTemplateDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(PrProjectTemplateDTO dto) {
+        PrProjectTemplateEntity entity = ConvertUtils.sourceToTarget(dto, PrProjectTemplateEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PrProjectTemplateDTO dto) {
+        PrProjectTemplateEntity entity = ConvertUtils.sourceToTarget(dto, PrProjectTemplateEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectThemeServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectThemeServiceImpl.java
new file mode 100644
index 0000000000..db86a529d7
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectThemeServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck.impl;
+
+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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.dao.epmettduck.PrProjectThemeDao;
+import com.epmet.dataaggre.dto.epmettduck.PrProjectThemeDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrProjectThemeEntity;
+import com.epmet.dataaggre.service.epmettduck.PrProjectThemeService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目主题外观模板
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Service
+public class PrProjectThemeServiceImpl extends BaseServiceImpl<PrProjectThemeDao, PrProjectThemeEntity> implements PrProjectThemeService {
+
+    @Override
+    public PageData<PrProjectThemeDTO> page(Map<String, Object> params) {
+        IPage<PrProjectThemeEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, PrProjectThemeDTO.class);
+    }
+
+    @Override
+    public List<PrProjectThemeDTO> list(Map<String, Object> params) {
+        List<PrProjectThemeEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, PrProjectThemeDTO.class);
+    }
+
+    private QueryWrapper<PrProjectThemeEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<PrProjectThemeEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PrProjectThemeDTO get(String id) {
+        PrProjectThemeEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, PrProjectThemeDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(PrProjectThemeDTO dto) {
+        PrProjectThemeEntity entity = ConvertUtils.sourceToTarget(dto, PrProjectThemeEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PrProjectThemeDTO dto) {
+        PrProjectThemeEntity entity = ConvertUtils.sourceToTarget(dto, PrProjectThemeEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java
new file mode 100644
index 0000000000..f89d60925a
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck.impl;
+
+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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.dao.epmettduck.PrPublishRangeDao;
+import com.epmet.dataaggre.dto.epmettduck.PrPublishRangeDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrPublishRangeEntity;
+import com.epmet.dataaggre.service.epmettduck.PrPublishRangeService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目发布范围表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Service
+public class PrPublishRangeServiceImpl extends BaseServiceImpl<PrPublishRangeDao, PrPublishRangeEntity> implements PrPublishRangeService {
+
+    @Override
+    public PageData<PrPublishRangeDTO> page(Map<String, Object> params) {
+        IPage<PrPublishRangeEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, PrPublishRangeDTO.class);
+    }
+
+    @Override
+    public List<PrPublishRangeDTO> list(Map<String, Object> params) {
+        List<PrPublishRangeEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, PrPublishRangeDTO.class);
+    }
+
+    private QueryWrapper<PrPublishRangeEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<PrPublishRangeEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PrPublishRangeDTO get(String id) {
+        PrPublishRangeEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, PrPublishRangeDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(PrPublishRangeDTO dto) {
+        PrPublishRangeEntity entity = ConvertUtils.sourceToTarget(dto, PrPublishRangeEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PrPublishRangeDTO dto) {
+        PrPublishRangeEntity entity = ConvertUtils.sourceToTarget(dto, PrPublishRangeEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrResultExtServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrResultExtServiceImpl.java
new file mode 100644
index 0000000000..fa3011975b
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrResultExtServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck.impl;
+
+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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.dao.epmettduck.PrResultExtDao;
+import com.epmet.dataaggre.dto.epmettduck.PrResultExtDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrResultExtEntity;
+import com.epmet.dataaggre.service.epmettduck.PrResultExtService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 问卷填写附属信息表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Service
+public class PrResultExtServiceImpl extends BaseServiceImpl<PrResultExtDao, PrResultExtEntity> implements PrResultExtService {
+
+    @Override
+    public PageData<PrResultExtDTO> page(Map<String, Object> params) {
+        IPage<PrResultExtEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, PrResultExtDTO.class);
+    }
+
+    @Override
+    public List<PrResultExtDTO> list(Map<String, Object> params) {
+        List<PrResultExtEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, PrResultExtDTO.class);
+    }
+
+    private QueryWrapper<PrResultExtEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<PrResultExtEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PrResultExtDTO get(String id) {
+        PrResultExtEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, PrResultExtDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(PrResultExtDTO dto) {
+        PrResultExtEntity entity = ConvertUtils.sourceToTarget(dto, PrResultExtEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PrResultExtDTO dto) {
+        PrResultExtEntity entity = ConvertUtils.sourceToTarget(dto, PrResultExtEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java
new file mode 100644
index 0000000000..7b61e6a6e7
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck.impl;
+
+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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.dao.epmettduck.PrUserProjectItemDao;
+import com.epmet.dataaggre.dto.epmettduck.PrUserProjectItemDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity;
+import com.epmet.dataaggre.service.epmettduck.PrUserProjectItemService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Service
+public class PrUserProjectItemServiceImpl extends BaseServiceImpl<PrUserProjectItemDao, PrUserProjectItemEntity> implements PrUserProjectItemService {
+
+    @Override
+    public PageData<PrUserProjectItemDTO> page(Map<String, Object> params) {
+        IPage<PrUserProjectItemEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, PrUserProjectItemDTO.class);
+    }
+
+    @Override
+    public List<PrUserProjectItemDTO> list(Map<String, Object> params) {
+        List<PrUserProjectItemEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, PrUserProjectItemDTO.class);
+    }
+
+    private QueryWrapper<PrUserProjectItemEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<PrUserProjectItemEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PrUserProjectItemDTO get(String id) {
+        PrUserProjectItemEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, PrUserProjectItemDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(PrUserProjectItemDTO dto) {
+        PrUserProjectItemEntity entity = ConvertUtils.sourceToTarget(dto, PrUserProjectItemEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PrUserProjectItemDTO dto) {
+        PrUserProjectItemEntity entity = ConvertUtils.sourceToTarget(dto, PrUserProjectItemEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectLogicServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectLogicServiceImpl.java
new file mode 100644
index 0000000000..ed3a9ede57
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectLogicServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck.impl;
+
+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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.dao.epmettduck.PrUserProjectLogicDao;
+import com.epmet.dataaggre.dto.epmettduck.PrUserProjectLogicDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectLogicEntity;
+import com.epmet.dataaggre.service.epmettduck.PrUserProjectLogicService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目逻辑
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Service
+public class PrUserProjectLogicServiceImpl extends BaseServiceImpl<PrUserProjectLogicDao, PrUserProjectLogicEntity> implements PrUserProjectLogicService {
+
+    @Override
+    public PageData<PrUserProjectLogicDTO> page(Map<String, Object> params) {
+        IPage<PrUserProjectLogicEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, PrUserProjectLogicDTO.class);
+    }
+
+    @Override
+    public List<PrUserProjectLogicDTO> list(Map<String, Object> params) {
+        List<PrUserProjectLogicEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, PrUserProjectLogicDTO.class);
+    }
+
+    private QueryWrapper<PrUserProjectLogicEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<PrUserProjectLogicEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PrUserProjectLogicDTO get(String id) {
+        PrUserProjectLogicEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, PrUserProjectLogicDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(PrUserProjectLogicDTO dto) {
+        PrUserProjectLogicEntity entity = ConvertUtils.sourceToTarget(dto, PrUserProjectLogicEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PrUserProjectLogicDTO dto) {
+        PrUserProjectLogicEntity entity = ConvertUtils.sourceToTarget(dto, PrUserProjectLogicEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectResultServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectResultServiceImpl.java
new file mode 100644
index 0000000000..5d45b7e36d
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectResultServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck.impl;
+
+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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.dao.epmettduck.PrUserProjectResultDao;
+import com.epmet.dataaggre.dto.epmettduck.PrUserProjectResultDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity;
+import com.epmet.dataaggre.service.epmettduck.PrUserProjectResultService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Service
+public class PrUserProjectResultServiceImpl extends BaseServiceImpl<PrUserProjectResultDao, PrUserProjectResultEntity> implements PrUserProjectResultService {
+
+    @Override
+    public PageData<PrUserProjectResultDTO> page(Map<String, Object> params) {
+        IPage<PrUserProjectResultEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, PrUserProjectResultDTO.class);
+    }
+
+    @Override
+    public List<PrUserProjectResultDTO> list(Map<String, Object> params) {
+        List<PrUserProjectResultEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, PrUserProjectResultDTO.class);
+    }
+
+    private QueryWrapper<PrUserProjectResultEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<PrUserProjectResultEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PrUserProjectResultDTO get(String id) {
+        PrUserProjectResultEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, PrUserProjectResultDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(PrUserProjectResultDTO dto) {
+        PrUserProjectResultEntity entity = ConvertUtils.sourceToTarget(dto, PrUserProjectResultEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PrUserProjectResultDTO dto) {
+        PrUserProjectResultEntity entity = ConvertUtils.sourceToTarget(dto, PrUserProjectResultEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
new file mode 100644
index 0000000000..14e46b87d8
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck.impl;
+
+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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao;
+import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
+import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Service
+public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao, PrUserProjectEntity> implements PrUserProjectService {
+
+    @Override
+    public PageData<PrUserProjectDTO> page(Map<String, Object> params) {
+        IPage<PrUserProjectEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, PrUserProjectDTO.class);
+    }
+
+    @Override
+    public List<PrUserProjectDTO> list(Map<String, Object> params) {
+        List<PrUserProjectEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, PrUserProjectDTO.class);
+    }
+
+    private QueryWrapper<PrUserProjectEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<PrUserProjectEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PrUserProjectDTO get(String id) {
+        PrUserProjectEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, PrUserProjectDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(PrUserProjectDTO dto) {
+        PrUserProjectEntity entity = ConvertUtils.sourceToTarget(dto, PrUserProjectEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PrUserProjectDTO dto) {
+        PrUserProjectEntity entity = ConvertUtils.sourceToTarget(dto, PrUserProjectEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectSettingServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectSettingServiceImpl.java
new file mode 100644
index 0000000000..67bf9b50a5
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectSettingServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck.impl;
+
+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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.dao.epmettduck.PrUserProjectSettingDao;
+import com.epmet.dataaggre.dto.epmettduck.PrUserProjectSettingDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectSettingEntity;
+import com.epmet.dataaggre.service.epmettduck.PrUserProjectSettingService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Service
+public class PrUserProjectSettingServiceImpl extends BaseServiceImpl<PrUserProjectSettingDao, PrUserProjectSettingEntity> implements PrUserProjectSettingService {
+
+    @Override
+    public PageData<PrUserProjectSettingDTO> page(Map<String, Object> params) {
+        IPage<PrUserProjectSettingEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, PrUserProjectSettingDTO.class);
+    }
+
+    @Override
+    public List<PrUserProjectSettingDTO> list(Map<String, Object> params) {
+        List<PrUserProjectSettingEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, PrUserProjectSettingDTO.class);
+    }
+
+    private QueryWrapper<PrUserProjectSettingEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<PrUserProjectSettingEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PrUserProjectSettingDTO get(String id) {
+        PrUserProjectSettingEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, PrUserProjectSettingDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(PrUserProjectSettingDTO dto) {
+        PrUserProjectSettingEntity entity = ConvertUtils.sourceToTarget(dto, PrUserProjectSettingEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PrUserProjectSettingDTO dto) {
+        PrUserProjectSettingEntity entity = ConvertUtils.sourceToTarget(dto, PrUserProjectSettingEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectThemeServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectThemeServiceImpl.java
new file mode 100644
index 0000000000..d153971e1f
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectThemeServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck.impl;
+
+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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.dao.epmettduck.PrUserProjectThemeDao;
+import com.epmet.dataaggre.dto.epmettduck.PrUserProjectThemeDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectThemeEntity;
+import com.epmet.dataaggre.service.epmettduck.PrUserProjectThemeService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Service
+public class PrUserProjectThemeServiceImpl extends BaseServiceImpl<PrUserProjectThemeDao, PrUserProjectThemeEntity> implements PrUserProjectThemeService {
+
+    @Override
+    public PageData<PrUserProjectThemeDTO> page(Map<String, Object> params) {
+        IPage<PrUserProjectThemeEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, PrUserProjectThemeDTO.class);
+    }
+
+    @Override
+    public List<PrUserProjectThemeDTO> list(Map<String, Object> params) {
+        List<PrUserProjectThemeEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, PrUserProjectThemeDTO.class);
+    }
+
+    private QueryWrapper<PrUserProjectThemeEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<PrUserProjectThemeEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PrUserProjectThemeDTO get(String id) {
+        PrUserProjectThemeEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, PrUserProjectThemeDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(PrUserProjectThemeDTO dto) {
+        PrUserProjectThemeEntity entity = ConvertUtils.sourceToTarget(dto, PrUserProjectThemeEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PrUserProjectThemeDTO dto) {
+        PrUserProjectThemeEntity entity = ConvertUtils.sourceToTarget(dto, PrUserProjectThemeEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java
new file mode 100644
index 0000000000..5427486bb9
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck.impl;
+
+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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.dao.epmettduck.PrVistRecordDao;
+import com.epmet.dataaggre.dto.epmettduck.PrVistRecordDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrVistRecordEntity;
+import com.epmet.dataaggre.service.epmettduck.PrVistRecordService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户访问问卷记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Service
+public class PrVistRecordServiceImpl extends BaseServiceImpl<PrVistRecordDao, PrVistRecordEntity> implements PrVistRecordService {
+
+    @Override
+    public PageData<PrVistRecordDTO> page(Map<String, Object> params) {
+        IPage<PrVistRecordEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, PrVistRecordDTO.class);
+    }
+
+    @Override
+    public List<PrVistRecordDTO> list(Map<String, Object> params) {
+        List<PrVistRecordEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, PrVistRecordDTO.class);
+    }
+
+    private QueryWrapper<PrVistRecordEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<PrVistRecordEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PrVistRecordDTO get(String id) {
+        PrVistRecordEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, PrVistRecordDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(PrVistRecordDTO dto) {
+        PrVistRecordEntity entity = ConvertUtils.sourceToTarget(dto, PrVistRecordEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PrVistRecordDTO dto) {
+        PrVistRecordEntity entity = ConvertUtils.sourceToTarget(dto, PrVistRecordEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/WxMpUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/WxMpUserServiceImpl.java
new file mode 100644
index 0000000000..bd5d459e90
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/WxMpUserServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmettduck.impl;
+
+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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.dao.epmettduck.WxMpUserDao;
+import com.epmet.dataaggre.dto.epmettduck.WxMpUserDTO;
+import com.epmet.dataaggre.entity.epmettduck.WxMpUserEntity;
+import com.epmet.dataaggre.service.epmettduck.WxMpUserService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 微信公众号用户 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Service
+public class WxMpUserServiceImpl extends BaseServiceImpl<WxMpUserDao, WxMpUserEntity> implements WxMpUserService {
+
+    @Override
+    public PageData<WxMpUserDTO> page(Map<String, Object> params) {
+        IPage<WxMpUserEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, WxMpUserDTO.class);
+    }
+
+    @Override
+    public List<WxMpUserDTO> list(Map<String, Object> params) {
+        List<WxMpUserEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, WxMpUserDTO.class);
+    }
+
+    private QueryWrapper<WxMpUserEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<WxMpUserEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public WxMpUserDTO get(String id) {
+        WxMpUserEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, WxMpUserDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(WxMpUserDTO dto) {
+        WxMpUserEntity entity = ConvertUtils.sourceToTarget(dto, WxMpUserEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(WxMpUserDTO dto) {
+        WxMpUserEntity entity = ConvertUtils.sourceToTarget(dto, WxMpUserEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/AcUserAuthorizeDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/AcUserAuthorizeDao.xml
new file mode 100644
index 0000000000..1cc4a2cb90
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/AcUserAuthorizeDao.xml
@@ -0,0 +1,7 @@
+<?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.dataaggre.dao.epmettduck.AcUserAuthorizeDao">
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/AcUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/AcUserDao.xml
new file mode 100644
index 0000000000..4f535b8f2e
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/AcUserDao.xml
@@ -0,0 +1,6 @@
+<?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.dataaggre.dao.epmettduck.AcUserDao">
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrProjectTemplateCategoryDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrProjectTemplateCategoryDao.xml
new file mode 100644
index 0000000000..96c8a210a6
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrProjectTemplateCategoryDao.xml
@@ -0,0 +1,6 @@
+<?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.dataaggre.dao.epmettduck.PrProjectTemplateCategoryDao">
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrProjectTemplateDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrProjectTemplateDao.xml
new file mode 100644
index 0000000000..c30a76a1f1
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrProjectTemplateDao.xml
@@ -0,0 +1,6 @@
+<?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.dataaggre.dao.epmettduck.PrProjectTemplateDao">
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrProjectTemplateItemDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrProjectTemplateItemDao.xml
new file mode 100644
index 0000000000..197a181c03
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrProjectTemplateItemDao.xml
@@ -0,0 +1,6 @@
+<?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.dataaggre.dao.epmettduck.PrProjectTemplateItemDao">
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrProjectThemeDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrProjectThemeDao.xml
new file mode 100644
index 0000000000..8f4279bdb3
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrProjectThemeDao.xml
@@ -0,0 +1,6 @@
+<?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.dataaggre.dao.epmettduck.PrProjectThemeDao">
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrPublishRangeDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrPublishRangeDao.xml
new file mode 100644
index 0000000000..cc492bd0c7
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrPublishRangeDao.xml
@@ -0,0 +1,6 @@
+<?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.dataaggre.dao.epmettduck.PrPublishRangeDao">
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrResultExtDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrResultExtDao.xml
new file mode 100644
index 0000000000..55290a422c
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrResultExtDao.xml
@@ -0,0 +1,6 @@
+<?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.dataaggre.dao.epmettduck.PrResultExtDao">
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
new file mode 100644
index 0000000000..0573c5a7b6
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
@@ -0,0 +1,6 @@
+<?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.dataaggre.dao.epmettduck.PrUserProjectDao">
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectItemDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectItemDao.xml
new file mode 100644
index 0000000000..f607213e79
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectItemDao.xml
@@ -0,0 +1,6 @@
+<?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.dataaggre.dao.epmettduck.PrUserProjectItemDao">
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectLogicDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectLogicDao.xml
new file mode 100644
index 0000000000..79457b8115
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectLogicDao.xml
@@ -0,0 +1,6 @@
+<?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.dataaggre.dao.epmettduck.PrUserProjectLogicDao">
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectResultDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectResultDao.xml
new file mode 100644
index 0000000000..21518172dc
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectResultDao.xml
@@ -0,0 +1,6 @@
+<?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.dataaggre.dao.epmettduck.PrUserProjectResultDao">
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectSettingDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectSettingDao.xml
new file mode 100644
index 0000000000..690165fcd8
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectSettingDao.xml
@@ -0,0 +1,6 @@
+<?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.dataaggre.dao.epmettduck.PrUserProjectSettingDao">
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectThemeDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectThemeDao.xml
new file mode 100644
index 0000000000..aacfe09e64
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectThemeDao.xml
@@ -0,0 +1,6 @@
+<?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.dataaggre.dao.epmettduck.PrUserProjectThemeDao">
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrVistRecordDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrVistRecordDao.xml
new file mode 100644
index 0000000000..8ea675b0e9
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrVistRecordDao.xml
@@ -0,0 +1,6 @@
+<?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.dataaggre.dao.epmettduck.PrVistRecordDao">
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/WxMpUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/WxMpUserDao.xml
new file mode 100644
index 0000000000..c4886d8ded
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/WxMpUserDao.xml
@@ -0,0 +1,6 @@
+<?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.dataaggre.dao.epmettduck.WxMpUserDao">
+
+</mapper>
\ No newline at end of file

From 8ea8ac7bd2f586e58f74e5e7924bb1968979ed92 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 16 Sep 2021 10:18:51 +0800
Subject: [PATCH 05/68] =?UTF-8?q?userId=E8=87=AA=E5=8A=A8=E5=A1=AB?=
 =?UTF-8?q?=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handler/FieldMetaObjectHandler.java       | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java
index de796f3760..a11a5dea4e 100644
--- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java
+++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java
@@ -20,12 +20,10 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.security.user.SecurityUser;
 import com.epmet.commons.tools.security.user.UserDetail;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.swing.text.html.Option;
 import java.util.Date;
 import java.util.Optional;
 
@@ -52,6 +50,7 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
         if (metaObject.getOriginalObject() instanceof BaseEpmetEntity) {
             // epmet项目新增的
             setFieldValByName(FieldConstant.CUSTOMER_ID_HUMP, getCustomerIdByFieldValue(metaObject), metaObject);
+            setFieldValByName(FieldConstant.USER_ID_HUMP, getCustomerIdByFieldValue(metaObject), metaObject);
             setFieldValByName(FieldConstant.CREATED_TIME_HUMP, getCreatedTimeByFieldValue(metaObject), metaObject);
             setFieldValByName(FieldConstant.CREATED_BY_HUMP, getCreatedByFieldValue(metaObject), metaObject);
             setFieldValByName(FieldConstant.UPDATED_TIME_HUMP, getUpdatedTimeByFieldValue(metaObject), metaObject);
@@ -110,6 +109,27 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
         }
         return loginUserUtil.getLoginUserCustomerId();
     }
+    /**
+     * @Description 获取用户ID
+     * @Param metaObject
+     * @Return {@link Object}
+     * @Author zhaoqifeng
+     * @Date 2021/9/16 10:04
+     */
+    public Object getUserIdByFieldValue(MetaObject metaObject) {
+        if (!metaObject.hasSetter(FieldConstant.USER_ID_HUMP)) {
+            // 如果该entity对象，没有userId属性，那么返回null;
+            return null;
+        }
+
+        Object customerId;
+        customerId = getFieldValByName(FieldConstant.USER_ID_HUMP, metaObject);
+        if (customerId != null && !customerId.equals("")) {
+            // 看entity是否手动设置了，设置了就用设置的
+            return customerId;
+        }
+        return loginUserUtil.getLoginUserId();
+    }
 
     public Object getCreatedTimeByFieldValue(MetaObject metaObject) {
         Object createdTime = null;

From 2b04f7d2b28ede5902b15bb6169fdf54f889b2aa Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 16 Sep 2021 11:06:21 +0800
Subject: [PATCH 06/68] =?UTF-8?q?userId=E8=87=AA=E5=8A=A8=E5=A1=AB?=
 =?UTF-8?q?=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/mybatis/handler/FieldMetaObjectHandler.java  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java
index a11a5dea4e..e4dde4f2fa 100644
--- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java
+++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java
@@ -50,7 +50,6 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
         if (metaObject.getOriginalObject() instanceof BaseEpmetEntity) {
             // epmet项目新增的
             setFieldValByName(FieldConstant.CUSTOMER_ID_HUMP, getCustomerIdByFieldValue(metaObject), metaObject);
-            setFieldValByName(FieldConstant.USER_ID_HUMP, getCustomerIdByFieldValue(metaObject), metaObject);
             setFieldValByName(FieldConstant.CREATED_TIME_HUMP, getCreatedTimeByFieldValue(metaObject), metaObject);
             setFieldValByName(FieldConstant.CREATED_BY_HUMP, getCreatedByFieldValue(metaObject), metaObject);
             setFieldValByName(FieldConstant.UPDATED_TIME_HUMP, getUpdatedTimeByFieldValue(metaObject), metaObject);
@@ -122,11 +121,11 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
             return null;
         }
 
-        Object customerId;
-        customerId = getFieldValByName(FieldConstant.USER_ID_HUMP, metaObject);
-        if (customerId != null && !customerId.equals("")) {
+        Object userId;
+        userId = getFieldValByName(FieldConstant.USER_ID_HUMP, metaObject);
+        if (userId != null && !userId.equals("")) {
             // 看entity是否手动设置了，设置了就用设置的
-            return customerId;
+            return userId;
         }
         return loginUserUtil.getLoginUserId();
     }

From 93475ad7f716d886dcd776b1b4d3a144462be281 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 16 Sep 2021 15:21:50 +0800
Subject: [PATCH 07/68] =?UTF-8?q?=E6=A6=82=E8=A6=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmettduck/form/ProjectKeyCommonDTO.java  | 20 ++++++++++
 .../result/ProjectProfileResultDTO.java       | 39 +++++++++++++++++++
 .../controller/EpmetTDuckController.java      | 27 +++++++++++++
 .../dao/epmettduck/PrUserProjectDao.java      | 11 +++++-
 .../epmettduck/PrUserProjectService.java      | 11 ++++++
 .../impl/PrUserProjectServiceImpl.java        | 17 +++++++-
 .../mapper/epmettduck/PrUserProjectDao.xml    | 14 ++++++-
 7 files changed, 135 insertions(+), 4 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ProjectKeyCommonDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ProjectProfileResultDTO.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ProjectKeyCommonDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ProjectKeyCommonDTO.java
new file mode 100644
index 0000000000..e8aaee1205
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ProjectKeyCommonDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dataaggre.dto.epmettduck.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description projectKey通用
+ * @Author yinzuomei
+ * @Date 2021/9/16 1:32 下午
+ */
+@Data
+public class ProjectKeyCommonDTO implements Serializable {
+
+    /**
+     * 问卷id, 对应pr_user_project.key
+     */
+    private String projectKey;
+}
+
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ProjectProfileResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ProjectProfileResultDTO.java
new file mode 100644
index 0000000000..c5df187969
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ProjectProfileResultDTO.java
@@ -0,0 +1,39 @@
+package com.epmet.dataaggre.dto.epmettduck.result;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 统计图标，上面的一行
+ * @Author yinzuomei
+ * @Date 2021/9/16 2:10 下午
+ */
+@Data
+public class ProjectProfileResultDTO implements Serializable {
+    private static final long serialVersionUID = -6087175682515652086L;
+
+    /**
+     * 问卷id, 对应pr_user_project.key
+     */
+    private String projectKey;
+
+    /**
+     * 采集数量
+     */
+    private Integer collectionTotal;
+
+    //CREATE(1, "未发布"),
+    //RELEASE(2, "收集中"),
+    //STOP(3, "停止发布");
+    private Integer status;
+
+    /**
+     * 采集数量
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+}
+
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
index 746983fdef..72497378a7 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
@@ -1,5 +1,12 @@
 package com.epmet.dataaggre.controller;
 
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dataaggre.dto.epmettduck.form.ProjectKeyCommonDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
+import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -11,4 +18,24 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("questionnaire")
 public class EpmetTDuckController {
+    @Autowired
+    private PrUserProjectService prUserProjectService;
+
+
+    /**
+     * 问卷概要
+     *
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result<com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO>
+     * @author yinzuomei
+     * @date 2021/9/16 2:54 下午
+     */
+    @PostMapping("projectprofile")
+    public Result<ProjectProfileResultDTO> queryProjectProfile(@RequestBody ProjectKeyCommonDTO formDTO){
+        return new Result<ProjectProfileResultDTO>().ok(prUserProjectService.queryProjectProfile(formDTO.getProjectKey()));
+    }
+
+
+
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
index 3076d5647f..ed184e415f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
@@ -1,6 +1,7 @@
 package com.epmet.dataaggre.dao.epmettduck;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -12,5 +13,13 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PrUserProjectDao extends BaseDao<PrUserProjectEntity> {
-	
+    /**
+     * 问卷概要
+     *
+     * @param projectKey
+     * @return  com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO
+     * @author yinzuomei
+     * @date 2021/9/16 2:58 下午
+     */
+    ProjectProfileResultDTO queryProjectProfile(String projectKey);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
index d778e1d9f4..9ff485770a 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
@@ -20,6 +20,7 @@ package com.epmet.dataaggre.service.epmettduck;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 
 import java.util.List;
@@ -92,4 +93,14 @@ public interface PrUserProjectService extends BaseService<PrUserProjectEntity> {
      * @date 2021-09-15
      */
     void delete(String[] ids);
+
+    /**
+     * 问卷概要
+     *
+     * @param projectKey
+     * @return  com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO
+     * @author yinzuomei
+     * @date 2021/9/16 2:54 下午
+     */
+    ProjectProfileResultDTO queryProjectProfile(String projectKey);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 14e46b87d8..27c2f60212 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -20,15 +20,15 @@ package com.epmet.dataaggre.service.epmettduck.impl;
 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.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -97,4 +97,17 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * 问卷概要
+     *
+     * @param projectKey
+     * @return com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO
+     * @author yinzuomei
+     * @date 2021/9/16 2:54 下午
+     */
+    @Override
+    public ProjectProfileResultDTO queryProjectProfile(String projectKey) {
+        return baseDao.queryProjectProfile(projectKey);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
index 0573c5a7b6..f0086b42af 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
@@ -2,5 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao">
-
+    <!--  问卷概要  -->
+    <select id="queryProjectProfile" parameterType="java.lang.String"  resultType="com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO">
+        SELECT
+            m.`key` AS projectKey,
+            m.create_time AS createTime,
+            m.`status`,
+            ( SELECT count( re.id ) FROM pr_user_project_result re WHERE re.project_key = #{projectKey} ) AS collectionTotal
+        FROM
+            pr_user_project m
+        WHERE
+            m.is_deleted = '0'
+          AND m.`key` = #{projectKey}
+    </select>
 </mapper>
\ No newline at end of file

From 44c06c9fd7675d4e27d5dec61f4ee10eae1492e6 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 16 Sep 2021 16:15:11 +0800
Subject: [PATCH 08/68] =?UTF-8?q?=E6=A6=82=E8=A6=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dataaggre/constant/DataSourceConstant.java  | 1 +
 .../epmettduck/impl/AcUserAuthorizeServiceImpl.java       | 8 ++++++--
 .../service/epmettduck/impl/AcUserServiceImpl.java        | 8 ++++++--
 .../impl/PrProjectTemplateCategoryServiceImpl.java        | 5 +++++
 .../epmettduck/impl/PrProjectTemplateItemServiceImpl.java | 8 ++++++--
 .../epmettduck/impl/PrProjectTemplateServiceImpl.java     | 8 ++++++--
 .../epmettduck/impl/PrProjectThemeServiceImpl.java        | 8 ++++++--
 .../epmettduck/impl/PrPublishRangeServiceImpl.java        | 8 ++++++--
 .../service/epmettduck/impl/PrResultExtServiceImpl.java   | 8 ++++++--
 .../epmettduck/impl/PrUserProjectItemServiceImpl.java     | 8 ++++++--
 .../epmettduck/impl/PrUserProjectLogicServiceImpl.java    | 8 ++++++--
 .../epmettduck/impl/PrUserProjectResultServiceImpl.java   | 8 ++++++--
 .../service/epmettduck/impl/PrUserProjectServiceImpl.java | 5 +++++
 .../epmettduck/impl/PrUserProjectSettingServiceImpl.java  | 8 ++++++--
 .../epmettduck/impl/PrUserProjectThemeServiceImpl.java    | 8 ++++++--
 .../service/epmettduck/impl/PrVistRecordServiceImpl.java  | 8 ++++++--
 .../service/epmettduck/impl/WxMpUserServiceImpl.java      | 8 ++++++--
 .../main/resources/mapper/epmettduck/PrUserProjectDao.xml | 4 ++--
 18 files changed, 97 insertions(+), 30 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java
index dd9ab18035..c49ee8b39b 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java
@@ -33,4 +33,5 @@ public interface DataSourceConstant {
 
     String OPERCUSTOMIZE="opercustomize";
     String EPMET_MESSAGE="epmetmessage";
+    String EPMETTDUCK="epmettduck";
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserAuthorizeServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserAuthorizeServiceImpl.java
index 4cddcac638..2887bd8ecf 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserAuthorizeServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserAuthorizeServiceImpl.java
@@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.AcUserAuthorizeDao;
 import com.epmet.dataaggre.dto.epmettduck.AcUserAuthorizeDTO;
 import com.epmet.dataaggre.entity.epmettduck.AcUserAuthorizeEntity;
 import com.epmet.dataaggre.service.epmettduck.AcUserAuthorizeService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -42,6 +44,8 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-15
  */
+@Slf4j
+@DataSource(DataSourceConstant.EPMETTDUCK)
 @Service
 public class AcUserAuthorizeServiceImpl extends BaseServiceImpl<AcUserAuthorizeDao, AcUserAuthorizeEntity> implements AcUserAuthorizeService {
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserServiceImpl.java
index b85ff41893..c53ce7da8e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserServiceImpl.java
@@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.AcUserDao;
 import com.epmet.dataaggre.dto.epmettduck.AcUserDTO;
 import com.epmet.dataaggre.entity.epmettduck.AcUserEntity;
 import com.epmet.dataaggre.service.epmettduck.AcUserService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -42,6 +44,8 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-15
  */
+@Slf4j
+@DataSource(DataSourceConstant.EPMETTDUCK)
 @Service
 public class AcUserServiceImpl extends BaseServiceImpl<AcUserDao, AcUserEntity> implements AcUserService {
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateCategoryServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateCategoryServiceImpl.java
index cd00fb7a9a..bf82320282 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateCategoryServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateCategoryServiceImpl.java
@@ -17,7 +17,10 @@
 
 package com.epmet.dataaggre.service.epmettduck.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.service.epmettduck.PrProjectTemplateCategoryService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 /**
@@ -26,6 +29,8 @@ import org.springframework.stereotype.Service;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-15
  */
+@Slf4j
+@DataSource(DataSourceConstant.EPMETTDUCK)
 @Service
 public class PrProjectTemplateCategoryServiceImpl implements PrProjectTemplateCategoryService {
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateItemServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateItemServiceImpl.java
index cdee7cae3b..a903234d27 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateItemServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateItemServiceImpl.java
@@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrProjectTemplateItemDao;
 import com.epmet.dataaggre.dto.epmettduck.PrProjectTemplateItemDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrProjectTemplateItemEntity;
 import com.epmet.dataaggre.service.epmettduck.PrProjectTemplateItemService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -42,6 +44,8 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-15
  */
+@Slf4j
+@DataSource(DataSourceConstant.EPMETTDUCK)
 @Service
 public class PrProjectTemplateItemServiceImpl extends BaseServiceImpl<PrProjectTemplateItemDao, PrProjectTemplateItemEntity> implements PrProjectTemplateItemService {
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateServiceImpl.java
index 51c0932019..29eabe1520 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateServiceImpl.java
@@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrProjectTemplateDao;
 import com.epmet.dataaggre.dto.epmettduck.PrProjectTemplateDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrProjectTemplateEntity;
 import com.epmet.dataaggre.service.epmettduck.PrProjectTemplateService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -42,6 +44,8 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-15
  */
+@Slf4j
+@DataSource(DataSourceConstant.EPMETTDUCK)
 @Service
 public class PrProjectTemplateServiceImpl extends BaseServiceImpl<PrProjectTemplateDao, PrProjectTemplateEntity> implements PrProjectTemplateService {
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectThemeServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectThemeServiceImpl.java
index db86a529d7..07345640c1 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectThemeServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectThemeServiceImpl.java
@@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrProjectThemeDao;
 import com.epmet.dataaggre.dto.epmettduck.PrProjectThemeDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrProjectThemeEntity;
 import com.epmet.dataaggre.service.epmettduck.PrProjectThemeService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -42,6 +44,8 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-15
  */
+@Slf4j
+@DataSource(DataSourceConstant.EPMETTDUCK)
 @Service
 public class PrProjectThemeServiceImpl extends BaseServiceImpl<PrProjectThemeDao, PrProjectThemeEntity> implements PrProjectThemeService {
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java
index f89d60925a..c6bb01a72e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java
@@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrPublishRangeDao;
 import com.epmet.dataaggre.dto.epmettduck.PrPublishRangeDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrPublishRangeEntity;
 import com.epmet.dataaggre.service.epmettduck.PrPublishRangeService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -42,6 +44,8 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-15
  */
+@Slf4j
+@DataSource(DataSourceConstant.EPMETTDUCK)
 @Service
 public class PrPublishRangeServiceImpl extends BaseServiceImpl<PrPublishRangeDao, PrPublishRangeEntity> implements PrPublishRangeService {
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrResultExtServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrResultExtServiceImpl.java
index fa3011975b..00bff5e49e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrResultExtServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrResultExtServiceImpl.java
@@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrResultExtDao;
 import com.epmet.dataaggre.dto.epmettduck.PrResultExtDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrResultExtEntity;
 import com.epmet.dataaggre.service.epmettduck.PrResultExtService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -42,6 +44,8 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-15
  */
+@Slf4j
+@DataSource(DataSourceConstant.EPMETTDUCK)
 @Service
 public class PrResultExtServiceImpl extends BaseServiceImpl<PrResultExtDao, PrResultExtEntity> implements PrResultExtService {
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java
index 7b61e6a6e7..c6b97866b1 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java
@@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrUserProjectItemDao;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectItemDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectItemService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -42,6 +44,8 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-15
  */
+@Slf4j
+@DataSource(DataSourceConstant.EPMETTDUCK)
 @Service
 public class PrUserProjectItemServiceImpl extends BaseServiceImpl<PrUserProjectItemDao, PrUserProjectItemEntity> implements PrUserProjectItemService {
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectLogicServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectLogicServiceImpl.java
index ed3a9ede57..052d9252a6 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectLogicServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectLogicServiceImpl.java
@@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrUserProjectLogicDao;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectLogicDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectLogicEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectLogicService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -42,6 +44,8 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-15
  */
+@Slf4j
+@DataSource(DataSourceConstant.EPMETTDUCK)
 @Service
 public class PrUserProjectLogicServiceImpl extends BaseServiceImpl<PrUserProjectLogicDao, PrUserProjectLogicEntity> implements PrUserProjectLogicService {
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectResultServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectResultServiceImpl.java
index 5d45b7e36d..884b2f2384 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectResultServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectResultServiceImpl.java
@@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrUserProjectResultDao;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectResultDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectResultService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -42,6 +44,8 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-15
  */
+@Slf4j
+@DataSource(DataSourceConstant.EPMETTDUCK)
 @Service
 public class PrUserProjectResultServiceImpl extends BaseServiceImpl<PrUserProjectResultDao, PrUserProjectResultEntity> implements PrUserProjectResultService {
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 27c2f60212..850cd1eff0 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -19,15 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -42,6 +45,8 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-15
  */
+@Slf4j
+@DataSource(DataSourceConstant.EPMETTDUCK)
 @Service
 public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao, PrUserProjectEntity> implements PrUserProjectService {
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectSettingServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectSettingServiceImpl.java
index 67bf9b50a5..cbfb3989f0 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectSettingServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectSettingServiceImpl.java
@@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrUserProjectSettingDao;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectSettingDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectSettingEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectSettingService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -42,6 +44,8 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-15
  */
+@Slf4j
+@DataSource(DataSourceConstant.EPMETTDUCK)
 @Service
 public class PrUserProjectSettingServiceImpl extends BaseServiceImpl<PrUserProjectSettingDao, PrUserProjectSettingEntity> implements PrUserProjectSettingService {
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectThemeServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectThemeServiceImpl.java
index d153971e1f..ef204311f3 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectThemeServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectThemeServiceImpl.java
@@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrUserProjectThemeDao;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectThemeDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectThemeEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectThemeService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -42,6 +44,8 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-15
  */
+@Slf4j
+@DataSource(DataSourceConstant.EPMETTDUCK)
 @Service
 public class PrUserProjectThemeServiceImpl extends BaseServiceImpl<PrUserProjectThemeDao, PrUserProjectThemeEntity> implements PrUserProjectThemeService {
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java
index 5427486bb9..408701f7ce 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java
@@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrVistRecordDao;
 import com.epmet.dataaggre.dto.epmettduck.PrVistRecordDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrVistRecordEntity;
 import com.epmet.dataaggre.service.epmettduck.PrVistRecordService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -42,6 +44,8 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-15
  */
+@Slf4j
+@DataSource(DataSourceConstant.EPMETTDUCK)
 @Service
 public class PrVistRecordServiceImpl extends BaseServiceImpl<PrVistRecordDao, PrVistRecordEntity> implements PrVistRecordService {
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/WxMpUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/WxMpUserServiceImpl.java
index bd5d459e90..ac4e961890 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/WxMpUserServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/WxMpUserServiceImpl.java
@@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.WxMpUserDao;
 import com.epmet.dataaggre.dto.epmettduck.WxMpUserDTO;
 import com.epmet.dataaggre.entity.epmettduck.WxMpUserEntity;
 import com.epmet.dataaggre.service.epmettduck.WxMpUserService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -42,6 +44,8 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-15
  */
+@Slf4j
+@DataSource(DataSourceConstant.EPMETTDUCK)
 @Service
 public class WxMpUserServiceImpl extends BaseServiceImpl<WxMpUserDao, WxMpUserEntity> implements WxMpUserService {
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
index f0086b42af..1e12a386e7 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
@@ -6,13 +6,13 @@
     <select id="queryProjectProfile" parameterType="java.lang.String"  resultType="com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO">
         SELECT
             m.`key` AS projectKey,
-            m.create_time AS createTime,
+            m.created_time AS createTime,
             m.`status`,
             ( SELECT count( re.id ) FROM pr_user_project_result re WHERE re.project_key = #{projectKey} ) AS collectionTotal
         FROM
             pr_user_project m
         WHERE
-            m.is_deleted = '0'
+            m.del_flag = '0'
           AND m.`key` = #{projectKey}
     </select>
 </mapper>
\ No newline at end of file

From 2d604918a627e80f12ce2fb1d4151d26e41d96f1 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 16 Sep 2021 16:39:39 +0800
Subject: [PATCH 09/68] =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-aggregator-client/pom.xml            |  6 ++
 .../constant/DataSourceConstant.java          |  3 +
 .../dto/epmettduck/AcUserAuthorizeDTO.java    | 29 ++++++-
 .../dataaggre/dto/epmettduck/AcUserDTO.java   | 27 ++++--
 .../PrProjectTemplateCategoryDTO.java         | 27 +++++-
 .../dto/epmettduck/PrProjectTemplateDTO.java  | 26 +++++-
 .../epmettduck/PrProjectTemplateItemDTO.java  | 26 +++++-
 .../dto/epmettduck/PrProjectThemeDTO.java     | 25 +++++-
 .../dto/epmettduck/PrPublishRangeDTO.java     | 27 ++++--
 .../dto/epmettduck/PrResultExtDTO.java        | 27 ++++--
 .../dto/epmettduck/PrUserProjectDTO.java      | 25 ++++--
 .../dto/epmettduck/PrUserProjectItemDTO.java  | 26 +++++-
 .../dto/epmettduck/PrUserProjectLogicDTO.java | 24 +++++-
 .../epmettduck/PrUserProjectResultDTO.java    | 24 +++++-
 .../epmettduck/PrUserProjectSettingDTO.java   | 26 +++++-
 .../dto/epmettduck/PrUserProjectThemeDTO.java | 26 +++++-
 .../dto/epmettduck/PrVistRecordDTO.java       | 27 ++++--
 .../dto/epmettduck/ProjectItemTypeEnum.java   | 72 ++++++++++++++++
 .../dataaggre/dto/epmettduck/WxMpUserDTO.java | 26 +++++-
 .../epmettduck/form/TDuckDetailFormDTO.java   | 31 +++++++
 .../struct/CascaderExpandStruct.java          | 45 ++++++++++
 .../struct/CheckboxExpandStruct.java          | 44 ++++++++++
 .../epmettduck/struct/ColorExpandStruct.java  | 14 ++++
 .../epmettduck/struct/DateExpandStruct.java   | 20 +++++
 .../struct/DateRangeExpandStruct.java         | 14 ++++
 .../struct/DescTextExpandStruct.java          | 24 ++++++
 .../struct/DividerExpandStruct.java           | 15 ++++
 .../epmettduck/struct/EmptyExpandStruct.java  | 10 +++
 .../struct/ImageCarouselExpandStruct.java     | 25 ++++++
 .../epmettduck/struct/ImageExpandStruct.java  | 12 +++
 .../struct/ImageSelectExpandStruct.java       | 31 +++++++
 .../epmettduck/struct/InputExpandStruct.java  | 36 ++++++++
 .../struct/ItemDefaultValueStruct.java        | 21 +++++
 .../epmettduck/struct/NumberExpandStruct.java | 38 +++++++++
 .../struct/PaginationExpandStruct.java        | 13 +++
 .../epmettduck/struct/RadioExpandStruct.java  | 31 +++++++
 .../epmettduck/struct/RateExpandStruct.java   | 35 ++++++++
 .../epmettduck/struct/SelectExpandStruct.java | 47 +++++++++++
 .../struct/SignPadExpandStruct.java           | 19 +++++
 .../epmettduck/struct/SliderExpandStruct.java | 35 ++++++++
 .../epmettduck/struct/SwitchExpandStruct.java | 14 ++++
 .../struct/TextareaExpandStruct.java          | 27 ++++++
 .../epmettduck/struct/TimeExpandStruct.java   | 14 ++++
 .../struct/TimeRangeExpandStruct.java         | 14 ++++
 .../epmettduck/struct/UploadExpandStruct.java | 53 ++++++++++++
 .../epmettduck/struct/UploadResultStruct.java | 22 +++++
 .../controller/EpmetTDuckController.java      | 28 +++++++
 .../epmettduck/AcUserAuthorizeEntity.java     | 10 ---
 .../entity/epmettduck/AcUserEntity.java       | 14 ----
 .../PrProjectTemplateCategoryEntity.java      | 13 +--
 .../epmettduck/PrProjectTemplateEntity.java   |  9 --
 .../PrProjectTemplateItemEntity.java          | 10 ---
 .../epmettduck/PrProjectThemeEntity.java      | 10 ---
 .../epmettduck/PrPublishRangeEntity.java      | 15 ----
 .../entity/epmettduck/PrResultExtEntity.java  | 15 ----
 .../epmettduck/PrUserProjectEntity.java       | 15 ----
 .../epmettduck/PrUserProjectItemEntity.java   | 42 +++++-----
 .../epmettduck/PrUserProjectLogicEntity.java  | 10 ---
 .../epmettduck/PrUserProjectResultEntity.java | 10 ---
 .../PrUserProjectSettingEntity.java           | 10 ---
 .../epmettduck/PrUserProjectThemeEntity.java  | 10 ---
 .../entity/epmettduck/PrVistRecordEntity.java | 15 ----
 .../entity/epmettduck/WxMpUserEntity.java     | 10 ---
 .../epmettduck/PrUserProjectItemService.java  | 83 ++-----------------
 .../impl/PrUserProjectItemServiceImpl.java    | 79 ++++++------------
 65 files changed, 1226 insertions(+), 385 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/ProjectItemTypeEnum.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckDetailFormDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CheckboxExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ColorExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DateExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DateRangeExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DescTextExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DividerExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/EmptyExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageCarouselExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageSelectExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/InputExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ItemDefaultValueStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/NumberExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/PaginationExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RadioExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RateExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SignPadExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SliderExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SwitchExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TextareaExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TimeExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TimeRangeExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/UploadExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/UploadResultStruct.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/pom.xml b/epmet-module/data-aggregator/data-aggregator-client/pom.xml
index 4e8beca881..7f6f4cd2ff 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/pom.xml
+++ b/epmet-module/data-aggregator/data-aggregator-client/pom.xml
@@ -17,6 +17,12 @@
             <artifactId>epmet-commons-tools</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-annotation</artifactId>
+            <version>3.2.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java
index c49ee8b39b..8ae93cc5d4 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java
@@ -32,6 +32,9 @@ public interface DataSourceConstant {
     String EVALUATION_INDEX = "evaluationIndex";
 
     String OPERCUSTOMIZE="opercustomize";
+
     String EPMET_MESSAGE="epmetmessage";
+
+    String EPMET_T_DUCK = "epmettduck";
     String EPMETTDUCK="epmettduck";
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserAuthorizeDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserAuthorizeDTO.java
index e987a07ea4..3db0c9939d 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserAuthorizeDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserAuthorizeDTO.java
@@ -51,14 +51,35 @@ public class AcUserAuthorizeDTO implements Serializable {
      */
 	private String userInfo;
 
+
     /**
-     * 
+     * 删除标识 1删除；0未删除
      */
-	private Date createTime;
+    private String delFlag;
 
     /**
-     * 
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
      */
-	private Date updateTime;
+    private Date updatedTime;
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserDTO.java
index 89b8157c9c..a1bb83f55b 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserDTO.java
@@ -89,18 +89,33 @@ public class AcUserDTO implements Serializable {
 	private String lastLoginIp;
 
     /**
-     * 状态
+     * 删除标识 1删除；0未删除
      */
-	private Integer deleted;
+    private String delFlag;
 
     /**
-     * 
+     * 乐观锁
      */
-	private Date createTime;
+    private Integer revision;
 
     /**
-     * 
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
      */
-	private Date updateTime;
+    private Date updatedTime;
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateCategoryDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateCategoryDTO.java
index 476c97019b..8c0956058f 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateCategoryDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateCategoryDTO.java
@@ -36,7 +36,7 @@ public class PrProjectTemplateCategoryDTO implements Serializable {
     /**
      * 
      */
-	private Long id;
+	private String id;
 
     /**
      * 客户Id
@@ -54,13 +54,32 @@ public class PrProjectTemplateCategoryDTO implements Serializable {
 	private Integer sort;
 
     /**
-     * 更新时间
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
      */
-	private Date updateTime;
+    private String createdBy;
 
     /**
      * 创建时间
      */
-	private Date createTime;
+    private Date createdTime;
 
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateDTO.java
index c5cab8a752..1b995189c6 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateDTO.java
@@ -79,13 +79,33 @@ public class PrProjectTemplateDTO implements Serializable {
 	private Integer status;
 
     /**
-     * 更新时间
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
      */
-	private Date updateTime;
+    private String createdBy;
 
     /**
      * 创建时间
      */
-	private Date createTime;
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateItemDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateItemDTO.java
index c407e0c52d..2174d4f39d 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateItemDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateItemDTO.java
@@ -104,14 +104,34 @@ public class PrProjectTemplateItemDTO implements Serializable {
 	private String regList;
 
     /**
-     * 更新时间
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
      */
-	private Date updateTime;
+    private String createdBy;
 
     /**
      * 创建时间
      */
-	private Date createTime;
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
 
     /**
      * 展示类型组件
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectThemeDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectThemeDTO.java
index 0c3168ff7e..8bf8538c2a 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectThemeDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectThemeDTO.java
@@ -70,13 +70,32 @@ public class PrProjectThemeDTO implements Serializable {
 	private String btnsColor;
 
     /**
-     * 更新时间
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
      */
-	private Date updateTime;
+    private String createdBy;
 
     /**
      * 创建时间
      */
-	private Date createTime;
+    private Date createdTime;
 
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrPublishRangeDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrPublishRangeDTO.java
index 5e5f8ef311..944965d1ec 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrPublishRangeDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrPublishRangeDTO.java
@@ -64,18 +64,33 @@ public class PrPublishRangeDTO implements Serializable {
 	private String orgType;
 
     /**
-     * 状态
+     * 删除标识 1删除；0未删除
      */
-	private Integer deleted;
+    private String delFlag;
 
     /**
-     * 
+     * 乐观锁
      */
-	private Date createTime;
+    private Integer revision;
 
     /**
-     * 
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
      */
-	private Date updateTime;
+    private Date updatedTime;
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrResultExtDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrResultExtDTO.java
index 85bc9f6ac9..4f0ade42a5 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrResultExtDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrResultExtDTO.java
@@ -69,18 +69,33 @@ public class PrResultExtDTO implements Serializable {
 	private String fromOrgType;
 
     /**
-     * 状态
+     * 删除标识 1删除；0未删除
      */
-	private Integer deleted;
+    private String delFlag;
 
     /**
-     * 
+     * 乐观锁
      */
-	private Date createTime;
+    private Integer revision;
 
     /**
-     * 
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
      */
-	private Date updateTime;
+    private Date updatedTime;
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectDTO.java
index 2217879d96..7f9bba34cb 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectDTO.java
@@ -89,18 +89,33 @@ public class PrUserProjectDTO implements Serializable {
 	private String client;
 
     /**
-     * 是否删除
+     * 删除标识 1删除；0未删除
      */
-	private Integer isDeleted;
+    private String delFlag;
 
     /**
-     * 更新时间
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
      */
-	private Date updateTime;
+    private String createdBy;
 
     /**
      * 创建时间
      */
-	private Date createTime;
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectItemDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectItemDTO.java
index 3bd5f2eb1d..614236b09c 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectItemDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectItemDTO.java
@@ -109,13 +109,33 @@ public class PrUserProjectItemDTO implements Serializable {
 	private String regList;
 
     /**
-     * 更新时间
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
      */
-	private Date updateTime;
+    private String createdBy;
 
     /**
      * 创建时间
      */
-	private Date createTime;
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectLogicDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectLogicDTO.java
index d59b6617ea..901a8b41ba 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectLogicDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectLogicDTO.java
@@ -63,14 +63,34 @@ public class PrUserProjectLogicDTO implements Serializable {
      */
 	private String conditionList;
 
+    /**
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
     /**
      * 创建时间
      */
-	private Date createTime;
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
 
     /**
      * 更新时间
      */
-	private Date updateTime;
+    private Date updatedTime;
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectResultDTO.java
index fe59df25bb..dd81d962fc 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectResultDTO.java
@@ -108,14 +108,34 @@ public class PrUserProjectResultDTO implements Serializable {
      */
 	private String wxUserInfo;
 
+    /**
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
     /**
      * 创建时间
      */
-	private Date createTime;
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
 
     /**
      * 更新时间
      */
-	private Date updateTime;
+    private Date updatedTime;
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectSettingDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectSettingDTO.java
index 461d064f9a..bb44c7e351 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectSettingDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectSettingDTO.java
@@ -154,13 +154,33 @@ public class PrUserProjectSettingDTO implements Serializable {
 	private String shareDesc;
 
     /**
-     * 更新时间
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
      */
-	private Date updateTime;
+    private String createdBy;
 
     /**
      * 创建时间
      */
-	private Date createTime;
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectThemeDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectThemeDTO.java
index 52575ded34..e42dd917fc 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectThemeDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectThemeDTO.java
@@ -94,13 +94,33 @@ public class PrUserProjectThemeDTO implements Serializable {
 	private Integer showNumber;
 
     /**
-     * 更新时间
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
      */
-	private Date updateTime;
+    private String createdBy;
 
     /**
      * 创建时间
      */
-	private Date createTime;
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrVistRecordDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrVistRecordDTO.java
index f35b8731a5..7e747c2680 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrVistRecordDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrVistRecordDTO.java
@@ -59,18 +59,33 @@ public class PrVistRecordDTO implements Serializable {
 	private String projectKey;
 
     /**
-     * 状态
+     * 删除标识 1删除；0未删除
      */
-	private Integer deleted;
+    private String delFlag;
 
     /**
-     * 
+     * 乐观锁
      */
-	private Date createTime;
+    private Integer revision;
 
     /**
-     * 
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
      */
-	private Date updateTime;
+    private Date updatedTime;
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/ProjectItemTypeEnum.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/ProjectItemTypeEnum.java
new file mode 100644
index 0000000000..13eb7a3eca
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/ProjectItemTypeEnum.java
@@ -0,0 +1,72 @@
+package com.epmet.dataaggre.dto.epmettduck;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.epmet.dataaggre.dto.epmettduck.struct.*;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/16 2:28 下午
+ * @DESC
+ */
+@AllArgsConstructor
+@Getter
+public enum ProjectItemTypeEnum {
+
+    INPUT("INPUT", "单行文本", InputExpandStruct.class),
+    TEXTAREA("TEXTAREA", "多行文本", TextareaExpandStruct.class),
+    PASSWORD_INPUT("PASSWORD_INPUT", "密码输入", null),
+    NUMBER_INPUT("NUMBER_INPUT", "数字输入", NumberExpandStruct.class),
+    SELECT("SELECT", "下拉框", SelectExpandStruct.class),
+    CASCADER("CASCADER", "级联选择", CascaderExpandStruct.class),
+    RADIO("RADIO", "单选框", RadioExpandStruct.class),
+    CHECKBOX("CHECKBOX", "多选框", CheckboxExpandStruct.class),
+    SWITCH("SWITCH", "开关", SwitchExpandStruct.class),
+    SLIDER("SLIDER", "滑块", SliderExpandStruct.class),
+    TIME("TIME", "时间选择", TimeExpandStruct.class),
+    TIME_RANGE("TIME_RANGE", "时间范围", TimeRangeExpandStruct.class),
+    DATE("DATE", "日期选择", DateExpandStruct.class),
+    DATE_RANGE("DATE_RANGE", "日期范围", DateRangeExpandStruct.class),
+    RATE("RATE", "评分", RateExpandStruct.class),
+    COLOR("COLOR", "颜色", ColorExpandStruct.class),
+    UPLOAD("UPLOAD", "文件上传组件", UploadExpandStruct.class),
+    IMAGE("IMAGE", "图片展示", ImageExpandStruct.class),
+    IMAGE_SELECT("IMAGE_SELECT", "图片选择", ImageSelectExpandStruct.class),
+    IMAGE_CAROUSEL("IMAGE_CAROUSEL", "图片轮播", ImageCarouselExpandStruct.class),
+    DESC_TEXT("DESC_TEXT", "文字描述", DescTextExpandStruct.class),
+    SIGN_PAD("SIGN_PAD", "手写签名", SignPadExpandStruct.class),
+    PAGINATION("PAGINATION", "分页", PaginationExpandStruct.class),
+    DIVIDER("DIVIDER", "分割线", DividerExpandStruct.class),
+    PROVINCE_CITY("PROVINCE_CITY", "省市联动", EmptyExpandStruct.class),
+    PHONE_VERIFICATION("PHONE_VERIFICATION", "手机号验证", EmptyExpandStruct.class),
+    INPUT_MAP("INPUT_MAP", "地理位置", EmptyExpandStruct.class);
+
+    @EnumValue
+    @JsonValue
+    private String value;
+
+    private String desc;
+    /**
+     * 扩展属性类
+     */
+    private Class expandClass;
+
+    /**
+     * 枚举入参注解
+     *
+     * @param value
+     * @return
+     */
+    @JsonCreator
+    public static ProjectItemTypeEnum getByValue(String value) {
+        for (ProjectItemTypeEnum typeEnum : values()) {
+            if (typeEnum.getValue().equals(value)) {
+                return typeEnum;
+            }
+        }
+        return null;
+    }
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/WxMpUserDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/WxMpUserDTO.java
index bda847abdd..e50b5fffab 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/WxMpUserDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/WxMpUserDTO.java
@@ -94,13 +94,33 @@ public class WxMpUserDTO implements Serializable {
 	private String userId;
 
     /**
-     * 更新时间
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
      */
-	private Date updateTime;
+    private String createdBy;
 
     /**
      * 创建时间
      */
-	private Date createTime;
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckDetailFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckDetailFormDTO.java
new file mode 100644
index 0000000000..8796d3291b
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckDetailFormDTO.java
@@ -0,0 +1,31 @@
+package com.epmet.dataaggre.dto.epmettduck.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/16 2:00 下午
+ * @DESC
+ */
+@Data
+public class TDuckDetailFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 3793280475377993346L;
+
+    public interface TDuckDetailForm{}
+
+    /**
+     * 项目key
+     */
+    @NotBlank(message = "项目key不能为空",groups = TDuckDetailForm.class)
+    private String key;
+    /**
+     * 是否显示类型
+     */
+    @NotNull(message = "是否显示类型不能为空",groups = TDuckDetailForm.class)
+    private Boolean displayType;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java
new file mode 100644
index 0000000000..ebc62596f8
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java
@@ -0,0 +1,45 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : smalljop
+ * @description : 级联选择
+ * @create : 2020-11-19 15:13
+ **/
+@Data
+public class CascaderExpandStruct {
+    /**
+     * 选项
+     */
+    private List<Option> options;
+
+    /**
+     * 塞选
+     */
+    private Boolean filterable;
+
+    /**
+     * 多选
+     */
+    private Boolean multiple;
+
+    /**
+     * 分割符
+     */
+    private String separator;
+
+    /**
+     * 显示全路径
+     */
+    private Boolean showAllLevels;
+
+    public static class Option {
+        public Integer id;
+        public String label;
+        public String value;
+        public List<Option> children;
+    }
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CheckboxExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CheckboxExpandStruct.java
new file mode 100644
index 0000000000..788bb12aa9
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CheckboxExpandStruct.java
@@ -0,0 +1,44 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : smalljop
+ * @description : 颜色选择
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class CheckboxExpandStruct {
+    /**
+     * 最小
+     */
+    private Integer min;
+    /**
+     * 最大
+     */
+    private Integer max;
+
+    /**
+     * 选项类型
+     */
+    private String optionType;
+
+    /**
+     * 选项是按钮时大小
+     */
+    private String size;
+
+    /**
+     * 选项
+     */
+    private List<Option> options;
+
+
+    public static class Option {
+        public String label;
+        public Integer value;
+    }
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ColorExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ColorExpandStruct.java
new file mode 100644
index 0000000000..42dc7d96b5
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ColorExpandStruct.java
@@ -0,0 +1,14 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 颜色选择
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class ColorExpandStruct {
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DateExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DateExpandStruct.java
new file mode 100644
index 0000000000..4ab27c65ab
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DateExpandStruct.java
@@ -0,0 +1,20 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 日期选择
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class DateExpandStruct {
+
+    // 日期类型
+    private String type;
+    // 日期格式
+    private String format;
+    // 日期格式
+    private String valueFormat;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DateRangeExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DateRangeExpandStruct.java
new file mode 100644
index 0000000000..e92ff2c35c
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DateRangeExpandStruct.java
@@ -0,0 +1,14 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 日期范围
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class DateRangeExpandStruct {
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DescTextExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DescTextExpandStruct.java
new file mode 100644
index 0000000000..28392247dd
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DescTextExpandStruct.java
@@ -0,0 +1,24 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+
+import lombok.Data;
+
+/**
+ * 文字描述组件属性
+ *
+ * @author smalljop
+ */
+@Data
+public class DescTextExpandStruct {
+    /**
+     * 颜色
+     */
+    private String color;
+
+    /**
+     * 文字位置
+     */
+    private String textAlign;
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DividerExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DividerExpandStruct.java
new file mode 100644
index 0000000000..7561201063
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DividerExpandStruct.java
@@ -0,0 +1,15 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+
+import lombok.Data;
+
+/**
+ * 分割线组件属性
+ *
+ * @author smalljop
+ */
+@Data
+public class DividerExpandStruct {
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/EmptyExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/EmptyExpandStruct.java
new file mode 100644
index 0000000000..d192629832
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/EmptyExpandStruct.java
@@ -0,0 +1,10 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * 无扩展属性
+ */
+@Data
+public class EmptyExpandStruct {
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageCarouselExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageCarouselExpandStruct.java
new file mode 100644
index 0000000000..e6b2296f88
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageCarouselExpandStruct.java
@@ -0,0 +1,25 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : smalljop
+ * @description : 颜色选择
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class ImageCarouselExpandStruct {
+
+    /**
+     * 选项
+     */
+    private List<Option> options;
+
+    public static class Option {
+        public String image;
+        public String label;
+    }
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageExpandStruct.java
new file mode 100644
index 0000000000..0048186f76
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageExpandStruct.java
@@ -0,0 +1,12 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+
+import lombok.Data;
+
+@Data
+public class ImageExpandStruct {
+    private String src;
+
+    private String alt;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageSelectExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageSelectExpandStruct.java
new file mode 100644
index 0000000000..014399fcac
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageSelectExpandStruct.java
@@ -0,0 +1,31 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : smalljop
+ * @description : 颜色选择
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class ImageSelectExpandStruct {
+
+    /**
+     * 选项
+     */
+    private List<Option> options;
+
+    /**
+     * 是否多选
+     */
+    private Boolean multiple;
+
+    public static class Option {
+        public String image;
+        public String label;
+        public Integer value;
+    }
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/InputExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/InputExpandStruct.java
new file mode 100644
index 0000000000..ddece7ae8e
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/InputExpandStruct.java
@@ -0,0 +1,36 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 输入框配置
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class InputExpandStruct {
+
+    /**
+     * 前缀
+     */
+    public String prepend;
+    /**
+     * 后缀
+     */
+    public String append;
+
+    /**
+     * 最大长度
+     */
+    private Long maxlength;
+
+    /**
+     * 前置图标
+     */
+    private String prefixIcon;
+
+    /**
+     * 显示可输入字数
+     */
+    private Boolean showWordLimit;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ItemDefaultValueStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ItemDefaultValueStruct.java
new file mode 100644
index 0000000000..f8ff73512c
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ItemDefaultValueStruct.java
@@ -0,0 +1,21 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ItemDefaultValueStruct {
+    /**
+     * 值是否是Json
+     */
+    private boolean json;
+    /**
+     * 默认值具体值
+     */
+    private Object value;
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/NumberExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/NumberExpandStruct.java
new file mode 100644
index 0000000000..2dd6094a76
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/NumberExpandStruct.java
@@ -0,0 +1,38 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 数字型输入
+ * @create : 2020-11-19 15:13
+ **/
+@Data
+public class NumberExpandStruct {
+    /**
+     * 最小
+     */
+    private Integer min;
+    /**
+     * 最大
+     */
+    private Integer max;
+    /**
+     * 计数器步长 每次+几
+     */
+    private Integer step;
+    /**
+     * 是否只能输入 step 的倍数
+     */
+    private Boolean stepStrictly;
+
+    /**
+     * 经度
+     */
+    private Integer precision;
+
+    /**
+     * 按钮控制位置
+     */
+    private String controlsPosition;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/PaginationExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/PaginationExpandStruct.java
new file mode 100644
index 0000000000..e4c8567e06
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/PaginationExpandStruct.java
@@ -0,0 +1,13 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 分页组件属性
+ * @create :  2021/05/19 10:29
+ **/
+@Data
+public class PaginationExpandStruct {
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RadioExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RadioExpandStruct.java
new file mode 100644
index 0000000000..a9ea86b5d4
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RadioExpandStruct.java
@@ -0,0 +1,31 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : smalljop
+ * @description : d
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class RadioExpandStruct {
+
+    /**
+     * 选项样式
+     */
+    private String optionType;
+
+
+    /**
+     * 选项
+     */
+    private List<Option> options;
+
+
+    public static class Option {
+        public String label;
+        public Integer value;
+    }
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RateExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RateExpandStruct.java
new file mode 100644
index 0000000000..ab29b16895
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RateExpandStruct.java
@@ -0,0 +1,35 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 评分
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class RateExpandStruct {
+
+    /**
+     * 最大分数
+     */
+    private Integer max;
+    /**
+     * 允许半选
+     */
+    private Boolean allowHalf;
+    /**
+     * 辅助文字
+     */
+    private Boolean showText;
+    /**
+     * 显示分数
+     */
+    private Boolean showScore;
+    /**
+     * 禁用
+     */
+    private Boolean disabled;
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java
new file mode 100644
index 0000000000..27788d5ea6
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java
@@ -0,0 +1,47 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : smalljop
+ * @description : 下拉框
+ * @create : 2020-11-19 15:13
+ **/
+@Data
+public class SelectExpandStruct {
+    /**
+     * 选项
+     */
+    private List<Option> options;
+    /**
+     * 最大
+     */
+    private Boolean multiple;
+
+    /**
+     * 塞选
+     */
+    private Boolean filterable;
+    /**
+     * 是否只能输入 step 的倍数
+     */
+    private Boolean stepStrictly;
+
+    /**
+     * 经度
+     */
+    private Integer precision;
+
+    /**
+     * 按钮控制位置
+     */
+    private String controlsPosition;
+
+
+    public static class Option {
+        public String label;
+        public Integer value;
+    }
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SignPadExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SignPadExpandStruct.java
new file mode 100644
index 0000000000..1ef3b0244e
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SignPadExpandStruct.java
@@ -0,0 +1,19 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+
+import lombok.Data;
+
+/**
+ * 手写签名组件属性
+ *
+ * @author smalljop
+ */
+@Data
+public class SignPadExpandStruct {
+    /**
+     * 颜色
+     */
+    private String color;
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SliderExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SliderExpandStruct.java
new file mode 100644
index 0000000000..007614250a
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SliderExpandStruct.java
@@ -0,0 +1,35 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 滑块
+ * @create : 2020-11-19 15:13
+ **/
+@Data
+public class SliderExpandStruct {
+    /**
+     * 最小
+     */
+    private Integer min;
+    /**
+     * 最大
+     */
+    private Integer max;
+    /**
+     * 计数器步长 每次+几
+     */
+    private Integer step;
+
+
+    /**
+     * 是否是范围选择
+     */
+    private Boolean range;
+
+    /**
+     * 按钮控制位置
+     */
+    private String controlsPosition;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SwitchExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SwitchExpandStruct.java
new file mode 100644
index 0000000000..af96d2e567
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SwitchExpandStruct.java
@@ -0,0 +1,14 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 输入框配置
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class SwitchExpandStruct {
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TextareaExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TextareaExpandStruct.java
new file mode 100644
index 0000000000..828dc7b5f3
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TextareaExpandStruct.java
@@ -0,0 +1,27 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 多行文本
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class TextareaExpandStruct {
+
+    /**
+     * 最大行数
+     */
+    public Integer maxRows;
+    /**
+     * 最小行数
+     */
+    public Integer minRows;
+
+    /**
+     * 最大长度
+     */
+    private Long maxlength;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TimeExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TimeExpandStruct.java
new file mode 100644
index 0000000000..e505722dd0
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TimeExpandStruct.java
@@ -0,0 +1,14 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 时间选择
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class TimeExpandStruct {
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TimeRangeExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TimeRangeExpandStruct.java
new file mode 100644
index 0000000000..6ecd0a89c8
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TimeRangeExpandStruct.java
@@ -0,0 +1,14 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 时间区间选择
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class TimeRangeExpandStruct {
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/UploadExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/UploadExpandStruct.java
new file mode 100644
index 0000000000..28ede6b16b
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/UploadExpandStruct.java
@@ -0,0 +1,53 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 上传文件
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class UploadExpandStruct {
+
+
+    /**
+     * 按钮文字
+     */
+    private String buttonText;
+
+    /**
+     * 显示提示
+     */
+    private Boolean showTip;
+
+    /**
+     * 文件大小
+     */
+    private Long fileSize;
+
+    /**
+     * 大小单位
+     */
+    private String sizeUnit;
+
+    /**
+     * 显示列表类型
+     */
+    private String listType;
+
+
+    /**
+     * 文件数字
+     */
+    private Integer limit;
+
+    /**
+     * 是否可以多选
+     */
+    private boolean multiple;
+    /**
+     * 允许上传的文件类型
+     */
+    private String accept;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/UploadResultStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/UploadResultStruct.java
new file mode 100644
index 0000000000..f45409966b
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/UploadResultStruct.java
@@ -0,0 +1,22 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : smalljop
+ * @description : 上传收集结果
+ * @create :  2021/06/07 16:37
+ **/
+@Data
+public class UploadResultStruct {
+
+    private List<UploadFile> files;
+
+    @Data
+    public static class UploadFile {
+        private String fileName;
+        private String url;
+    }
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
index 72497378a7..7e07962a5c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
@@ -1,5 +1,15 @@
 package com.epmet.dataaggre.controller;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dataaggre.dto.epmettduck.form.TDuckDetailFormDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity;
+import com.epmet.dataaggre.service.epmettduck.PrUserProjectItemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dataaggre.dto.epmettduck.form.ProjectKeyCommonDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
@@ -10,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Author zxc
  * @DateTime 2021/9/15 2:43 下午
@@ -38,4 +50,20 @@ public class EpmetTDuckController {
 
 
 
+
+    @Autowired
+    private PrUserProjectItemService projectItemService;
+
+    /**
+     * @Description 问卷调查详情
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/9/16 2:51 下午
+     */
+    @PostMapping("detail")
+    public Result<List<PrUserProjectItemEntity>> queryProjectItem(@RequestBody TDuckDetailFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, TDuckDetailFormDTO.TDuckDetailForm.class);
+        return new Result<List<PrUserProjectItemEntity>>().ok(projectItemService.queryProjectItem(formDTO));
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserAuthorizeEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserAuthorizeEntity.java
index d2b4fe4330..8573983676 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserAuthorizeEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserAuthorizeEntity.java
@@ -73,14 +73,4 @@ public class AcUserAuthorizeEntity extends BaseEpmetEntity {
      */
 	private String userInfo;
 
-    /**
-     * 
-     */
-	private Date createTime;
-
-    /**
-     * 
-     */
-	private Date updateTime;
-
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserEntity.java
index a9f4e9d95f..3b6f74e8ab 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserEntity.java
@@ -93,19 +93,5 @@ public class AcUserEntity extends BaseEpmetEntity {
      */
 	private String lastLoginIp;
 
-    /**
-     * 状态
-     */
-	private Integer deleted;
-
-    /**
-     * 
-     */
-	private Date createTime;
-
-    /**
-     * 
-     */
-	private Date updateTime;
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateCategoryEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateCategoryEntity.java
index 1e0ccb3caa..c575a16456 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateCategoryEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateCategoryEntity.java
@@ -34,14 +34,14 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper=false)
 @TableName("pr_project_template_category")
-public class PrProjectTemplateCategoryEntity{
+public class PrProjectTemplateCategoryEntity extends BaseEpmetEntity{
 
 	private static final long serialVersionUID = 1L;
 
     /**
      * 
      */
-	private Long id;
+	private String id;
 
     /**
      * 客户Id
@@ -58,14 +58,5 @@ public class PrProjectTemplateCategoryEntity{
      */
 	private Integer sort;
 
-    /**
-     * 更新时间
-     */
-	private Date updateTime;
-
-    /**
-     * 创建时间
-     */
-	private Date createTime;
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateEntity.java
index bfaa3af466..6d87744261 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateEntity.java
@@ -83,14 +83,5 @@ public class PrProjectTemplateEntity extends BaseEpmetEntity {
      */
 	private Integer status;
 
-    /**
-     * 更新时间
-     */
-	private Date updateTime;
-
-    /**
-     * 创建时间
-     */
-	private Date createTime;
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateItemEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateItemEntity.java
index c20c913d91..4b109d6df9 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateItemEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateItemEntity.java
@@ -108,16 +108,6 @@ public class PrProjectTemplateItemEntity extends BaseEpmetEntity {
      */
 	private String regList;
 
-    /**
-     * 更新时间
-     */
-	private Date updateTime;
-
-    /**
-     * 创建时间
-     */
-	private Date createTime;
-
     /**
      * 展示类型组件
      */
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectThemeEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectThemeEntity.java
index 35a3ec32ff..b3790a9b43 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectThemeEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectThemeEntity.java
@@ -74,14 +74,4 @@ public class PrProjectThemeEntity extends BaseEpmetEntity {
      */
 	private String btnsColor;
 
-    /**
-     * 更新时间
-     */
-	private Date updateTime;
-
-    /**
-     * 创建时间
-     */
-	private Date createTime;
-
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrPublishRangeEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrPublishRangeEntity.java
index d19f53e636..c69e65d3f1 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrPublishRangeEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrPublishRangeEntity.java
@@ -68,19 +68,4 @@ public class PrPublishRangeEntity extends BaseEpmetEntity {
      */
 	private String orgType;
 
-    /**
-     * 状态
-     */
-	private Integer deleted;
-
-    /**
-     * 
-     */
-	private Date createTime;
-
-    /**
-     * 
-     */
-	private Date updateTime;
-
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrResultExtEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrResultExtEntity.java
index da87abe0f0..00029fd51b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrResultExtEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrResultExtEntity.java
@@ -73,19 +73,4 @@ public class PrResultExtEntity extends BaseEpmetEntity {
      */
 	private String fromOrgType;
 
-    /**
-     * 状态
-     */
-	private Integer deleted;
-
-    /**
-     * 
-     */
-	private Date createTime;
-
-    /**
-     * 
-     */
-	private Date updateTime;
-
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectEntity.java
index a898676a18..c32091af26 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectEntity.java
@@ -93,19 +93,4 @@ public class PrUserProjectEntity extends BaseEpmetEntity {
      */
 	private String client;
 
-    /**
-     * 是否删除
-     */
-	private Integer isDeleted;
-
-    /**
-     * 更新时间
-     */
-	private Date updateTime;
-
-    /**
-     * 创建时间
-     */
-	private Date createTime;
-
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java
index 19a67f5e65..e3524996d6 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java
@@ -17,13 +17,20 @@
 
 package com.epmet.dataaggre.entity.epmettduck;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import com.epmet.dataaggre.dto.epmettduck.ProjectItemTypeEnum;
+import com.epmet.dataaggre.dto.epmettduck.struct.ItemDefaultValueStruct;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.EnumTypeHandler;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 项目表单项
@@ -34,15 +41,10 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper=false)
 @TableName("pr_user_project_item")
-public class PrUserProjectItemEntity extends BaseEpmetEntity {
+public class PrUserProjectItemEntity extends BaseEpmetEntity{
 
 	private static final long serialVersionUID = 1L;
 
-    /**
-     * 
-     */
-	private String id;
-
     /**
      * 客户Id
      */
@@ -61,7 +63,8 @@ public class PrUserProjectItemEntity extends BaseEpmetEntity {
     /**
      * 表单项类型 
      */
-	private String type;
+	@TableField(typeHandler = EnumTypeHandler.class)
+	private ProjectItemTypeEnum type;
 
     /**
      * 表单项标题
@@ -71,22 +74,24 @@ public class PrUserProjectItemEntity extends BaseEpmetEntity {
     /**
      * 展示类型组件
      */
-	private Integer isDisplayType;
+	@TableField("is_display_type")
+	private Integer displayType;
 
     /**
      * 是否显示标签
      */
-	private Integer showLabel;
+	private Boolean showLabel;
 
     /**
      * 表单项默认值
      */
-	private String defaultValue;
+	@TableField(value = "default_value",typeHandler = JacksonTypeHandler.class)
+	private ItemDefaultValueStruct defaultValue;
 
     /**
      * 是否必填
      */
-	private Integer required;
+	private Boolean required;
 
     /**
      * 输入型提示文字
@@ -106,21 +111,14 @@ public class PrUserProjectItemEntity extends BaseEpmetEntity {
     /**
      * 扩展字段 表单项独有字段
      */
-	private String expand;
+	@TableField(typeHandler = JacksonTypeHandler.class)
+	private Map<String, Object> expand;
 
     /**
      * 正则表达式 
      */
-	private String regList;
-
-    /**
-     * 更新时间
-     */
-	private Date updateTime;
+	@TableField(typeHandler = JacksonTypeHandler.class)
+	private List<Map<String, Object>> regList;
 
-    /**
-     * 创建时间
-     */
-	private Date createTime;
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectLogicEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectLogicEntity.java
index 0e1e8ce4f5..7c565fed9e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectLogicEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectLogicEntity.java
@@ -68,14 +68,4 @@ public class PrUserProjectLogicEntity extends BaseEpmetEntity {
      */
 	private String conditionList;
 
-    /**
-     * 创建时间
-     */
-	private Date createTime;
-
-    /**
-     * 更新时间
-     */
-	private Date updateTime;
-
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectResultEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectResultEntity.java
index 5d1cfa1f7f..9f46a03222 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectResultEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectResultEntity.java
@@ -113,14 +113,4 @@ public class PrUserProjectResultEntity extends BaseEpmetEntity {
      */
 	private String wxUserInfo;
 
-    /**
-     * 创建时间
-     */
-	private Date createTime;
-
-    /**
-     * 更新时间
-     */
-	private Date updateTime;
-
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectSettingEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectSettingEntity.java
index 89de31449a..d4b352e21b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectSettingEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectSettingEntity.java
@@ -158,14 +158,4 @@ public class PrUserProjectSettingEntity extends BaseEpmetEntity {
      */
 	private String shareDesc;
 
-    /**
-     * 更新时间
-     */
-	private Date updateTime;
-
-    /**
-     * 创建时间
-     */
-	private Date createTime;
-
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectThemeEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectThemeEntity.java
index 09eb0a1f35..db6d6192a8 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectThemeEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectThemeEntity.java
@@ -98,14 +98,4 @@ public class PrUserProjectThemeEntity extends BaseEpmetEntity {
      */
 	private Integer showNumber;
 
-    /**
-     * 更新时间
-     */
-	private Date updateTime;
-
-    /**
-     * 创建时间
-     */
-	private Date createTime;
-
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrVistRecordEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrVistRecordEntity.java
index fb748bc4fd..00864276e1 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrVistRecordEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrVistRecordEntity.java
@@ -63,19 +63,4 @@ public class PrVistRecordEntity extends BaseEpmetEntity {
      */
 	private String projectKey;
 
-    /**
-     * 状态
-     */
-	private Integer deleted;
-
-    /**
-     * 
-     */
-	private Date createTime;
-
-    /**
-     * 
-     */
-	private Date updateTime;
-
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/WxMpUserEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/WxMpUserEntity.java
index 3562215829..e51905536c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/WxMpUserEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/WxMpUserEntity.java
@@ -98,14 +98,4 @@ public class WxMpUserEntity extends BaseEpmetEntity {
      */
 	private String userId;
 
-    /**
-     * 更新时间
-     */
-	private Date updateTime;
-
-    /**
-     * 创建时间
-     */
-	private Date createTime;
-
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectItemService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectItemService.java
index 6ac1399035..74d1ddd332 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectItemService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectItemService.java
@@ -1,25 +1,10 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.epmet.dataaggre.service.epmettduck;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectItemDTO;
+import com.epmet.dataaggre.dto.epmettduck.form.TDuckDetailFormDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity;
 
 import java.util.List;
@@ -31,65 +16,13 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-15
  */
-public interface PrUserProjectItemService extends BaseService<PrUserProjectItemEntity> {
-
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<PrUserProjectItemDTO>
-     * @author generator
-     * @date 2021-09-15
-     */
-    PageData<PrUserProjectItemDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<PrUserProjectItemDTO>
-     * @author generator
-     * @date 2021-09-15
-     */
-    List<PrUserProjectItemDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return PrUserProjectItemDTO
-     * @author generator
-     * @date 2021-09-15
-     */
-    PrUserProjectItemDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2021-09-15
-     */
-    void save(PrUserProjectItemDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2021-09-15
-     */
-    void update(PrUserProjectItemDTO dto);
+public interface PrUserProjectItemService extends IService<PrUserProjectItemEntity> {
 
     /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2021-09-15
+     * @Description 问卷调查详情
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/9/16 2:51 下午
      */
-    void delete(String[] ids);
+    List<PrUserProjectItemEntity> queryProjectItem(TDuckDetailFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java
index c6b97866b1..32d849ea89 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java
@@ -17,23 +17,32 @@
 
 package com.epmet.dataaggre.service.epmettduck.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrUserProjectItemDao;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectItemDTO;
+import com.epmet.dataaggre.dto.epmettduck.form.TDuckDetailFormDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectItemService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -44,61 +53,27 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-15
  */
-@Slf4j
-@DataSource(DataSourceConstant.EPMETTDUCK)
 @Service
-public class PrUserProjectItemServiceImpl extends BaseServiceImpl<PrUserProjectItemDao, PrUserProjectItemEntity> implements PrUserProjectItemService {
+@Slf4j
+@DataSource(DataSourceConstant.EPMET_T_DUCK)
+public class PrUserProjectItemServiceImpl extends ServiceImpl<PrUserProjectItemDao, PrUserProjectItemEntity> implements PrUserProjectItemService {
 
+    /**
+     * @Description 问卷调查详情
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/9/16 2:51 下午
+     */
     @Override
-    public PageData<PrUserProjectItemDTO> page(Map<String, Object> params) {
-        IPage<PrUserProjectItemEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
+    public List<PrUserProjectItemEntity> queryProjectItem(TDuckDetailFormDTO formDTO) {
+        List<PrUserProjectItemEntity> itemEntityList = list(Wrappers.<PrUserProjectItemEntity>lambdaQuery()
+                .eq(PrUserProjectItemEntity::getProjectKey, formDTO.getKey())
+                .eq(PrUserProjectItemEntity::getDisplayType,formDTO.getDisplayType())
+                .orderByAsc(PrUserProjectItemEntity::getSort)
         );
-        return getPageData(page, PrUserProjectItemDTO.class);
-    }
-
-    @Override
-    public List<PrUserProjectItemDTO> list(Map<String, Object> params) {
-        List<PrUserProjectItemEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, PrUserProjectItemDTO.class);
-    }
-
-    private QueryWrapper<PrUserProjectItemEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<PrUserProjectItemEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
+        if (CollectionUtils.isEmpty(itemEntityList)){
+            return new ArrayList<>();
+        }
+        return itemEntityList;
     }
-
-    @Override
-    public PrUserProjectItemDTO get(String id) {
-        PrUserProjectItemEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, PrUserProjectItemDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(PrUserProjectItemDTO dto) {
-        PrUserProjectItemEntity entity = ConvertUtils.sourceToTarget(dto, PrUserProjectItemEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(PrUserProjectItemDTO dto) {
-        PrUserProjectItemEntity entity = ConvertUtils.sourceToTarget(dto, PrUserProjectItemEntity.class);
-        updateById(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
-    }
-
 }
\ No newline at end of file

From b19afe51386f0b0d2d03a1278cef953059c6a100 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 16 Sep 2021 16:47:39 +0800
Subject: [PATCH 10/68] =?UTF-8?q?=E8=A1=A5=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/epmettduck/PrUserProjectItemEntity.java          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java
index e3524996d6..e01e439e9a 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java
@@ -26,6 +26,8 @@ import com.epmet.dataaggre.dto.epmettduck.ProjectItemTypeEnum;
 import com.epmet.dataaggre.dto.epmettduck.struct.ItemDefaultValueStruct;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import lombok.experimental.FieldNameConstants;
 import org.apache.ibatis.type.EnumTypeHandler;
 
 import java.util.Date;
@@ -40,7 +42,9 @@ import java.util.Map;
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("pr_user_project_item")
+@Accessors(chain = true)
+@TableName(value = "pr_user_project_item", autoResultMap = true)
+@FieldNameConstants
 public class PrUserProjectItemEntity extends BaseEpmetEntity{
 
 	private static final long serialVersionUID = 1L;

From 2521c22e98263a98c52b83b41714d6763e138e8c Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 17 Sep 2021 10:44:47 +0800
Subject: [PATCH 11/68] emm

---
 .../controller/EpmetTDuckController.java          |  9 ++-------
 .../impl/PrUserProjectItemServiceImpl.java        | 15 ---------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
index 7e07962a5c..1b8bac231f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
@@ -32,6 +32,8 @@ import java.util.List;
 public class EpmetTDuckController {
     @Autowired
     private PrUserProjectService prUserProjectService;
+    @Autowired
+    private PrUserProjectItemService projectItemService;
 
 
     /**
@@ -47,13 +49,6 @@ public class EpmetTDuckController {
         return new Result<ProjectProfileResultDTO>().ok(prUserProjectService.queryProjectProfile(formDTO.getProjectKey()));
     }
 
-
-
-
-
-    @Autowired
-    private PrUserProjectItemService projectItemService;
-
     /**
      * @Description 问卷调查详情
      * @Param formDTO
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java
index 32d849ea89..3078d9221c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java
@@ -17,35 +17,20 @@
 
 package com.epmet.dataaggre.service.epmettduck.impl;
 
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.epmet.commons.dynamic.datasource.annotation.DataSource;
-import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.FieldConstant;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.dataaggre.constant.DataSourceConstant;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrUserProjectItemDao;
-import com.epmet.dataaggre.dto.epmettduck.PrUserProjectItemDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckDetailFormDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectItemService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 项目表单项

From 0271d4bd4863db4ff8988116bb2b49175253d7c5 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 17 Sep 2021 12:21:50 +0800
Subject: [PATCH 12/68] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-aggregator-client/pom.xml            |   6 +
 .../dataaggre/dto/epmettduck/InputMapDTO.java |  19 ++
 .../result/AnalysisReportResDTO.java          |  67 +++++++
 .../struct/CascaderExpandStruct.java          |  45 +++++
 .../struct/CheckboxExpandStruct.java          |  44 +++++
 .../epmettduck/struct/ColorExpandStruct.java  |  14 ++
 .../epmettduck/struct/DateExpandStruct.java   |  20 +++
 .../struct/DateRangeExpandStruct.java         |  14 ++
 .../struct/DescTextExpandStruct.java          |  24 +++
 .../struct/DividerExpandStruct.java           |  15 ++
 .../epmettduck/struct/EmptyExpandStruct.java  |  10 ++
 .../struct/ImageCarouselExpandStruct.java     |  25 +++
 .../epmettduck/struct/ImageExpandStruct.java  |  12 ++
 .../struct/ImageSelectExpandStruct.java       |  31 ++++
 .../epmettduck/struct/InputExpandStruct.java  |  36 ++++
 .../struct/ItemDefaultValueStruct.java        |  21 +++
 .../epmettduck/struct/NumberExpandStruct.java |  38 ++++
 .../struct/PaginationExpandStruct.java        |  13 ++
 .../epmettduck/struct/RadioExpandStruct.java  |  31 ++++
 .../epmettduck/struct/RateExpandStruct.java   |  35 ++++
 .../epmettduck/struct/SelectExpandStruct.java |  46 +++++
 .../struct/SignPadExpandStruct.java           |  19 ++
 .../epmettduck/struct/SliderExpandStruct.java |  35 ++++
 .../epmettduck/struct/SwitchExpandStruct.java |  14 ++
 .../struct/TextareaExpandStruct.java          |  27 +++
 .../epmettduck/struct/TimeExpandStruct.java   |  14 ++
 .../struct/TimeRangeExpandStruct.java         |  14 ++
 .../epmettduck/struct/UploadExpandStruct.java |  53 ++++++
 .../epmettduck/struct/UploadResultStruct.java |  22 +++
 .../dataaggre/enums/ProjectItemTypeEnum.java  |  77 ++++++++
 .../controller/EpmetTDuckController.java      |  16 +-
 .../dao/epmettduck/PrUserProjectDao.java      |  24 +++
 .../epmettduck/PrUserProjectService.java      |  11 ++
 .../impl/PrUserProjectServiceImpl.java        | 165 +++++++++++++++++-
 .../mapper/epmettduck/PrUserProjectDao.xml    |  32 ++++
 35 files changed, 1085 insertions(+), 4 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/InputMapDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CheckboxExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ColorExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DateExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DateRangeExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DescTextExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DividerExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/EmptyExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageCarouselExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageSelectExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/InputExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ItemDefaultValueStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/NumberExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/PaginationExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RadioExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RateExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SignPadExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SliderExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SwitchExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TextareaExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TimeExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TimeRangeExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/UploadExpandStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/UploadResultStruct.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/enums/ProjectItemTypeEnum.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/pom.xml b/epmet-module/data-aggregator/data-aggregator-client/pom.xml
index 4e8beca881..7f6f4cd2ff 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/pom.xml
+++ b/epmet-module/data-aggregator/data-aggregator-client/pom.xml
@@ -17,6 +17,12 @@
             <artifactId>epmet-commons-tools</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-annotation</artifactId>
+            <version>3.2.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/InputMapDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/InputMapDTO.java
new file mode 100644
index 0000000000..befdf3ae93
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/InputMapDTO.java
@@ -0,0 +1,19 @@
+package com.epmet.dataaggre.dto.epmettduck;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description TODO
+ * @Author yinzuomei
+ * @Date 2021/9/16 11:34 下午
+ */
+@Data
+public class InputMapDTO implements Serializable {
+    private BigDecimal longitude;
+    private BigDecimal latitude;
+    private String address;
+}
+
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java
new file mode 100644
index 0000000000..a2c48ff103
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java
@@ -0,0 +1,67 @@
+package com.epmet.dataaggre.dto.epmettduck.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+import org.apache.poi.ss.formula.functions.T;
+
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * @Description TODO
+ * @Author yinzuomei
+ * @Date 2021/9/16 5:30 下午
+ */
+@Data
+public class AnalysisReportResDTO implements Serializable {
+    private static final long serialVersionUID = -1637286883477938648L;
+
+    /**
+     * 项目key
+     */
+    private String projectKey;
+
+    /**
+     * 表单项类型
+     */
+    private String type;
+
+    /**
+     * 表单项标题
+     */
+    private String label;
+
+    /**
+     * 表单项Id
+     */
+    private String formItemId;
+
+    /**
+     * 展示类型组件
+     */
+    private Integer isDisplayType;
+
+    /**
+     * 是否显示标签
+     */
+    private Integer showLabel;
+
+    /**
+     * 是否必填
+     */
+    private Integer required;
+
+    /**
+     * 排序
+     */
+    private Long sort;
+
+    private Map<String, T> detail;
+
+    /**
+     * 扩展字段 表单项独有字段
+     */
+    @JsonIgnore
+    private String expand;
+}
+
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java
new file mode 100644
index 0000000000..ebc62596f8
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java
@@ -0,0 +1,45 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : smalljop
+ * @description : 级联选择
+ * @create : 2020-11-19 15:13
+ **/
+@Data
+public class CascaderExpandStruct {
+    /**
+     * 选项
+     */
+    private List<Option> options;
+
+    /**
+     * 塞选
+     */
+    private Boolean filterable;
+
+    /**
+     * 多选
+     */
+    private Boolean multiple;
+
+    /**
+     * 分割符
+     */
+    private String separator;
+
+    /**
+     * 显示全路径
+     */
+    private Boolean showAllLevels;
+
+    public static class Option {
+        public Integer id;
+        public String label;
+        public String value;
+        public List<Option> children;
+    }
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CheckboxExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CheckboxExpandStruct.java
new file mode 100644
index 0000000000..788bb12aa9
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CheckboxExpandStruct.java
@@ -0,0 +1,44 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : smalljop
+ * @description : 颜色选择
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class CheckboxExpandStruct {
+    /**
+     * 最小
+     */
+    private Integer min;
+    /**
+     * 最大
+     */
+    private Integer max;
+
+    /**
+     * 选项类型
+     */
+    private String optionType;
+
+    /**
+     * 选项是按钮时大小
+     */
+    private String size;
+
+    /**
+     * 选项
+     */
+    private List<Option> options;
+
+
+    public static class Option {
+        public String label;
+        public Integer value;
+    }
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ColorExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ColorExpandStruct.java
new file mode 100644
index 0000000000..42dc7d96b5
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ColorExpandStruct.java
@@ -0,0 +1,14 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 颜色选择
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class ColorExpandStruct {
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DateExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DateExpandStruct.java
new file mode 100644
index 0000000000..4ab27c65ab
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DateExpandStruct.java
@@ -0,0 +1,20 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 日期选择
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class DateExpandStruct {
+
+    // 日期类型
+    private String type;
+    // 日期格式
+    private String format;
+    // 日期格式
+    private String valueFormat;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DateRangeExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DateRangeExpandStruct.java
new file mode 100644
index 0000000000..e92ff2c35c
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DateRangeExpandStruct.java
@@ -0,0 +1,14 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 日期范围
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class DateRangeExpandStruct {
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DescTextExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DescTextExpandStruct.java
new file mode 100644
index 0000000000..28392247dd
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DescTextExpandStruct.java
@@ -0,0 +1,24 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+
+import lombok.Data;
+
+/**
+ * 文字描述组件属性
+ *
+ * @author smalljop
+ */
+@Data
+public class DescTextExpandStruct {
+    /**
+     * 颜色
+     */
+    private String color;
+
+    /**
+     * 文字位置
+     */
+    private String textAlign;
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DividerExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DividerExpandStruct.java
new file mode 100644
index 0000000000..7561201063
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DividerExpandStruct.java
@@ -0,0 +1,15 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+
+import lombok.Data;
+
+/**
+ * 分割线组件属性
+ *
+ * @author smalljop
+ */
+@Data
+public class DividerExpandStruct {
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/EmptyExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/EmptyExpandStruct.java
new file mode 100644
index 0000000000..d192629832
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/EmptyExpandStruct.java
@@ -0,0 +1,10 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * 无扩展属性
+ */
+@Data
+public class EmptyExpandStruct {
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageCarouselExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageCarouselExpandStruct.java
new file mode 100644
index 0000000000..e6b2296f88
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageCarouselExpandStruct.java
@@ -0,0 +1,25 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : smalljop
+ * @description : 颜色选择
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class ImageCarouselExpandStruct {
+
+    /**
+     * 选项
+     */
+    private List<Option> options;
+
+    public static class Option {
+        public String image;
+        public String label;
+    }
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageExpandStruct.java
new file mode 100644
index 0000000000..0048186f76
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageExpandStruct.java
@@ -0,0 +1,12 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+
+import lombok.Data;
+
+@Data
+public class ImageExpandStruct {
+    private String src;
+
+    private String alt;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageSelectExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageSelectExpandStruct.java
new file mode 100644
index 0000000000..014399fcac
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageSelectExpandStruct.java
@@ -0,0 +1,31 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : smalljop
+ * @description : 颜色选择
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class ImageSelectExpandStruct {
+
+    /**
+     * 选项
+     */
+    private List<Option> options;
+
+    /**
+     * 是否多选
+     */
+    private Boolean multiple;
+
+    public static class Option {
+        public String image;
+        public String label;
+        public Integer value;
+    }
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/InputExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/InputExpandStruct.java
new file mode 100644
index 0000000000..ddece7ae8e
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/InputExpandStruct.java
@@ -0,0 +1,36 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 输入框配置
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class InputExpandStruct {
+
+    /**
+     * 前缀
+     */
+    public String prepend;
+    /**
+     * 后缀
+     */
+    public String append;
+
+    /**
+     * 最大长度
+     */
+    private Long maxlength;
+
+    /**
+     * 前置图标
+     */
+    private String prefixIcon;
+
+    /**
+     * 显示可输入字数
+     */
+    private Boolean showWordLimit;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ItemDefaultValueStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ItemDefaultValueStruct.java
new file mode 100644
index 0000000000..f8ff73512c
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ItemDefaultValueStruct.java
@@ -0,0 +1,21 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ItemDefaultValueStruct {
+    /**
+     * 值是否是Json
+     */
+    private boolean json;
+    /**
+     * 默认值具体值
+     */
+    private Object value;
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/NumberExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/NumberExpandStruct.java
new file mode 100644
index 0000000000..2dd6094a76
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/NumberExpandStruct.java
@@ -0,0 +1,38 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 数字型输入
+ * @create : 2020-11-19 15:13
+ **/
+@Data
+public class NumberExpandStruct {
+    /**
+     * 最小
+     */
+    private Integer min;
+    /**
+     * 最大
+     */
+    private Integer max;
+    /**
+     * 计数器步长 每次+几
+     */
+    private Integer step;
+    /**
+     * 是否只能输入 step 的倍数
+     */
+    private Boolean stepStrictly;
+
+    /**
+     * 经度
+     */
+    private Integer precision;
+
+    /**
+     * 按钮控制位置
+     */
+    private String controlsPosition;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/PaginationExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/PaginationExpandStruct.java
new file mode 100644
index 0000000000..e4c8567e06
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/PaginationExpandStruct.java
@@ -0,0 +1,13 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 分页组件属性
+ * @create :  2021/05/19 10:29
+ **/
+@Data
+public class PaginationExpandStruct {
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RadioExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RadioExpandStruct.java
new file mode 100644
index 0000000000..a9ea86b5d4
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RadioExpandStruct.java
@@ -0,0 +1,31 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : smalljop
+ * @description : d
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class RadioExpandStruct {
+
+    /**
+     * 选项样式
+     */
+    private String optionType;
+
+
+    /**
+     * 选项
+     */
+    private List<Option> options;
+
+
+    public static class Option {
+        public String label;
+        public Integer value;
+    }
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RateExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RateExpandStruct.java
new file mode 100644
index 0000000000..ab29b16895
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RateExpandStruct.java
@@ -0,0 +1,35 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 评分
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class RateExpandStruct {
+
+    /**
+     * 最大分数
+     */
+    private Integer max;
+    /**
+     * 允许半选
+     */
+    private Boolean allowHalf;
+    /**
+     * 辅助文字
+     */
+    private Boolean showText;
+    /**
+     * 显示分数
+     */
+    private Boolean showScore;
+    /**
+     * 禁用
+     */
+    private Boolean disabled;
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java
new file mode 100644
index 0000000000..c2767c711f
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java
@@ -0,0 +1,46 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : smalljop
+ * @description : 下拉框
+ * @create : 2020-11-19 15:13
+ **/
+@Data
+public class SelectExpandStruct {
+    /**
+     * 选项
+     */
+    private List<Option> options;
+    /**
+     * 最大
+     */
+    private Boolean multiple;
+
+    /**
+     * 塞选
+     */
+    private Boolean filterable;
+    /**
+     * 是否只能输入 step 的倍数
+     */
+    private Boolean stepStrictly;
+
+    /**
+     * 经度
+     */
+    private Integer precision;
+
+    /**
+     * 按钮控制位置
+     */
+    private String controlsPosition;
+
+
+    public static class Option {
+        public String label;
+        public Integer value;
+    }
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SignPadExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SignPadExpandStruct.java
new file mode 100644
index 0000000000..1ef3b0244e
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SignPadExpandStruct.java
@@ -0,0 +1,19 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+
+import lombok.Data;
+
+/**
+ * 手写签名组件属性
+ *
+ * @author smalljop
+ */
+@Data
+public class SignPadExpandStruct {
+    /**
+     * 颜色
+     */
+    private String color;
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SliderExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SliderExpandStruct.java
new file mode 100644
index 0000000000..007614250a
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SliderExpandStruct.java
@@ -0,0 +1,35 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 滑块
+ * @create : 2020-11-19 15:13
+ **/
+@Data
+public class SliderExpandStruct {
+    /**
+     * 最小
+     */
+    private Integer min;
+    /**
+     * 最大
+     */
+    private Integer max;
+    /**
+     * 计数器步长 每次+几
+     */
+    private Integer step;
+
+
+    /**
+     * 是否是范围选择
+     */
+    private Boolean range;
+
+    /**
+     * 按钮控制位置
+     */
+    private String controlsPosition;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SwitchExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SwitchExpandStruct.java
new file mode 100644
index 0000000000..af96d2e567
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SwitchExpandStruct.java
@@ -0,0 +1,14 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 输入框配置
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class SwitchExpandStruct {
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TextareaExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TextareaExpandStruct.java
new file mode 100644
index 0000000000..828dc7b5f3
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TextareaExpandStruct.java
@@ -0,0 +1,27 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 多行文本
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class TextareaExpandStruct {
+
+    /**
+     * 最大行数
+     */
+    public Integer maxRows;
+    /**
+     * 最小行数
+     */
+    public Integer minRows;
+
+    /**
+     * 最大长度
+     */
+    private Long maxlength;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TimeExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TimeExpandStruct.java
new file mode 100644
index 0000000000..e505722dd0
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TimeExpandStruct.java
@@ -0,0 +1,14 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 时间选择
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class TimeExpandStruct {
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TimeRangeExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TimeRangeExpandStruct.java
new file mode 100644
index 0000000000..6ecd0a89c8
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TimeRangeExpandStruct.java
@@ -0,0 +1,14 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 时间区间选择
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class TimeRangeExpandStruct {
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/UploadExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/UploadExpandStruct.java
new file mode 100644
index 0000000000..28ede6b16b
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/UploadExpandStruct.java
@@ -0,0 +1,53 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+/**
+ * @author : smalljop
+ * @description : 上传文件
+ * @create : 2020-11-19 11:42
+ **/
+@Data
+public class UploadExpandStruct {
+
+
+    /**
+     * 按钮文字
+     */
+    private String buttonText;
+
+    /**
+     * 显示提示
+     */
+    private Boolean showTip;
+
+    /**
+     * 文件大小
+     */
+    private Long fileSize;
+
+    /**
+     * 大小单位
+     */
+    private String sizeUnit;
+
+    /**
+     * 显示列表类型
+     */
+    private String listType;
+
+
+    /**
+     * 文件数字
+     */
+    private Integer limit;
+
+    /**
+     * 是否可以多选
+     */
+    private boolean multiple;
+    /**
+     * 允许上传的文件类型
+     */
+    private String accept;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/UploadResultStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/UploadResultStruct.java
new file mode 100644
index 0000000000..f45409966b
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/UploadResultStruct.java
@@ -0,0 +1,22 @@
+package com.epmet.dataaggre.dto.epmettduck.struct;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : smalljop
+ * @description : 上传收集结果
+ * @create :  2021/06/07 16:37
+ **/
+@Data
+public class UploadResultStruct {
+
+    private List<UploadFile> files;
+
+    @Data
+    public static class UploadFile {
+        private String fileName;
+        private String url;
+    }
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/enums/ProjectItemTypeEnum.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/enums/ProjectItemTypeEnum.java
new file mode 100644
index 0000000000..fdca95ad1a
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/enums/ProjectItemTypeEnum.java
@@ -0,0 +1,77 @@
+package com.epmet.dataaggre.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import com.epmet.dataaggre.dto.epmettduck.struct.*;
+/**
+ * @author : smalljop
+ * @description : 表单项类型枚举
+ * @create : 2020-11-19 10:51
+ **/
+@AllArgsConstructor
+@Getter
+public enum ProjectItemTypeEnum {
+    //联系人组件：
+    INPUT("INPUT", "单行文本", InputExpandStruct.class),
+    TEXTAREA("TEXTAREA", "多行文本", TextareaExpandStruct.class),
+    PASSWORD_INPUT("PASSWORD_INPUT", "密码输入", null),
+    NUMBER_INPUT("NUMBER_INPUT", "数字输入", NumberExpandStruct.class),
+    SELECT("SELECT", "下拉框", SelectExpandStruct.class),
+    CASCADER("CASCADER", "级联选择", CascaderExpandStruct.class),
+    RADIO("RADIO", "单选框", RadioExpandStruct.class),
+    CHECKBOX("CHECKBOX", "多选框", CheckboxExpandStruct.class),
+    SWITCH("SWITCH", "开关", SwitchExpandStruct.class),
+    TIME("TIME", "时间选择", TimeExpandStruct.class),
+    TIME_RANGE("TIME_RANGE", "时间范围", TimeRangeExpandStruct.class),
+    DATE("DATE", "日期选择", DateExpandStruct.class),
+    DATE_RANGE("DATE_RANGE", "日期范围", DateRangeExpandStruct.class),
+    RATE("RATE", "评分", RateExpandStruct.class),
+    PROVINCE_CITY("PROVINCE_CITY", "省市联动", EmptyExpandStruct.class),
+    INPUT_MAP("INPUT_MAP", "地理位置", EmptyExpandStruct.class),
+
+    // 以下不分析
+    PHONE_VERIFICATION("PHONE_VERIFICATION", "手机号验证", EmptyExpandStruct.class),
+    SLIDER("SLIDER", "滑块", SliderExpandStruct.class),
+    COLOR("COLOR", "颜色", ColorExpandStruct.class),
+    UPLOAD("UPLOAD", "文件上传组件", UploadExpandStruct.class),
+    IMAGE("IMAGE", "图片展示", ImageExpandStruct.class),
+    IMAGE_SELECT("IMAGE_SELECT", "图片选择", ImageSelectExpandStruct.class),
+    IMAGE_CAROUSEL("IMAGE_CAROUSEL", "图片轮播", ImageCarouselExpandStruct.class),
+    DESC_TEXT("DESC_TEXT", "文字描述", DescTextExpandStruct.class),
+    SIGN_PAD("SIGN_PAD", "手写签名", SignPadExpandStruct.class),
+    PAGINATION("PAGINATION", "分页", PaginationExpandStruct.class),
+    DIVIDER("DIVIDER", "分割线", DividerExpandStruct.class);
+
+
+
+    @EnumValue
+    @JsonValue
+    private String value;
+
+    private String desc;
+    /**
+     * 扩展属性类
+     */
+    private Class expandClass;
+
+    /**
+     * 枚举入参注解
+     *
+     * @param value
+     * @return
+     */
+    @JsonCreator
+    public static ProjectItemTypeEnum getByValue(String value) {
+        for (ProjectItemTypeEnum typeEnum : values()) {
+            if (typeEnum.getValue().equals(value)) {
+                return typeEnum;
+            }
+        }
+        return null;
+    }
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
index 72497378a7..8287f2f7ca 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
@@ -2,6 +2,7 @@ package com.epmet.dataaggre.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dataaggre.dto.epmettduck.form.ProjectKeyCommonDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +11,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Author zxc
  * @DateTime 2021/9/15 2:43 下午
@@ -35,7 +38,18 @@ public class EpmetTDuckController {
         return new Result<ProjectProfileResultDTO>().ok(prUserProjectService.queryProjectProfile(formDTO.getProjectKey()));
     }
 
-
+    /**
+     * 分析报告
+     *
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result<com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO>
+     * @author yinzuomei
+     * @date 2021/9/16 5:56 下午
+     */
+    @PostMapping("analysisreport")
+    public Result<List<AnalysisReportResDTO>> queryAnalysisReport(@RequestBody ProjectKeyCommonDTO formDTO){
+        return new Result<List<AnalysisReportResDTO>>().ok(prUserProjectService.queryAnalysisReport(formDTO.getProjectKey()));
+    }
 
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
index ed184e415f..ef2cdad012 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
@@ -1,10 +1,14 @@
 package com.epmet.dataaggre.dao.epmettduck;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 项目表
  *
@@ -22,4 +26,24 @@ public interface PrUserProjectDao extends BaseDao<PrUserProjectEntity> {
      * @date 2021/9/16 2:58 下午
      */
     ProjectProfileResultDTO queryProjectProfile(String projectKey);
+
+    /**
+     * 分析报告展示的题目列表
+     *
+     * @param projectKey
+     * @return  java.util.List<com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO>
+     * @author yinzuomei
+     * @date 2021/9/16 5:59 下午
+     */
+    List<AnalysisReportResDTO> selectItems(String projectKey);
+
+    /**
+     * 查询结果项
+     *
+     * @param projectKey
+     * @return  java.util.List<com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity>
+     * @author yinzuomei
+     * @date 2021/9/16 6:18 下午
+     */
+    List<PrUserProjectResultEntity> selectResults(String projectKey);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
index 9ff485770a..d341cddfd1 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
@@ -20,6 +20,7 @@ package com.epmet.dataaggre.service.epmettduck;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 
@@ -103,4 +104,14 @@ public interface PrUserProjectService extends BaseService<PrUserProjectEntity> {
      * @date 2021/9/16 2:54 下午
      */
     ProjectProfileResultDTO queryProjectProfile(String projectKey);
+
+    /**
+     * 分析报告
+     *
+     * @param projectKey
+     * @return  com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO
+     * @author yinzuomei
+     * @date 2021/9/16 5:57 下午
+     */
+    List<AnalysisReportResDTO> queryAnalysisReport(String projectKey);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 850cd1eff0..c737b33d2e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -17,6 +17,8 @@
 
 package com.epmet.dataaggre.service.epmettduck.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
@@ -26,18 +28,21 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao;
+import com.epmet.dataaggre.dto.epmettduck.InputMapDTO;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity;
+import com.epmet.dataaggre.enums.ProjectItemTypeEnum;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 项目表
@@ -115,4 +120,158 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
         return baseDao.queryProjectProfile(projectKey);
     }
 
+    /**
+     * 分析报告
+     *
+     * @param projectKey
+     * @return  com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO
+     * @author yinzuomei
+     * @date 2021/9/16 5:57 下午
+     */
+    @Override
+    public List<AnalysisReportResDTO> queryAnalysisReport(String projectKey) {
+        List<AnalysisReportResDTO> itemList=baseDao.selectItems(projectKey);
+        if(CollectionUtils.isEmpty(itemList)){
+            return new ArrayList<>();
+        }
+        List<PrUserProjectResultEntity> resultList=baseDao.selectResults(projectKey);
+        if(CollectionUtils.isEmpty(resultList)){
+            return new ArrayList<>();
+        }
+        for(AnalysisReportResDTO item:itemList){
+            String currentType=item.getType();
+            String key="field".concat(item.getFormItemId());
+
+            Map<String, Object> detail=new HashMap<>();
+            //总采集数
+            detail.put("collectionTotal",resultList.size());
+            //有效记录
+            int validTotal=0;
+
+            //1、联系人组件统一用一个统计显示多少条，点击查看更多显示汇总列表，如有非必填项没有填写显示空（手机号验证不需要统计）
+            //2、单行文本、多行文本、时间选择、时间范围、日期选择、日期范围，统计填写人数，点击查看列表
+            if(ProjectItemTypeEnum.INPUT.getValue().equals(currentType)
+                ||ProjectItemTypeEnum.PROVINCE_CITY.getValue().equals(currentType)
+                ||ProjectItemTypeEnum.INPUT_MAP.getValue().equals(currentType)
+                ||ProjectItemTypeEnum.TEXTAREA.getValue().equals(currentType)
+                ||ProjectItemTypeEnum.TIME.getValue().equals(currentType)
+                ||ProjectItemTypeEnum.TIME_RANGE.getValue().equals(currentType)
+                ||ProjectItemTypeEnum.DATE.getValue().equals(currentType)
+                ||ProjectItemTypeEnum.DATE_RANGE.getValue().equals(currentType)){
+
+                for(PrUserProjectResultEntity res:resultList){
+                    JSONObject originalData = JSON.parseObject(res.getOriginalData());
+                    log.info("----------------------key:"+key+",值:  "+originalData.get(key));
+                    //手机号、邮箱、身份证: INPUT
+                    if(ProjectItemTypeEnum.INPUT.getValue().equals(currentType)){
+                        if(StringUtils.isNotBlank(originalData.get(key).toString())){
+                            validTotal+=1;
+                        }
+                    }
+
+                    //省市联动： PROVINCE_CITY
+                    if(ProjectItemTypeEnum.PROVINCE_CITY.getValue().equals(currentType)){
+                        List<String> provinceCityList= (List<String>) originalData.get(key);
+                        if(!CollectionUtils.isEmpty(provinceCityList)){
+                            validTotal+=1;
+                        }
+                    }
+                    //地理位置：INPUT_MAP
+                    if(ProjectItemTypeEnum.INPUT_MAP.getValue().equals(currentType)){
+                        InputMapDTO inputMapDTO= (InputMapDTO) originalData.get(key);
+                        if(null!=inputMapDTO&&StringUtils.isNotBlank(inputMapDTO.getAddress())){
+                            validTotal+=1;
+                        }
+                    }
+                }
+
+                detail.put("validTotal",validTotal);
+                continue;
+            }
+
+            //3、下拉选择、级联选择、单选框组、多选框组显示不同选项选择次数、所占比例
+            if(ProjectItemTypeEnum.SELECT.getValue().equals(currentType)){
+
+                continue;
+            }
+            if(ProjectItemTypeEnum.CASCADER.getValue().equals(currentType)){
+
+                continue;
+            }
+            if(ProjectItemTypeEnum.RADIO.getValue().equals(currentType)){
+
+                continue;
+            }
+            if(ProjectItemTypeEnum.CHECKBOX.getValue().equals(currentType)){
+
+                continue;
+            }
+
+
+            //4、计数器显示所有填写者选择的数字总和
+            if(ProjectItemTypeEnum.TEXTAREA.getValue().equals(currentType)){
+                int sumTotal=0;
+                for(PrUserProjectResultEntity res:resultList){
+                    JSONObject originalData = JSON.parseObject(res.getOriginalData());
+                    Integer score= (Integer) originalData.get(key);
+                    if(null!=score){
+                        sumTotal+=score;
+                        validTotal+=1;
+                    }
+                }
+                detail.put("validTotal",validTotal);
+                detail.put("sumTotal",sumTotal);
+                continue;
+            }
+
+
+            //5、开关统计开有多少、关有多少
+            if(ProjectItemTypeEnum.SWITCH.getValue().equals(currentType)){
+                int openTotal=0;
+                int closedTotal=0;
+                for(PrUserProjectResultEntity res:resultList){
+                    JSONObject originalData = JSON.parseObject(res.getOriginalData());
+                    Boolean result= (Boolean) originalData.get(key);
+                    if(null!=result){
+                        validTotal+=1;
+                        if(result){
+                            openTotal+=1;
+                        }else{
+                            closedTotal+=1;
+                        }
+                    }
+                }
+                detail.put("validTotal",validTotal);
+                detail.put("openTotal",openTotal);
+                detail.put("closedTotal",closedTotal);
+                continue;
+            }
+
+            //6、滑块、颜色选择、上传不统计
+
+            //7、评分统计1星几人，2星几人，3星几人......，显示平均分
+            if(ProjectItemTypeEnum.RATE.getValue().equals(currentType)){
+                // 1、标签设置的满星是几个星星？
+                //RateExpandStruct rateExpandStruct = JSON.parseObject(item.getExpand(), RateExpandStruct.class);
+                //int maxStarNum=;
+                //detail.put("maxStarNum",maxStarNum);
+
+                for(PrUserProjectResultEntity res:resultList){
+                    JSONObject originalData = JSON.parseObject(res.getOriginalData());
+                    Integer starNum= (Integer) originalData.get(key);
+                    if(null!=starNum){
+                        validTotal+=1;
+                    }
+                }
+
+                //2、几条有效记录
+                detail.put("validTotal",validTotal);
+                continue;
+            }
+
+
+        }
+        return itemList;
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
index 1e12a386e7..9453b32ffa 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
@@ -15,4 +15,36 @@
             m.del_flag = '0'
           AND m.`key` = #{projectKey}
     </select>
+
+    <!--    分析报告展示的题目列表  -->
+    <select id="selectItems" parameterType="java.lang.String" resultType="com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO">
+        select
+            i.project_key,
+            i.form_item_id,
+            i.type,
+            i.label,
+            i.is_display_type,
+            i.show_label,
+            i.required,
+            i.sort,
+            i.expand
+        from pr_user_project_item  i
+        where i.del_flag='0'
+          and i.project_key=#{projectKey}
+          and i.type not in ('PHONE_VERIFICATION','IMAGE','IMAGE_SELECT','IMAGE_CAROUSEL','DESC_TEXT','SIGN_PAD','PAGINATION','DIVIDER','COLOR','SLIDER','UPLOAD')
+        order by i.sort asc
+    </select>
+
+    <!--   调查问卷的答题结果 -->
+    <select id="selectResults" parameterType="java.lang.String" resultType="com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity">
+        select
+            m.serial_number,
+            m.original_data,
+            m.process_data,
+            m.user_id
+        from pr_user_project_result m
+        where m.del_flag='0'
+          and m.project_key=#{projectKey}
+        order by m.serial_number asc
+    </select>
 </mapper>
\ No newline at end of file

From 415d1ea323cdc44c427012e15b4e02f2f95e2678 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 17 Sep 2021 12:53:08 +0800
Subject: [PATCH 13/68] ct

---
 .../dto/epmettduck/ProjectItemTypeEnum.java   | 13 ++--
 .../dataaggre/enums/ProjectItemTypeEnum.java  | 77 -------------------
 .../impl/PrUserProjectServiceImpl.java        |  5 +-
 3 files changed, 11 insertions(+), 84 deletions(-)
 delete mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/enums/ProjectItemTypeEnum.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/ProjectItemTypeEnum.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/ProjectItemTypeEnum.java
index 13eb7a3eca..8083aeb077 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/ProjectItemTypeEnum.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/ProjectItemTypeEnum.java
@@ -16,6 +16,7 @@ import lombok.Getter;
 @Getter
 public enum ProjectItemTypeEnum {
 
+    //联系人组件：
     INPUT("INPUT", "单行文本", InputExpandStruct.class),
     TEXTAREA("TEXTAREA", "多行文本", TextareaExpandStruct.class),
     PASSWORD_INPUT("PASSWORD_INPUT", "密码输入", null),
@@ -25,12 +26,17 @@ public enum ProjectItemTypeEnum {
     RADIO("RADIO", "单选框", RadioExpandStruct.class),
     CHECKBOX("CHECKBOX", "多选框", CheckboxExpandStruct.class),
     SWITCH("SWITCH", "开关", SwitchExpandStruct.class),
-    SLIDER("SLIDER", "滑块", SliderExpandStruct.class),
     TIME("TIME", "时间选择", TimeExpandStruct.class),
     TIME_RANGE("TIME_RANGE", "时间范围", TimeRangeExpandStruct.class),
     DATE("DATE", "日期选择", DateExpandStruct.class),
     DATE_RANGE("DATE_RANGE", "日期范围", DateRangeExpandStruct.class),
     RATE("RATE", "评分", RateExpandStruct.class),
+    PROVINCE_CITY("PROVINCE_CITY", "省市联动", EmptyExpandStruct.class),
+    INPUT_MAP("INPUT_MAP", "地理位置", EmptyExpandStruct.class),
+
+    // 以下不分析
+    PHONE_VERIFICATION("PHONE_VERIFICATION", "手机号验证", EmptyExpandStruct.class),
+    SLIDER("SLIDER", "滑块", SliderExpandStruct.class),
     COLOR("COLOR", "颜色", ColorExpandStruct.class),
     UPLOAD("UPLOAD", "文件上传组件", UploadExpandStruct.class),
     IMAGE("IMAGE", "图片展示", ImageExpandStruct.class),
@@ -39,10 +45,7 @@ public enum ProjectItemTypeEnum {
     DESC_TEXT("DESC_TEXT", "文字描述", DescTextExpandStruct.class),
     SIGN_PAD("SIGN_PAD", "手写签名", SignPadExpandStruct.class),
     PAGINATION("PAGINATION", "分页", PaginationExpandStruct.class),
-    DIVIDER("DIVIDER", "分割线", DividerExpandStruct.class),
-    PROVINCE_CITY("PROVINCE_CITY", "省市联动", EmptyExpandStruct.class),
-    PHONE_VERIFICATION("PHONE_VERIFICATION", "手机号验证", EmptyExpandStruct.class),
-    INPUT_MAP("INPUT_MAP", "地理位置", EmptyExpandStruct.class);
+    DIVIDER("DIVIDER", "分割线", DividerExpandStruct.class);
 
     @EnumValue
     @JsonValue
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/enums/ProjectItemTypeEnum.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/enums/ProjectItemTypeEnum.java
deleted file mode 100644
index fdca95ad1a..0000000000
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/enums/ProjectItemTypeEnum.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.epmet.dataaggre.enums;
-
-import com.baomidou.mybatisplus.annotation.EnumValue;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import com.epmet.dataaggre.dto.epmettduck.struct.*;
-/**
- * @author : smalljop
- * @description : 表单项类型枚举
- * @create : 2020-11-19 10:51
- **/
-@AllArgsConstructor
-@Getter
-public enum ProjectItemTypeEnum {
-    //联系人组件：
-    INPUT("INPUT", "单行文本", InputExpandStruct.class),
-    TEXTAREA("TEXTAREA", "多行文本", TextareaExpandStruct.class),
-    PASSWORD_INPUT("PASSWORD_INPUT", "密码输入", null),
-    NUMBER_INPUT("NUMBER_INPUT", "数字输入", NumberExpandStruct.class),
-    SELECT("SELECT", "下拉框", SelectExpandStruct.class),
-    CASCADER("CASCADER", "级联选择", CascaderExpandStruct.class),
-    RADIO("RADIO", "单选框", RadioExpandStruct.class),
-    CHECKBOX("CHECKBOX", "多选框", CheckboxExpandStruct.class),
-    SWITCH("SWITCH", "开关", SwitchExpandStruct.class),
-    TIME("TIME", "时间选择", TimeExpandStruct.class),
-    TIME_RANGE("TIME_RANGE", "时间范围", TimeRangeExpandStruct.class),
-    DATE("DATE", "日期选择", DateExpandStruct.class),
-    DATE_RANGE("DATE_RANGE", "日期范围", DateRangeExpandStruct.class),
-    RATE("RATE", "评分", RateExpandStruct.class),
-    PROVINCE_CITY("PROVINCE_CITY", "省市联动", EmptyExpandStruct.class),
-    INPUT_MAP("INPUT_MAP", "地理位置", EmptyExpandStruct.class),
-
-    // 以下不分析
-    PHONE_VERIFICATION("PHONE_VERIFICATION", "手机号验证", EmptyExpandStruct.class),
-    SLIDER("SLIDER", "滑块", SliderExpandStruct.class),
-    COLOR("COLOR", "颜色", ColorExpandStruct.class),
-    UPLOAD("UPLOAD", "文件上传组件", UploadExpandStruct.class),
-    IMAGE("IMAGE", "图片展示", ImageExpandStruct.class),
-    IMAGE_SELECT("IMAGE_SELECT", "图片选择", ImageSelectExpandStruct.class),
-    IMAGE_CAROUSEL("IMAGE_CAROUSEL", "图片轮播", ImageCarouselExpandStruct.class),
-    DESC_TEXT("DESC_TEXT", "文字描述", DescTextExpandStruct.class),
-    SIGN_PAD("SIGN_PAD", "手写签名", SignPadExpandStruct.class),
-    PAGINATION("PAGINATION", "分页", PaginationExpandStruct.class),
-    DIVIDER("DIVIDER", "分割线", DividerExpandStruct.class);
-
-
-
-    @EnumValue
-    @JsonValue
-    private String value;
-
-    private String desc;
-    /**
-     * 扩展属性类
-     */
-    private Class expandClass;
-
-    /**
-     * 枚举入参注解
-     *
-     * @param value
-     * @return
-     */
-    @JsonCreator
-    public static ProjectItemTypeEnum getByValue(String value) {
-        for (ProjectItemTypeEnum typeEnum : values()) {
-            if (typeEnum.getValue().equals(value)) {
-                return typeEnum;
-            }
-        }
-        return null;
-    }
-
-
-}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index c737b33d2e..9d87c3ea2d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -30,11 +30,12 @@ import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao;
 import com.epmet.dataaggre.dto.epmettduck.InputMapDTO;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
+import com.epmet.dataaggre.dto.epmettduck.ProjectItemTypeEnum;
 import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
+import com.epmet.dataaggre.dto.epmettduck.struct.RateExpandStruct;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity;
-import com.epmet.dataaggre.enums.ProjectItemTypeEnum;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -252,7 +253,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
             //7、评分统计1星几人，2星几人，3星几人......，显示平均分
             if(ProjectItemTypeEnum.RATE.getValue().equals(currentType)){
                 // 1、标签设置的满星是几个星星？
-                //RateExpandStruct rateExpandStruct = JSON.parseObject(item.getExpand(), RateExpandStruct.class);
+                RateExpandStruct rateExpandStruct = JSON.parseObject(item.getExpand(), RateExpandStruct.class);
                 //int maxStarNum=;
                 //detail.put("maxStarNum",maxStarNum);
 

From 2e8d2ac5fa6205e42eaf92cafe8f456b9c2d6ccc Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 17 Sep 2021 14:45:14 +0800
Subject: [PATCH 14/68] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AFentergrid?=
 =?UTF-8?q?=E3=80=81=E5=B7=A5=E4=BD=9C=E7=AB=AFprofile=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=8F=82=E4=BE=9B=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?=E9=97=AE=E5=8D=B7=E6=8F=90=E4=BA=A4=E9=97=AE=E5=8D=B7=E6=97=B6?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/StaffOrgNameResultDTO.java     | 45 +++++++++++
 .../com/epmet/dao/StaffOrgRelationDao.java    | 11 ++-
 .../service/impl/CustomerGridServiceImpl.java |  8 +-
 .../epmet/service/impl/StaffServiceImpl.java  | 15 ++++
 .../resources/mapper/StaffOrgRelationDao.xml  | 77 ++++++++++++++++++-
 .../result/UserInfoOnEnterGridResultDTO.java  |  7 ++
 .../impl/RegisterRelationServiceImpl.java     |  3 +
 7 files changed, 163 insertions(+), 3 deletions(-)
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffOrgNameResultDTO.java

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffOrgNameResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffOrgNameResultDTO.java
new file mode 100644
index 0000000000..58424f63f0
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffOrgNameResultDTO.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 查询工作人员注册组织信息
+ * @author sun
+ */
+@Data
+public class StaffOrgNameResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    //工作人员所属组织Id
+    private String agencyId = "";
+    //人员Id
+    private String staffId = "";
+    //人员注册时所属组织名【组织-组织，组织-部门，组织-网格】
+    private String orgName = "";
+    //工作人员添加入口Id(agencyId;deptId;gridId)
+    private String orgId = "";
+    //工作人员添加入口类型(组织:agency;部门:dept;网格:gridId)
+    private String orgType = "";
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffOrgRelationDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffOrgRelationDao.java
index a4d6610658..97c4e875b7 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffOrgRelationDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffOrgRelationDao.java
@@ -18,8 +18,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.StaffOrgNameResultDTO;
 import com.epmet.entity.StaffOrgRelationEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 工作人员注册组织关系表
@@ -29,5 +33,10 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface StaffOrgRelationDao extends BaseDao<StaffOrgRelationEntity> {
-	
+    /**
+     * @Description 批量查询工作人员注册组织信息
+     * @author sun
+     */
+    List<StaffOrgNameResultDTO> selelctStaffOrg(@Param("staffIdList") List<String> staffIdList);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index fd8be5cdbd..dae768cbf9 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -36,6 +36,7 @@ import com.epmet.dao.CustomerStaffGridDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
+import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.CustomerGridEntity;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.OperCrmOpenFeignClient;
@@ -712,7 +713,12 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
 
     @Override
     public Result<CustomerGridDTO> getBaseInfo(CustomerGridFormDTO customerGridFormDTO) {
-        return new Result<CustomerGridDTO>().ok(ConvertUtils.sourceToTarget(baseDao.selectById(customerGridFormDTO.getGridId()), CustomerGridDTO.class));
+        CustomerGridDTO restltDTO = ConvertUtils.sourceToTarget(baseDao.selectById(customerGridFormDTO.getGridId()), CustomerGridDTO.class);
+        if (null != restltDTO) {
+            CustomerAgencyEntity entity = customerAgencyService.selectById(restltDTO.getPid());
+            restltDTO.setAgencyName(null != entity ? entity.getOrganizationName() : "");
+        }
+        return new Result<CustomerGridDTO>().ok(restltDTO);
     }
 
     /**
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
index 9d6504d673..06e41fbbc2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
@@ -15,6 +15,7 @@ import com.epmet.constant.CustomerAgencyConstant;
 import com.epmet.constant.OrgInfoConstant;
 import com.epmet.dao.CustomerAgencyDao;
 import com.epmet.dao.CustomerStaffAgencyDao;
+import com.epmet.dao.StaffOrgRelationDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -75,6 +76,8 @@ public class StaffServiceImpl implements StaffService {
 	private StaffOrgRelationService staffOrgRelationService;
 	@Resource
 	private CustomerStaffRedis customerStaffRedis;
+	@Resource
+	private StaffOrgRelationDao staffOrgRelationDao;
 
 	@Override
 	public Result<StaffsInAgencyResultDTO> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO) {
@@ -243,6 +246,18 @@ public class StaffServiceImpl implements StaffService {
             result.setRootAgencyName(agency.getOrganizationName());
 		}
 		//2021.08.27 zhaoqf end
+		//2021.9.17 sun 添加工作人员注册组织、类型、id返参  start
+		List<String> staffIdList = new ArrayList<>();
+		staffIdList.add(result.getStaffId());
+		List<StaffOrgNameResultDTO> list = staffOrgRelationDao.selelctStaffOrg(staffIdList);
+		list.forEach(l->{
+			if(l.getStaffId().equals(result.getStaffId())){
+				result.setOrgId(l.getOrgId());
+				result.setOrgName(l.getOrgName());
+				result.setOrgType(l.getOrgType());
+			}
+		});
+		//2021.9.17 sun 添加工作人员注册组织、类型、id返参  end
 		return result;
 	}
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffOrgRelationDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffOrgRelationDao.xml
index 350dae73ac..76f749c00a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffOrgRelationDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffOrgRelationDao.xml
@@ -3,6 +3,81 @@
 
 <mapper namespace="com.epmet.dao.StaffOrgRelationDao">
 
-
+    <select id="selelctStaffOrg" resultType="com.epmet.dto.result.StaffOrgNameResultDTO">
+        SELECT
+            ca.id agencyId,
+            sor.staff_id staffId,
+            IF(
+            ca.pid = '0',
+            ca.organization_name,
+            CONCAT(
+            (select organization_name from customer_agency where id = ca.pid),
+            '-',
+            ca.organization_name
+            )
+            )orgName,
+            sor.org_id orgId,
+            'agency' orgType
+        FROM
+            staff_org_relation sor
+        INNER JOIN customer_agency ca ON sor.org_id = ca.id
+        WHERE
+            sor.org_type = 'agency'
+        <if test="staffIdList != null and staffIdList.size() > 0">
+            AND sor.staff_id IN (
+            <foreach collection="staffIdList" item="staffId" separator=",">
+                #{staffId}
+            </foreach>
+            )
+        </if>
+        UNION
+        SELECT
+            ca.ID agencyId,
+            sor.staff_id staffId,
+            CONCAT(
+            ca.organization_name,
+            '-',
+            cd.department_name
+            )orgName,
+            sor.org_id orgId,
+            'dept' orgType
+        FROM
+            staff_org_relation sor
+        INNER JOIN customer_department cd ON sor.org_id = cd.id
+        INNER JOIN customer_agency ca ON cd.agency_id = ca.id
+        WHERE
+            sor.org_type = 'dept'
+        <if test="staffIdList != null and staffIdList.size() > 0">
+            AND sor.staff_id IN (
+            <foreach collection="staffIdList" item="staffId" separator=",">
+                #{staffId}
+            </foreach>
+            )
+        </if>
+        UNION
+        SELECT
+            ca.ID agencyId,
+            sor.staff_id staffId,
+            CONCAT(
+            ca.organization_name,
+            '-',
+            cg.grid_name
+            )orgName,
+            sor.org_id orgId,
+            'grid' orgType
+        FROM
+            staff_org_relation sor
+        INNER JOIN customer_grid cg ON sor.org_id = cg.id
+        INNER JOIN customer_agency ca ON cg.pid = ca.id
+        WHERE
+            sor.org_type = 'grid'
+        <if test="staffIdList != null and staffIdList.size() > 0">
+            AND sor.staff_id IN (
+            <foreach collection="staffIdList" item="staffId" separator=",">
+                #{staffId}
+            </foreach>
+            )
+        </if>
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java
index 0bada1c5ee..64f790c115 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java
@@ -58,4 +58,11 @@ public class UserInfoOnEnterGridResultDTO implements Serializable{
      * XX街道-YYY  如果是未认证居民，这一列为空
      */
     private String userStreetTrueName;
+
+    //工作人员添加入口Id(agencyId;deptId;gridId)
+    private String orgId = "";
+    //人员注册时所属组织名【组织-组织，组织-部门，组织-网格】
+    private String orgName = "";
+    //工作人员添加入口类型(组织:agency;部门:dept;网格:gridId)
+    private String orgType = "";
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
index e2aaae2963..efafe3a963 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
@@ -301,6 +301,9 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
         Result<CustomerGridDTO> gridDTOResult = govOrgFeignClient.getGridBaseInfoByGridId(customerGridFormDTO);
         if(gridDTOResult.success() && null != gridDTOResult.getData()){
             resultObj.setCurrentGridName(gridDTOResult.getData().getGridName());
+            resultObj.setOrgId(resultObj.getCurrentGridId());
+            resultObj.setOrgName(gridDTOResult.getData().getAgencyName()+"-"+gridDTOResult.getData().getGridName());
+            resultObj.setOrgType("grid");
         }else{
             //查询网格名称失败
             log.warn(String.format("查找网格信息失败，网格Id:【%s】",gridId));

From 1422fcf47922120e9fdf57de2e0dd07498b24cc2 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 17 Sep 2021 14:52:48 +0800
Subject: [PATCH 15/68] =?UTF-8?q?=E5=88=86=E6=9E=90=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E5=B7=AE=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/AnalysisReportResDTO.java          |   3 +-
 .../impl/PrUserProjectServiceImpl.java        | 131 +++++++++++++-----
 2 files changed, 97 insertions(+), 37 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java
index a2c48ff103..8c2b7b4ebe 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java
@@ -2,7 +2,6 @@ package com.epmet.dataaggre.dto.epmettduck.result;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.apache.poi.ss.formula.functions.T;
 
 import java.io.Serializable;
 import java.util.Map;
@@ -56,7 +55,7 @@ public class AnalysisReportResDTO implements Serializable {
      */
     private Long sort;
 
-    private Map<String, T> detail;
+    private Map<String, Object> detail;
 
     /**
      * 扩展字段 表单项独有字段
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 9d87c3ea2d..0739d25834 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -24,11 +24,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao;
-import com.epmet.dataaggre.dto.epmettduck.InputMapDTO;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
 import com.epmet.dataaggre.dto.epmettduck.ProjectItemTypeEnum;
 import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
@@ -43,7 +43,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 项目表
@@ -142,6 +145,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
         for(AnalysisReportResDTO item:itemList){
             String currentType=item.getType();
             String key="field".concat(item.getFormItemId());
+            log.info("key="+key);
 
             Map<String, Object> detail=new HashMap<>();
             //总采集数
@@ -162,31 +166,50 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
 
                 for(PrUserProjectResultEntity res:resultList){
                     JSONObject originalData = JSON.parseObject(res.getOriginalData());
-                    log.info("----------------------key:"+key+",值:  "+originalData.get(key));
-                    //手机号、邮箱、身份证: INPUT
-                    if(ProjectItemTypeEnum.INPUT.getValue().equals(currentType)){
-                        if(StringUtils.isNotBlank(originalData.get(key).toString())){
-                            validTotal+=1;
+                    //手机号、邮箱、身份证、单行文本: INPUT
+                    //多行文本
+                    //时间选择
+                    //日期选择
+                    if(ProjectItemTypeEnum.INPUT.getValue().equals(currentType)
+                        ||ProjectItemTypeEnum.TEXTAREA.getValue().equals(currentType)
+                        ||ProjectItemTypeEnum.TIME.getValue().equals(currentType)
+                        ||ProjectItemTypeEnum.DATE.getValue().equals(currentType)){
+                        if(originalData.containsKey(key)){
+                            if(StringUtils.isNotBlank(originalData.get(key).toString())){
+                                validTotal+=1;
+                            }
+                        }else{
+                            log.warn("没有当前的key:,可能用户没填写吧"+key);
                         }
                     }
 
                     //省市联动： PROVINCE_CITY
-                    if(ProjectItemTypeEnum.PROVINCE_CITY.getValue().equals(currentType)){
-                        List<String> provinceCityList= (List<String>) originalData.get(key);
-                        if(!CollectionUtils.isEmpty(provinceCityList)){
-                            validTotal+=1;
+                    //时间范围选择
+                    //日期范围选择
+                    if(ProjectItemTypeEnum.PROVINCE_CITY.getValue().equals(currentType)
+                        ||ProjectItemTypeEnum.TIME_RANGE.getValue().equals(currentType)
+                        ||ProjectItemTypeEnum.DATE_RANGE.getValue().equals(currentType)){
+                        if(originalData.containsKey(key)){
+                            List<String> provinceCityList= (List<String>) originalData.get(key);
+                            if(!CollectionUtils.isEmpty(provinceCityList)){
+                                validTotal+=1;
+                            }
                         }
                     }
                     //地理位置：INPUT_MAP
                     if(ProjectItemTypeEnum.INPUT_MAP.getValue().equals(currentType)){
-                        InputMapDTO inputMapDTO= (InputMapDTO) originalData.get(key);
-                        if(null!=inputMapDTO&&StringUtils.isNotBlank(inputMapDTO.getAddress())){
-                            validTotal+=1;
+                        if(originalData.containsKey(key)){
+                            List<String> provinceCityList= (List<String>) originalData.get(key);
+                            log.info("地理位置："+JSON.toJSONString(provinceCityList,true));
+                            if (!CollectionUtils.isEmpty(provinceCityList) && provinceCityList.size() == 3) {
+                                validTotal += 1;
+                            }
                         }
                     }
                 }
 
                 detail.put("validTotal",validTotal);
+                item.setDetail(detail);
                 continue;
             }
 
@@ -210,18 +233,21 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
 
 
             //4、计数器显示所有填写者选择的数字总和
-            if(ProjectItemTypeEnum.TEXTAREA.getValue().equals(currentType)){
+            if(ProjectItemTypeEnum.NUMBER_INPUT.getValue().equals(currentType)){
                 int sumTotal=0;
                 for(PrUserProjectResultEntity res:resultList){
                     JSONObject originalData = JSON.parseObject(res.getOriginalData());
-                    Integer score= (Integer) originalData.get(key);
-                    if(null!=score){
-                        sumTotal+=score;
-                        validTotal+=1;
+                    if(originalData.containsKey(key)){
+                        Integer score= (Integer) originalData.get(key);
+                        if(null!=score){
+                            sumTotal+=score;
+                            validTotal+=1;
+                        }
                     }
                 }
                 detail.put("validTotal",validTotal);
                 detail.put("sumTotal",sumTotal);
+                item.setDetail(detail);
                 continue;
             }
 
@@ -232,41 +258,63 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                 int closedTotal=0;
                 for(PrUserProjectResultEntity res:resultList){
                     JSONObject originalData = JSON.parseObject(res.getOriginalData());
-                    Boolean result= (Boolean) originalData.get(key);
-                    if(null!=result){
-                        validTotal+=1;
-                        if(result){
-                            openTotal+=1;
-                        }else{
-                            closedTotal+=1;
+                    if(originalData.containsKey(key)){
+                        Boolean result= (Boolean) originalData.get(key);
+                        if(null!=result){
+                            validTotal+=1;
+                            if(result){
+                                openTotal+=1;
+                            }else{
+                                closedTotal+=1;
+                            }
                         }
                     }
                 }
                 detail.put("validTotal",validTotal);
                 detail.put("openTotal",openTotal);
                 detail.put("closedTotal",closedTotal);
+                item.setDetail(detail);
                 continue;
             }
 
             //6、滑块、颜色选择、上传不统计
 
             //7、评分统计1星几人，2星几人，3星几人......，显示平均分
-            if(ProjectItemTypeEnum.RATE.getValue().equals(currentType)){
+            if (ProjectItemTypeEnum.RATE.getValue().equals(currentType)) {
                 // 1、标签设置的满星是几个星星？
                 RateExpandStruct rateExpandStruct = JSON.parseObject(item.getExpand(), RateExpandStruct.class);
-                //int maxStarNum=;
-                //detail.put("maxStarNum",maxStarNum);
+                if (null != rateExpandStruct && null != rateExpandStruct.getMax()) {
+                    detail.put("maxStarNum", rateExpandStruct.getMax());
+                } else {
+                    log.warn(String.format("当前评分组件未设置最大值,默认赋值5,projectKey:%s,itemId:%s",projectKey,item.getFormItemId()));
+                    detail.put("maxStarNum", NumConstant.FIVE);
+                }
 
-                for(PrUserProjectResultEntity res:resultList){
+                //总分
+                int totalStarNum = 0;
+                Map<Integer, Integer> starMap = new HashMap<>();
+                for (PrUserProjectResultEntity res : resultList) {
                     JSONObject originalData = JSON.parseObject(res.getOriginalData());
-                    Integer starNum= (Integer) originalData.get(key);
-                    if(null!=starNum){
-                        validTotal+=1;
+                    if(originalData.containsKey(key)){
+                        Integer starNum = (Integer) originalData.get(key);
+                        if (null != starNum) {
+                            validTotal += 1;
+                            totalStarNum += starNum;
+                            Integer count = starMap.get(starNum);
+                            starMap.put(starNum, count == null ? 1 : count + 1);
+
+                        }
                     }
                 }
-
-                //2、几条有效记录
-                detail.put("validTotal",validTotal);
+                //按照星星大小升序排列
+                this.sortMap(starMap, true);
+                //2、平均分
+                detail.put("avgStarNum", new BigDecimal((float)totalStarNum / validTotal).setScale(0, BigDecimal.ROUND_HALF_UP));
+                //3、几条有效记录
+                detail.put("validTotal", validTotal);
+                //4、得分列表
+                detail.put("starProfile", starMap);
+                item.setDetail(detail);
                 continue;
             }
 
@@ -275,4 +323,17 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
         return itemList;
     }
 
+    private List<Map.Entry<Integer, Integer>> sortMap(Map<Integer, Integer> map, boolean asc) {
+
+        Stream<Map.Entry<Integer, Integer>> stream = null;
+        if (asc) {
+            stream = map.entrySet().stream().sorted(Map.Entry.comparingByValue());
+        } else {
+            stream = map.entrySet().stream().sorted(Collections.reverseOrder(Map.Entry.comparingByValue()));
+        }
+        return stream.collect(Collectors.toList());
+    }
+
+
+
 }
\ No newline at end of file

From 382dc4bc5a75cebabeee9187d57587bf52f0930c Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 17 Sep 2021 15:55:43 +0800
Subject: [PATCH 16/68] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=BA=E5=90=8D?=
 =?UTF-8?q?=E8=BF=94=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/result/MineResultDTO.java   | 6 ++++++
 .../com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java  | 2 ++
 .../com/epmet/service/impl/RegisterRelationServiceImpl.java | 1 +
 3 files changed, 9 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java
index 01b1630ebc..2e3adc0e89 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java
@@ -63,4 +63,10 @@ public class MineResultDTO implements Serializable {
      * 根组织名
      */
     private String rootAgencyName;
+	//工作人员添加入口Id(agencyId;deptId;gridId)
+	private String orgId = "";
+	//人员注册时所属组织名【组织-组织，组织-部门，组织-网格】
+	private String orgName = "";
+	//工作人员添加入口类型(组织:agency;部门:dept;网格:gridId)
+	private String orgType = "";
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java
index 64f790c115..3561cb4060 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java
@@ -59,6 +59,8 @@ public class UserInfoOnEnterGridResultDTO implements Serializable{
      */
     private String userStreetTrueName;
 
+    //真实姓名
+    private String realName;
     //工作人员添加入口Id(agencyId;deptId;gridId)
     private String orgId = "";
     //人员注册时所属组织名【组织-组织，组织-部门，组织-网格】
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
index efafe3a963..2d1a9df160 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
@@ -158,6 +158,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
         if(null != strangerInfo){
             resultObj.setNickname(strangerInfo.getNickname());
             resultObj.setUserHeadPhoto(strangerInfo.getHeadImgUrl());
+            resultObj.setRealName(null == strangerInfo.getRealName() ? "" : strangerInfo.getRealName());
         }
         //需要新增的用户关系参数
         UserCustomerEntity userCustomer = new UserCustomerEntity();

From 1fdc19d62bc70bba955aa79b321bf23165c0e69e Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Fri, 17 Sep 2021 16:44:24 +0800
Subject: [PATCH 17/68] =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E7=BA=A7=E4=B8=8B=E7=BA=A7=E7=BB=84=E7=BB=87=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/govorg/form/SubOrgFormDTO.java        |   4 +
 .../dto/govorg/result/OrgTreeResultDTO.java   |  21 +++
 .../controller/GovOrgController.java          |  14 ++
 .../dao/govorg/CustomerAgencyDao.java         |  11 +-
 .../service/govorg/GovOrgService.java         |  10 ++
 .../govorg/impl/GovOrgServiceImpl.java        |  18 +++
 .../mapper/govorg/CustomerAgencyDao.xml       | 121 ++++++++++++++++++
 7 files changed, 195 insertions(+), 4 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgTreeResultDTO.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/SubOrgFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/SubOrgFormDTO.java
index effc43d25c..dca75903ab 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/SubOrgFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/SubOrgFormDTO.java
@@ -15,6 +15,10 @@ public class SubOrgFormDTO implements Serializable {
     private static final long serialVersionUID = -3651225675593357002L;
     @NotBlank(message = "组织ID不能为空")
     private String agencyId;
+    /**
+     * 所属端 居民端resi，工作端gov
+     */
+    private String client;
     /**
      * 是否包括我（1 是，0 否）
      */
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgTreeResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgTreeResultDTO.java
new file mode 100644
index 0000000000..b9b6c724cd
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgTreeResultDTO.java
@@ -0,0 +1,21 @@
+package com.epmet.dataaggre.dto.govorg.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/9/16 16:50
+ */
+@Data
+public class OrgTreeResultDTO implements Serializable {
+    private static final long serialVersionUID = -4304356050545598564L;
+    private String orgId;
+    private String orgName;
+    private String orgType;
+    private String orgPids;
+    private List<OrgTreeResultDTO>  subOrgList;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java
index 561dff2acc..824fab2fae 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java
@@ -165,4 +165,18 @@ public class GovOrgController {
         return new Result<SubOrgResultDTO>().ok(govOrgService.getSubOrg(formDTO));
     }
 
+    /**
+     * @Description 当前组织级下级组织树
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link Result< OrgTreeResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/17 14:02
+     */
+    @PostMapping("agencytree")
+    public Result<OrgTreeResultDTO> getAgencyTree(@LoginUser TokenDto tokenDto, @RequestBody SubOrgFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<OrgTreeResultDTO>().ok(govOrgService.getAgencyTree(tokenDto, formDTO));
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java
index 544f7387dd..673d317fe6 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java
@@ -18,10 +18,7 @@
 package com.epmet.dataaggre.dao.govorg;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dataaggre.dto.govorg.result.AgencyGridResultDTO;
-import com.epmet.dataaggre.dto.govorg.result.StaffAgencyGridListResultDTO;
-import com.epmet.dataaggre.dto.govorg.result.StaffOrgNameResultDTO;
-import com.epmet.dataaggre.dto.govorg.result.StaffOrgRelationResultDTO;
+import com.epmet.dataaggre.dto.govorg.result.*;
 import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -74,4 +71,10 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @return
      */
     StaffOrgRelationResultDTO getStaffFromOrgType(@Param("staffId") String staffId);
+
+    OrgTreeResultDTO getOrgTree(@Param("agencyId") String agencyId);
+    List<OrgTreeResultDTO> getSubOrgList(@Param("pid") String pid);
+
+    OrgTreeResultDTO getResiOrgTree(@Param("agencyId") String agencyId);
+    List<OrgTreeResultDTO> getResiSubOrgList(@Param("pid") String pid);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
index a641be3095..2e2b7c6e88 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
@@ -135,4 +135,14 @@ public interface GovOrgService {
      * @return
      */
     StaffOrgRelationResultDTO getStaffFromOrgType(String staffId);
+
+    /**
+     * @Description 当前组织级下级组织树
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link OrgTreeResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/17 14:03
+     */
+    OrgTreeResultDTO getAgencyTree(TokenDto tokenDto, SubOrgFormDTO formDTO);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
index b7b23299ab..45ee6810fe 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
@@ -491,4 +491,22 @@ public class GovOrgServiceImpl implements GovOrgService {
         return customerAgencyDao.getStaffFromOrgType(staffId);
     }
 
+    /**
+     * @param tokenDto
+     * @param formDTO
+     * @Description 当前组织级下级组织树
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link OrgTreeResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/17 14:03
+     */
+    @Override
+    public OrgTreeResultDTO getAgencyTree(TokenDto tokenDto, SubOrgFormDTO formDTO) {
+        if ("resi".equals(formDTO.getClient())) {
+            return customerAgencyDao.getResiOrgTree(formDTO.getAgencyId());
+        }
+        return customerAgencyDao.getOrgTree(formDTO.getAgencyId());
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
index 2573d8b674..d47b736984 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
@@ -142,4 +142,125 @@
         SELECT STAFF_ID,ORG_ID,ORG_TYPE FROM staff_org_relation WHERE del_flag = '0' AND staff_id = #{staffId}
     </select>
 
+
+    <resultMap id="BaseResultMap" type="com.epmet.dataaggre.dto.govorg.result.OrgTreeResultDTO">
+        <result column="orgId" property="orgId"/>
+        <result column="orgName" property="orgName"/>
+        <result column="orgType" property="orgType"/>
+        <result column="orgPids" property="orgPids"/>
+    </resultMap>
+    <resultMap id="NodeTreeResult" type="com.epmet.dataaggre.dto.govorg.result.OrgTreeResultDTO"
+               extends="BaseResultMap">
+        <collection property="subOrgList" column="orgId" ofType="com.epmet.dataaggre.dto.govorg.result.OrgTreeResultDTO"
+                    javaType="java.util.ArrayList" select="getSubOrgList">
+        </collection>
+    </resultMap>
+
+    <select id="getSubOrgList" resultMap="NodeTreeResult">
+        SELECT
+            *
+        FROM
+            (
+            SELECT
+                ID AS orgId,
+                ORGANIZATION_NAME AS orgName,
+                'agency' AS orgType,
+                CONCAT( PIDS, ID ) AS orgPids
+            FROM
+                customer_agency a
+            WHERE
+                DEL_FLAG = 0
+                AND PID = #{pid} UNION
+            SELECT
+                cd.ID AS orgId,
+                DEPARTMENT_NAME AS orgName,
+                'dept' AS orgType,
+                CONCAT( PIDS, ca.ID, cd.ID ) AS orgPids
+            FROM
+                customer_department cd
+                INNER JOIN customer_agency ca ON cd.AGENCY_ID = ca.ID
+            WHERE
+                cd.DEL_FLAG = 0
+                AND cd.AGENCY_ID = #{pid} UNION
+            SELECT
+                ID AS orgId,
+                GRID_NAME AS orgName,
+                'grid' AS orgType,
+                CONCAT( PIDS, ID ) AS orgPids
+            FROM
+                customer_grid
+            WHERE
+                DEL_FLAG = 0
+                AND PID = #{pid}
+            ) a
+        ORDER BY
+            orgType,
+            orgId
+    </select>
+    <select id="getOrgTree" resultMap="NodeTreeResult">
+        select
+            ID AS orgId,
+            ORGANIZATION_NAME AS orgName,
+            'agency' AS orgName,
+            CONCAT(PIDS,ID) AS orgPids
+
+        from
+            customer_agency
+        where
+             DEL_FLAG = 0
+            AND ID = #{agencyId}
+    </select>
+
+
+    <resultMap id="ResiNodeTreeResult" type="com.epmet.dataaggre.dto.govorg.result.OrgTreeResultDTO"
+               extends="BaseResultMap">
+        <collection property="subOrgList" column="orgId" ofType="com.epmet.dataaggre.dto.govorg.result.OrgTreeResultDTO"
+                    javaType="java.util.ArrayList" select="getResiSubOrgList">
+        </collection>
+    </resultMap>
+
+    <select id="getResiSubOrgList" resultMap="ResiNodeTreeResult">
+            SELECT
+            *
+        FROM
+            (
+            SELECT
+                ID AS orgId,
+                ORGANIZATION_NAME AS orgName,
+                'agency' AS orgType,
+                CONCAT( PIDS, ID ) AS orgPids
+            FROM
+                customer_agency a
+            WHERE
+                DEL_FLAG = 0
+                AND PID = #{pid} UNION
+            SELECT
+                ID AS orgId,
+                GRID_NAME AS orgName,
+                'grid' AS orgType,
+                CONCAT( PIDS, ID ) AS orgPids
+            FROM
+                customer_grid
+            WHERE
+                DEL_FLAG = 0
+                AND PID = #{pid}
+            ) a
+        ORDER BY
+            orgType,
+            orgId
+    </select>
+    <select id="getResiOrgTree" resultMap="ResiNodeTreeResult">
+        select
+            ID AS orgId,
+            ORGANIZATION_NAME AS orgName,
+            'agency' AS orgName,
+            CONCAT(PIDS,ID) AS orgPids
+
+        from
+            customer_agency
+        where
+             DEL_FLAG = 0
+            AND ID = #{agencyId}
+    </select>
+
 </mapper>

From c0e242eb43e5d734c199cbccc9ccecbd376dd0aa Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 17 Sep 2021 16:44:42 +0800
Subject: [PATCH 18/68] =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/epmettduck/form/TDuckListFormDTO.java | 37 +++++++
 .../epmettduck/result/TDuckListResultDTO.java | 96 +++++++++++++++++++
 .../controller/EpmetTDuckController.java      | 12 +++
 .../dao/epmettduck/PrUserProjectDao.java      | 18 ++++
 .../dao/epmettduck/PrVistRecordDao.java       |  7 +-
 .../epmettduck/PrUserProjectService.java      |  4 +
 .../impl/PrUserProjectServiceImpl.java        | 36 +++++++
 .../mapper/epmettduck/PrUserProjectDao.xml    | 22 +++++
 .../mapper/epmettduck/PrVistRecordDao.xml     |  6 ++
 9 files changed, 237 insertions(+), 1 deletion(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckListFormDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckListFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckListFormDTO.java
new file mode 100644
index 0000000000..481ff42126
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckListFormDTO.java
@@ -0,0 +1,37 @@
+package com.epmet.dataaggre.dto.epmettduck.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/17 10:47 上午
+ * @DESC
+ */
+@Data
+public class TDuckListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 3624352114576287768L;
+
+    public interface TDuckListForm{}
+
+    /**
+     * 1：未发布，2：收集中，3：已结束
+     */
+    @NotNull(message = "问卷调查状态不能为空",groups = TDuckListForm.class)
+    private Integer status;
+
+    @NotNull(message = "pageNo不能为空",groups = TDuckListForm.class)
+    private Integer pageNo;
+
+    @NotNull(message = "pageSize不能为空",groups = TDuckListForm.class)
+    private Integer pageSize;
+
+    @NotBlank(message = "orgIds不能为空",groups = TDuckListForm.class)
+    private String orgIds;
+
+    private String userId;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
new file mode 100644
index 0000000000..267df6a5f2
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
@@ -0,0 +1,96 @@
+package com.epmet.dataaggre.dto.epmettduck.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/17 10:47 上午
+ * @DESC
+ */
+@Data
+public class TDuckListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3624352114576287768L;
+
+    /**
+     * 客户id
+     */
+    private String customerId;
+
+    /**
+     * 项目code
+     */
+    private String key;
+
+    /**
+     * 来源Id
+     */
+    private String sourceId;
+
+    /**
+     * 来源类型
+     */
+    private Integer sourceType;
+
+    /**
+     * 项目名称
+     */
+    private String name;
+
+    /**
+     * 项目描述
+     */
+    private String describe;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 项目类型
+     */
+    private Integer type;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 适用于哪个端 resi：居民端用户；gov：工作端用户；运营端用户：oper
+     */
+    private String client;
+
+    private String createdTime;
+
+    /**
+     * 是否填写问卷，true：是，false：否
+     */
+    private Boolean fillStatus;
+
+    /**
+     * 回收状态 0:未回收；1已回收
+     */
+    private Integer recycled;
+
+    public TDuckListResultDTO() {
+        this.customerId = "";
+        this.key = "";
+        this.sourceId = "";
+        this.sourceType = NumConstant.ONE;
+        this.name = "";
+        this.describe = "";
+        this.userId = "";
+        this.type = NumConstant.ONE;
+        this.status = NumConstant.ONE;
+        this.client = "";
+        this.createdTime = "";
+        this.fillStatus = false;
+    }
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
index afe5b4ea8c..84fc0c68d2 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
@@ -2,9 +2,14 @@ package com.epmet.dataaggre.controller;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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.dataaggre.dto.epmettduck.form.TDuckDetailFormDTO;
+import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectItemService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -75,4 +80,11 @@ public class EpmetTDuckController {
     }
 
 
+    @PostMapping("list")
+    public Result<List<TDuckListResultDTO>> queryProjectList(@RequestBody TDuckListFormDTO formDTO,@LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO,TDuckListFormDTO.TDuckListForm.class);
+        formDTO.setUserId(tokenDto.getUserId());
+        return new Result<List<TDuckListResultDTO>>().ok(prUserProjectService.queryProjectList(formDTO));
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
index ef2cdad012..1adda97179 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
@@ -3,9 +3,11 @@ package com.epmet.dataaggre.dao.epmettduck;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -46,4 +48,20 @@ public interface PrUserProjectDao extends BaseDao<PrUserProjectEntity> {
      * @date 2021/9/16 6:18 下午
      */
     List<PrUserProjectResultEntity> selectResults(String projectKey);
+
+    /**
+     * @Description  查询范围内的问卷调查
+     * @Param orgId
+     * @author zxc
+     * @date 2021/9/17 2:16 下午
+     */
+    List<String> selectProjectKey(@Param("orgIds")String orgIds);
+
+    /**
+     * @Description  根据keys查询project
+     * @Param keys
+     * @author zxc
+     * @date 2021/9/17 3:41 下午
+     */
+    List<TDuckListResultDTO> queryProjectList(@Param("keys")List<String> keys, @Param("status")Integer status);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java
index 716daf1608..279884c678 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java
@@ -3,6 +3,9 @@ package com.epmet.dataaggre.dao.epmettduck;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dataaggre.entity.epmettduck.PrVistRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 用户访问问卷记录表
@@ -12,5 +15,7 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PrVistRecordDao extends BaseDao<PrVistRecordEntity> {
-	
+
+    List<String> selectVisitRecordByUserId(@Param("userId")String userId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
index d341cddfd1..4000d3bdc0 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
@@ -20,8 +20,10 @@ package com.epmet.dataaggre.service.epmettduck;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
+import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 
 import java.util.List;
@@ -105,6 +107,8 @@ public interface PrUserProjectService extends BaseService<PrUserProjectEntity> {
      */
     ProjectProfileResultDTO queryProjectProfile(String projectKey);
 
+    List<TDuckListResultDTO> queryProjectList(TDuckListFormDTO formDTO);
+
     /**
      * 分析报告
      *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 0739d25834..78cd44a5b8 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -19,9 +19,11 @@ package com.epmet.dataaggre.service.epmettduck.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -29,16 +31,24 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao;
+import com.epmet.dataaggre.dao.epmettduck.PrVistRecordDao;
+import com.epmet.dataaggre.dto.epmettduck.InputMapDTO;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
+import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.ProjectItemTypeEnum;
 import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO;
 import com.epmet.dataaggre.dto.epmettduck.struct.RateExpandStruct;
+import com.epmet.dataaggre.entity.epmettduck.PrPublishRangeEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -59,6 +69,9 @@ import java.util.stream.Stream;
 @Service
 public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao, PrUserProjectEntity> implements PrUserProjectService {
 
+    @Autowired
+    private PrVistRecordDao visitRecordDao;
+
     @Override
     public PageData<PrUserProjectDTO> page(Map<String, Object> params) {
         IPage<PrUserProjectEntity> page = baseDao.selectPage(
@@ -124,6 +137,29 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
         return baseDao.queryProjectProfile(projectKey);
     }
 
+
+    @Override
+    public List<TDuckListResultDTO> queryProjectList(TDuckListFormDTO formDTO) {
+        List<String> projectKeys = baseDao.selectProjectKey(formDTO.getOrgIds());
+        if (CollectionUtils.isEmpty(projectKeys)){
+            return new ArrayList<>();
+        }
+        PageInfo<TDuckListResultDTO> projectPageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryProjectList(projectKeys, formDTO.getStatus()));
+        List<TDuckListResultDTO> result = projectPageInfo.getList();
+        List<String> records = visitRecordDao.selectVisitRecordByUserId(formDTO.getUserId());
+        if (!CollectionUtils.isEmpty(records)){
+            for (String r : records) {
+                for (TDuckListResultDTO t : result) {
+                    if (r.equals(t.getKey())){
+                        t.setFillStatus(true);
+                        continue;
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
     /**
      * 分析报告
      *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
index 9453b32ffa..45948a5dcf 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
@@ -47,4 +47,26 @@
           and m.project_key=#{projectKey}
         order by m.serial_number asc
     </select>
+
+    <!-- 查询范围内的问卷调查 -->
+    <select id="selectProjectKey" resultType="java.lang.String">
+        SELECT
+            DISTINCT project_key
+        FROM pr_publish_range
+        WHERE del_flag = 0
+          AND #{orgIds} LIKE CONCAT(org_ids,'%')
+    </select>
+
+    <!-- 根据keys查询project -->
+    <select id="queryProjectList" resultType="com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO">
+        select * from pr_user_project
+        where del_flag = 0
+        AND status = #{status}
+        AND `key` in (
+            <foreach collection="keys" item="key" separator=",">
+                #{key}
+            </foreach>
+            )
+        ORDER BY created_time DESC
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrVistRecordDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrVistRecordDao.xml
index 8ea675b0e9..77f2f5c68a 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrVistRecordDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrVistRecordDao.xml
@@ -3,4 +3,10 @@
 
 <mapper namespace="com.epmet.dataaggre.dao.epmettduck.PrVistRecordDao">
 
+    <!-- 根据userId查询是否已填 -->
+    <select id="selectVisitRecordByUserId" resultType="java.lang.String">
+        SELECT project_key FROM pr_vist_record
+        WHERE del_flag = 0
+          AND user_id = #{userId}
+    </select>
 </mapper>
\ No newline at end of file

From f51cba4d8d8e1558d3c3b154076718a385aef078 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 17 Sep 2021 16:47:40 +0800
Subject: [PATCH 19/68] =?UTF-8?q?=E5=88=86=E6=9E=90=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E8=BF=98=E5=B7=AE=E4=B8=80=E4=B8=AA=E7=BA=A7=E8=81=94=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/epmettduck/result/OptionDTO.java      |  29 +++++
 .../struct/CheckboxExpandStruct.java          |   1 +
 .../epmettduck/struct/RadioExpandStruct.java  |   2 +-
 .../epmettduck/struct/SelectExpandStruct.java |   1 +
 .../impl/PrUserProjectServiceImpl.java        | 117 +++++++++++++++++-
 5 files changed, 146 insertions(+), 4 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/OptionDTO.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/OptionDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/OptionDTO.java
new file mode 100644
index 0000000000..c1d64bba1e
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/OptionDTO.java
@@ -0,0 +1,29 @@
+package com.epmet.dataaggre.dto.epmettduck.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author yinzuomei
+ * @Date 2021/9/17 3:25 下午
+ */
+@Data
+public class OptionDTO implements Serializable {
+    /**
+     * 选项题目
+     */
+    private String label;
+
+    /**
+     * 答案值
+     */
+    private Integer value;
+
+    /**
+     * 多少个人选择此答案
+     */
+    private Integer currentCount=0;
+}
+
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CheckboxExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CheckboxExpandStruct.java
index 788bb12aa9..09b4978f57 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CheckboxExpandStruct.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CheckboxExpandStruct.java
@@ -36,6 +36,7 @@ public class CheckboxExpandStruct {
     private List<Option> options;
 
 
+    @Data
     public static class Option {
         public String label;
         public Integer value;
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RadioExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RadioExpandStruct.java
index a9ea86b5d4..5a4455fd31 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RadioExpandStruct.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RadioExpandStruct.java
@@ -23,7 +23,7 @@ public class RadioExpandStruct {
      */
     private List<Option> options;
 
-
+    @Data
     public static class Option {
         public String label;
         public Integer value;
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java
index 27788d5ea6..0eaacde3b6 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java
@@ -40,6 +40,7 @@ public class SelectExpandStruct {
     private String controlsPosition;
 
 
+    @Data
     public static class Option {
         public String label;
         public Integer value;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 0739d25834..db180c3bf4 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -32,8 +32,12 @@ import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
 import com.epmet.dataaggre.dto.epmettduck.ProjectItemTypeEnum;
 import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.OptionDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
+import com.epmet.dataaggre.dto.epmettduck.struct.CheckboxExpandStruct;
+import com.epmet.dataaggre.dto.epmettduck.struct.RadioExpandStruct;
 import com.epmet.dataaggre.dto.epmettduck.struct.RateExpandStruct;
+import com.epmet.dataaggre.dto.epmettduck.struct.SelectExpandStruct;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
@@ -165,6 +169,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                 ||ProjectItemTypeEnum.DATE_RANGE.getValue().equals(currentType)){
 
                 for(PrUserProjectResultEntity res:resultList){
+
                     JSONObject originalData = JSON.parseObject(res.getOriginalData());
                     //手机号、邮箱、身份证、单行文本: INPUT
                     //多行文本
@@ -181,8 +186,8 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                         }else{
                             log.warn("没有当前的key:,可能用户没填写吧"+key);
                         }
+                        continue;
                     }
-
                     //省市联动： PROVINCE_CITY
                     //时间范围选择
                     //日期范围选择
@@ -195,7 +200,9 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                                 validTotal+=1;
                             }
                         }
+                        continue;
                     }
+
                     //地理位置：INPUT_MAP
                     if(ProjectItemTypeEnum.INPUT_MAP.getValue().equals(currentType)){
                         if(originalData.containsKey(key)){
@@ -205,6 +212,8 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                                 validTotal += 1;
                             }
                         }
+                        //不加也行，后面也没有代码块了
+                        continue;
                     }
                 }
 
@@ -212,12 +221,114 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                 item.setDetail(detail);
                 continue;
             }
+            // 3、下拉选择、级联选择、单选框组、多选框组显示不同选项选择次数、所占比例
+            //3.1、下拉选择
+            if (ProjectItemTypeEnum.SELECT.getValue().equals(currentType)) {
+                SelectExpandStruct selectExpandStruct = JSON.parseObject(item.getExpand(), SelectExpandStruct.class);
+                List<OptionDTO> options = new ArrayList<>();
+                if (null != selectExpandStruct) {
+                    options = ConvertUtils.sourceToTarget(selectExpandStruct.getOptions(), OptionDTO.class);
+                }
 
-            //3、下拉选择、级联选择、单选框组、多选框组显示不同选项选择次数、所占比例
-            if(ProjectItemTypeEnum.SELECT.getValue().equals(currentType)){
+                //共选择了多少次，每道题相加
+                int totalCount = 0;
+                for (OptionDTO optionDTO : options) {
+                    //currentCount：每道题，被选了多少次？
+                    int currentCount = 0;
+                    for (PrUserProjectResultEntity res : resultList) {
+                        JSONObject originalData = JSON.parseObject(res.getOriginalData());
+                        if (selectExpandStruct.getMultiple()) {
+                            //多选
+                            if(originalData.containsKey(key)){
+                                List<Integer> answers = (List<Integer>) originalData.get(key);
+                                if (!CollectionUtils.isEmpty(answers) && answers.contains(optionDTO.getValue())) {
+                                    currentCount += 1;
+                                }
+                            }
 
+                        } else {
+                            //单选
+                            if(originalData.containsKey(key)){
+                                Integer answer = (Integer) originalData.get(key);
+                                if (null != answer && optionDTO.getValue() == answer) {
+                                    currentCount += 1;
+                                }
+                            }
+                        }
+                    }
+                    optionDTO.setCurrentCount(currentCount);
+                    totalCount += currentCount;
+                }
+                detail.put("totalCount", totalCount);
+                detail.put("options", options);
+                item.setDetail(detail);
                 continue;
             }
+            // 3.2 单选
+            if (ProjectItemTypeEnum.RADIO.getValue().equals(currentType)) {
+                RadioExpandStruct radioExpandStruct = JSON.parseObject(item.getExpand(), RadioExpandStruct.class);
+                List<OptionDTO> options = new ArrayList<>();
+                if (null != radioExpandStruct) {
+                    options = ConvertUtils.sourceToTarget(radioExpandStruct.getOptions(), OptionDTO.class);
+                }
+
+                //共选择了多少次，每道题相加
+                int totalCount = 0;
+                for (OptionDTO optionDTO : options) {
+                    //currentCount：每道题，被选了多少次？
+                    int currentCount = 0;
+                    for (PrUserProjectResultEntity res : resultList) {
+                        JSONObject originalData = JSON.parseObject(res.getOriginalData());
+                        //单选
+                        if(originalData.containsKey(key)){
+                            Integer answer = (Integer) originalData.get(key);
+                            if (null != answer && optionDTO.getValue() == answer) {
+                                currentCount += 1;
+                            }
+                        }
+                    }
+                    optionDTO.setCurrentCount(currentCount);
+                    totalCount += currentCount;
+                }
+                detail.put("totalCount", totalCount);
+                detail.put("options", options);
+                item.setDetail(detail);
+                continue;
+            }
+
+            // 3.3多选
+            if (ProjectItemTypeEnum.CHECKBOX.getValue().equals(currentType)) {
+                CheckboxExpandStruct checkboxExpandStruct = JSON.parseObject(item.getExpand(), CheckboxExpandStruct.class);
+                List<OptionDTO> options = new ArrayList<>();
+                if (null != checkboxExpandStruct) {
+                    options = ConvertUtils.sourceToTarget(checkboxExpandStruct.getOptions(), OptionDTO.class);
+                }
+
+                //共选择了多少次，每道题相加
+                int totalCount = 0;
+                for (OptionDTO optionDTO : options) {
+                    //currentCount：每道题，被选了多少次？
+                    int currentCount = 0;
+                    for (PrUserProjectResultEntity res : resultList) {
+                        JSONObject originalData = JSON.parseObject(res.getOriginalData());
+                        //多选
+                        if(originalData.containsKey(key)){
+                            List<Integer> answers = (List<Integer>) originalData.get(key);
+                            if (!CollectionUtils.isEmpty(answers) && answers.contains(optionDTO.getValue())) {
+                                currentCount += 1;
+                            }
+                        }
+                    }
+                    optionDTO.setCurrentCount(currentCount);
+                    totalCount += currentCount;
+                }
+                detail.put("totalCount", totalCount);
+                detail.put("options", options);
+                item.setDetail(detail);
+                continue;
+            }
+
+
             if(ProjectItemTypeEnum.CASCADER.getValue().equals(currentType)){
 
                 continue;

From ef40edab694fed6c6495beae8fed7c15a16a9643 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 17 Sep 2021 16:52:23 +0800
Subject: [PATCH 20/68] emm

---
 .../dto/epmettduck/form/TDuckListFormDTO.java        |  3 +++
 .../dataaggre/dao/epmettduck/PrUserProjectDao.java   |  2 +-
 .../epmettduck/impl/PrUserProjectServiceImpl.java    | 12 +++++++++++-
 .../resources/mapper/epmettduck/PrUserProjectDao.xml |  1 +
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckListFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckListFormDTO.java
index 481ff42126..b8165ee2ce 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckListFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckListFormDTO.java
@@ -33,5 +33,8 @@ public class TDuckListFormDTO implements Serializable {
     @NotBlank(message = "orgIds不能为空",groups = TDuckListForm.class)
     private String orgIds;
 
+    @NotBlank(message = "client不能为空",groups = TDuckListForm.class)
+    private String client;
+
     private String userId;
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
index 1adda97179..c1803e359c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
@@ -63,5 +63,5 @@ public interface PrUserProjectDao extends BaseDao<PrUserProjectEntity> {
      * @author zxc
      * @date 2021/9/17 3:41 下午
      */
-    List<TDuckListResultDTO> queryProjectList(@Param("keys")List<String> keys, @Param("status")Integer status);
+    List<TDuckListResultDTO> queryProjectList(@Param("keys")List<String> keys, @Param("status")Integer status,@Param("client")String client);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index b5cb4be87a..d7a6b16eff 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -29,16 +29,26 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao;
+import com.epmet.dataaggre.dao.epmettduck.PrVistRecordDao;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
 import com.epmet.dataaggre.dto.epmettduck.ProjectItemTypeEnum;
+import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.OptionDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO;
+import com.epmet.dataaggre.dto.epmettduck.struct.CheckboxExpandStruct;
+import com.epmet.dataaggre.dto.epmettduck.struct.RadioExpandStruct;
 import com.epmet.dataaggre.dto.epmettduck.struct.RateExpandStruct;
+import com.epmet.dataaggre.dto.epmettduck.struct.SelectExpandStruct;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -134,7 +144,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
         if (CollectionUtils.isEmpty(projectKeys)){
             return new ArrayList<>();
         }
-        PageInfo<TDuckListResultDTO> projectPageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryProjectList(projectKeys, formDTO.getStatus()));
+        PageInfo<TDuckListResultDTO> projectPageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryProjectList(projectKeys, formDTO.getStatus(), formDTO.getClient()));
         List<TDuckListResultDTO> result = projectPageInfo.getList();
         List<String> records = visitRecordDao.selectVisitRecordByUserId(formDTO.getUserId());
         if (!CollectionUtils.isEmpty(records)){
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
index 45948a5dcf..cabb6eb4a3 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
@@ -62,6 +62,7 @@
         select * from pr_user_project
         where del_flag = 0
         AND status = #{status}
+        AND client = #{client}
         AND `key` in (
             <foreach collection="keys" item="key" separator=",">
                 #{key}

From dbf55fc22b28e1a2f22d8e06e4cba0eee2ccf3ac Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 17 Sep 2021 16:56:48 +0800
Subject: [PATCH 21/68] =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmettduck/impl/PrUserProjectServiceImpl.java      | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index b5cb4be87a..1d90c14970 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -29,16 +29,26 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao;
+import com.epmet.dataaggre.dao.epmettduck.PrVistRecordDao;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
 import com.epmet.dataaggre.dto.epmettduck.ProjectItemTypeEnum;
+import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.OptionDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO;
+import com.epmet.dataaggre.dto.epmettduck.struct.CheckboxExpandStruct;
+import com.epmet.dataaggre.dto.epmettduck.struct.RadioExpandStruct;
 import com.epmet.dataaggre.dto.epmettduck.struct.RateExpandStruct;
+import com.epmet.dataaggre.dto.epmettduck.struct.SelectExpandStruct;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;

From 7b44e339b61214e165b1ca3203b8b08131804d73 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 17 Sep 2021 17:09:38 +0800
Subject: [PATCH 22/68] todo

---
 .../epmettduck/impl/PrUserProjectServiceImpl.java     | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index d7a6b16eff..3617e5a3b9 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -360,20 +360,11 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                 continue;
             }
 
-
+            //3.4级联 todo
             if(ProjectItemTypeEnum.CASCADER.getValue().equals(currentType)){
 
                 continue;
             }
-            if(ProjectItemTypeEnum.RADIO.getValue().equals(currentType)){
-
-                continue;
-            }
-            if(ProjectItemTypeEnum.CHECKBOX.getValue().equals(currentType)){
-
-                continue;
-            }
-
 
             //4、计数器显示所有填写者选择的数字总和
             if(ProjectItemTypeEnum.NUMBER_INPUT.getValue().equals(currentType)){

From c7ac655756cc3faeab7f1f86c288ba7b86abe78c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 17 Sep 2021 17:35:18 +0800
Subject: [PATCH 23/68] todo1

---
 .../dto/epmettduck/struct/CascaderExpandStruct.java       | 1 +
 .../service/epmettduck/impl/PrUserProjectServiceImpl.java | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java
index ebc62596f8..c572f882af 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java
@@ -36,6 +36,7 @@ public class CascaderExpandStruct {
      */
     private Boolean showAllLevels;
 
+    @Data
     public static class Option {
         public Integer id;
         public String label;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 3617e5a3b9..85af5a1598 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -37,10 +37,7 @@ import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.OptionDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO;
-import com.epmet.dataaggre.dto.epmettduck.struct.CheckboxExpandStruct;
-import com.epmet.dataaggre.dto.epmettduck.struct.RadioExpandStruct;
-import com.epmet.dataaggre.dto.epmettduck.struct.RateExpandStruct;
-import com.epmet.dataaggre.dto.epmettduck.struct.SelectExpandStruct;
+import com.epmet.dataaggre.dto.epmettduck.struct.*;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
@@ -362,6 +359,9 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
 
             //3.4级联 todo
             if(ProjectItemTypeEnum.CASCADER.getValue().equals(currentType)){
+                CascaderExpandStruct cascaderExpandStruct = JSON.parseObject(item.getExpand(), CascaderExpandStruct.class);
+
+
 
                 continue;
             }

From 93ac12427017659f371eeaa12fafc5746739676e Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Sat, 18 Sep 2021 10:30:13 +0800
Subject: [PATCH 24/68] =?UTF-8?q?=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dataaggre/controller/EpmetTDuckController.java   | 7 ++++++-
 .../dataaggre/service/epmettduck/PrUserProjectService.java | 6 ++++++
 .../service/epmettduck/impl/PrUserProjectServiceImpl.java  | 7 ++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
index 84fc0c68d2..6b0914cf52 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
@@ -79,7 +79,12 @@ public class EpmetTDuckController {
         return new Result<List<AnalysisReportResDTO>>().ok(prUserProjectService.queryAnalysisReport(formDTO.getProjectKey()));
     }
 
-
+    /**
+     * @Description  问卷调查列表
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/9/18 10:29 上午
+     */
     @PostMapping("list")
     public Result<List<TDuckListResultDTO>> queryProjectList(@RequestBody TDuckListFormDTO formDTO,@LoginUser TokenDto tokenDto){
         ValidatorUtils.validateEntity(formDTO,TDuckListFormDTO.TDuckListForm.class);
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
index 4000d3bdc0..554f1382ff 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
@@ -107,6 +107,12 @@ public interface PrUserProjectService extends BaseService<PrUserProjectEntity> {
      */
     ProjectProfileResultDTO queryProjectProfile(String projectKey);
 
+    /**
+     * @Description  问卷调查列表
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/9/18 10:29 上午
+     */
     List<TDuckListResultDTO> queryProjectList(TDuckListFormDTO formDTO);
 
     /**
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 85af5a1598..8702b43399 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -134,7 +134,12 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
         return baseDao.queryProjectProfile(projectKey);
     }
 
-
+    /**
+     * @Description  问卷调查列表
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/9/18 10:29 上午
+     */
     @Override
     public List<TDuckListResultDTO> queryProjectList(TDuckListFormDTO formDTO) {
         List<String> projectKeys = baseDao.selectProjectKey(formDTO.getOrgIds());

From 556b52daef9e613915ee9b042b58f0bc5eebda67 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Sat, 18 Sep 2021 11:02:17 +0800
Subject: [PATCH 25/68] headerinfo

---
 .../form/TDuckHeaderInfoFormDTO.java          | 23 +++++++++++++++++++
 .../controller/EpmetTDuckController.java      | 13 +++++++++++
 .../epmettduck/PrUserProjectService.java      |  9 ++++++++
 .../impl/PrUserProjectServiceImpl.java        | 17 ++++++++++++++
 4 files changed, 62 insertions(+)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckHeaderInfoFormDTO.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckHeaderInfoFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckHeaderInfoFormDTO.java
new file mode 100644
index 0000000000..2e0a1a953f
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckHeaderInfoFormDTO.java
@@ -0,0 +1,23 @@
+package com.epmet.dataaggre.dto.epmettduck.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/17 10:47 上午
+ * @DESC
+ */
+@Data
+public class TDuckHeaderInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 3624352114576287768L;
+
+    public interface TDuckHeaderInfoForm{}
+
+    @NotBlank(message = "projectKey不能为空",groups = TDuckHeaderInfoForm.class)
+    private String projectKey;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
index 6b0914cf52..169fd2eb04 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
@@ -7,6 +7,7 @@ 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.dataaggre.dto.epmettduck.form.TDuckDetailFormDTO;
+import com.epmet.dataaggre.dto.epmettduck.form.TDuckHeaderInfoFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
@@ -92,4 +93,16 @@ public class EpmetTDuckController {
         return new Result<List<TDuckListResultDTO>>().ok(prUserProjectService.queryProjectList(formDTO));
     }
 
+    /**
+     * @Description  查询问卷调查的头部信息
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/9/18 10:35 上午
+     */
+    @PostMapping("headerinfo")
+    public Result<PrUserProjectEntity> headerInfo(@RequestBody TDuckHeaderInfoFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, TDuckHeaderInfoFormDTO.TDuckHeaderInfoForm.class);
+        return new Result<PrUserProjectEntity>().ok(prUserProjectService.headerInfo(formDTO));
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
index 554f1382ff..b581036ef0 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
@@ -20,6 +20,7 @@ package com.epmet.dataaggre.service.epmettduck;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
+import com.epmet.dataaggre.dto.epmettduck.form.TDuckHeaderInfoFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
@@ -124,4 +125,12 @@ public interface PrUserProjectService extends BaseService<PrUserProjectEntity> {
      * @date 2021/9/16 5:57 下午
      */
     List<AnalysisReportResDTO> queryAnalysisReport(String projectKey);
+
+    /**
+     * @Description  查询问卷调查的头部信息
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/9/18 10:35 上午
+     */
+    PrUserProjectEntity headerInfo(TDuckHeaderInfoFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 8702b43399..22b4795302 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -19,8 +19,11 @@ package com.epmet.dataaggre.service.epmettduck.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
@@ -32,6 +35,7 @@ import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao;
 import com.epmet.dataaggre.dao.epmettduck.PrVistRecordDao;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
 import com.epmet.dataaggre.dto.epmettduck.ProjectItemTypeEnum;
+import com.epmet.dataaggre.dto.epmettduck.form.TDuckHeaderInfoFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.OptionDTO;
@@ -462,6 +466,19 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
         return itemList;
     }
 
+    /**
+     * @Description  查询问卷调查的头部信息
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/9/18 10:35 上午
+     */
+    @Override
+    public PrUserProjectEntity headerInfo(TDuckHeaderInfoFormDTO formDTO) {
+        LambdaQueryWrapper<PrUserProjectEntity> w = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<PrUserProjectEntity> eq = w.eq(PrUserProjectEntity::getKey, formDTO.getProjectKey());
+        return eq.getEntity();
+    }
+
     private List<Map.Entry<Integer, Integer>> sortMap(Map<Integer, Integer> map, boolean asc) {
 
         Stream<Map.Entry<Integer, Integer>> stream = null;

From 85f6011766a136276903460f199b1720b9aacdf9 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Sat, 18 Sep 2021 15:35:25 +0800
Subject: [PATCH 26/68] =?UTF-8?q?=E5=8F=91=E5=B8=83=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmettduck/result/GetRangeResultDTO.java  | 24 +++++++++++++++
 .../controller/EpmetTDuckController.java      | 26 ++++++++++------
 .../epmettduck/PrPublishRangeService.java     |  9 ++++++
 .../epmettduck/PrUserProjectService.java      | 10 +++++++
 .../impl/PrPublishRangeServiceImpl.java       | 23 ++++++++++++++
 .../impl/PrUserProjectServiceImpl.java        | 30 +++++++++++++++----
 6 files changed, 107 insertions(+), 15 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/GetRangeResultDTO.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/GetRangeResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/GetRangeResultDTO.java
new file mode 100644
index 0000000000..d1ea08f6fe
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/GetRangeResultDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.dataaggre.dto.epmettduck.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/9/18 14:41
+ */
+@Data
+public class GetRangeResultDTO implements Serializable {
+    private static final long serialVersionUID = 3208245365454855156L;
+    /**
+     * 适用于哪个端 resi：居民端用户；gov：工作端用户
+     */
+    private String client;
+    /**
+     * 发布范围组织列表
+     */
+    private List<String> orgList;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
index 169fd2eb04..8491176bcc 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
@@ -1,25 +1,21 @@
 package com.epmet.dataaggre.controller;
 
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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.dataaggre.dto.epmettduck.PrPublishRangeDTO;
+import com.epmet.dataaggre.dto.epmettduck.form.ProjectKeyCommonDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckDetailFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckHeaderInfoFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.GetRangeResultDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectItemService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dataaggre.dto.epmettduck.form.ProjectKeyCommonDTO;
-import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
-import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -105,4 +101,16 @@ public class EpmetTDuckController {
         return new Result<PrUserProjectEntity>().ok(prUserProjectService.headerInfo(formDTO));
     }
 
+    /**
+     * @Description 获取发布范围
+     * @Param formDTO
+     * @Return {@link Result< GetRangeResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/18 15:18
+     */
+    @PostMapping("getrange")
+    public Result<GetRangeResultDTO> getRange(@RequestBody PrPublishRangeDTO formDTO) {
+        return new Result<GetRangeResultDTO>().ok(prUserProjectService.getRange(formDTO.getProjectKey()));
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrPublishRangeService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrPublishRangeService.java
index 403587d43d..bef2464a1d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrPublishRangeService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrPublishRangeService.java
@@ -92,4 +92,13 @@ public interface PrPublishRangeService extends BaseService<PrPublishRangeEntity>
      * @date 2021-09-15
      */
     void delete(String[] ids);
+
+    /**
+     * @Description 发布范围组织列表
+     * @Param projectKey
+     * @Return {@link List< String>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/18 15:28
+     */
+    List<String> getRangeOrgList(String projectKey);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
index b581036ef0..7ba470a900 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
@@ -23,6 +23,7 @@ import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckHeaderInfoFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.GetRangeResultDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
@@ -133,4 +134,13 @@ public interface PrUserProjectService extends BaseService<PrUserProjectEntity> {
      * @date 2021/9/18 10:35 上午
      */
     PrUserProjectEntity headerInfo(TDuckHeaderInfoFormDTO formDTO);
+
+    /**
+     * @Description 获取发布范围
+     * @Param projectKey
+     * @Return {@link GetRangeResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/18 15:18
+     */
+    GetRangeResultDTO getRange(String projectKey);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java
index c6bb01a72e..cc7d940a6e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java
@@ -17,6 +17,7 @@
 
 package com.epmet.dataaggre.service.epmettduck.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
@@ -30,13 +31,16 @@ import com.epmet.dataaggre.dto.epmettduck.PrPublishRangeDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrPublishRangeEntity;
 import com.epmet.dataaggre.service.epmettduck.PrPublishRangeService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 项目发布范围表
@@ -101,4 +105,23 @@ public class PrPublishRangeServiceImpl extends BaseServiceImpl<PrPublishRangeDao
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @param projectKey
+     * @Description 发布范围组织列表
+     * @Param projectKey
+     * @Return {@link List< String>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/18 15:28
+     */
+    @Override
+    public List<String> getRangeOrgList(String projectKey) {
+        LambdaQueryWrapper<PrPublishRangeEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(PrPublishRangeEntity::getProjectKey, projectKey);
+        List<PrPublishRangeEntity> list = baseDao.selectList(wrapper);
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return list.stream().map(PrPublishRangeEntity::getOrgId).collect(Collectors.toList());
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 22b4795302..645b2dbd6a 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -19,11 +19,9 @@ package com.epmet.dataaggre.service.epmettduck.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
@@ -37,13 +35,11 @@ import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
 import com.epmet.dataaggre.dto.epmettduck.ProjectItemTypeEnum;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckHeaderInfoFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO;
-import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
-import com.epmet.dataaggre.dto.epmettduck.result.OptionDTO;
-import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
-import com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.*;
 import com.epmet.dataaggre.dto.epmettduck.struct.*;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity;
+import com.epmet.dataaggre.service.epmettduck.PrPublishRangeService;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -54,6 +50,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -72,6 +69,8 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
 
     @Autowired
     private PrVistRecordDao visitRecordDao;
+    @Resource
+    private PrPublishRangeService prPublishRangeService;
 
     @Override
     public PageData<PrUserProjectDTO> page(Map<String, Object> params) {
@@ -479,6 +478,25 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
         return eq.getEntity();
     }
 
+    /**
+     * @param projectKey
+     * @Description 获取发布范围
+     * @Param projectKey
+     * @Return {@link GetRangeResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/18 15:18
+     */
+    @Override
+    public GetRangeResultDTO getRange(String projectKey) {
+        GetRangeResultDTO result = new GetRangeResultDTO();
+        LambdaQueryWrapper<PrUserProjectEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(PrUserProjectEntity :: getKey, projectKey);
+        PrUserProjectEntity entity = baseDao.selectOne(wrapper);
+        result.setClient(entity.getClient());
+        result.setOrgList(prPublishRangeService.getRangeOrgList(projectKey));
+        return result;
+    }
+
     private List<Map.Entry<Integer, Integer>> sortMap(Map<Integer, Integer> map, boolean asc) {
 
         Stream<Map.Entry<Integer, Integer>> stream = null;

From c8f5acd8f008b1431f729c4aca967491a6a5706a Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sat, 18 Sep 2021 15:52:30 +0800
Subject: [PATCH 27/68] jilian

---
 .../dto/epmettduck/result/CascaderDTO.java    | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java
new file mode 100644
index 0000000000..1421c6b192
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dataaggre.dto.epmettduck.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description TODO
+ * @Author yinzuomei
+ * @Date 2021/9/18 3:40 下午
+ */
+@Data
+public class CascaderDTO implements Serializable {
+    /**
+     * 选项id
+     */
+    private Integer id;
+    /**
+     * 选项名
+     */
+    private String label;
+
+    private String value;
+    private List<String> labels;
+    private List<Integer> ids;
+}
+

From 629d448c9b7cbd3f169be823dd459e1c33d2f3ba Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 22 Sep 2021 09:46:11 +0800
Subject: [PATCH 28/68] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=87=8D=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java  | 8 ++++++++
 .../service/epmettduck/impl/PrUserProjectServiceImpl.java | 5 ++---
 .../main/resources/mapper/epmettduck/PrUserProjectDao.xml | 5 +++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
index c1803e359c..6f246a7d4e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
@@ -64,4 +64,12 @@ public interface PrUserProjectDao extends BaseDao<PrUserProjectEntity> {
      * @date 2021/9/17 3:41 下午
      */
     List<TDuckListResultDTO> queryProjectList(@Param("keys")List<String> keys, @Param("status")Integer status,@Param("client")String client);
+
+    /**
+     * @Description  查询头部信息【问卷调查的名字和描述】
+     * @Param key
+     * @author zxc
+     * @date 2021/9/22 9:42 上午
+     */
+    PrUserProjectEntity selectHeaderInfoByKey(@Param("key")String key);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 645b2dbd6a..494d1803b4 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -473,9 +473,8 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
      */
     @Override
     public PrUserProjectEntity headerInfo(TDuckHeaderInfoFormDTO formDTO) {
-        LambdaQueryWrapper<PrUserProjectEntity> w = new LambdaQueryWrapper<>();
-        LambdaQueryWrapper<PrUserProjectEntity> eq = w.eq(PrUserProjectEntity::getKey, formDTO.getProjectKey());
-        return eq.getEntity();
+        PrUserProjectEntity prUserProjectEntity = baseDao.selectHeaderInfoByKey(formDTO.getProjectKey());
+        return prUserProjectEntity;
     }
 
     /**
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
index cabb6eb4a3..55ddf7c707 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
@@ -70,4 +70,9 @@
             )
         ORDER BY created_time DESC
     </select>
+
+    <!-- 查询头部信息【问卷调查的名字和描述】 -->
+    <select id="selectHeaderInfoByKey" resultType="com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity">
+        select * from pr_user_project where del_flag = 0 and `key` = #{key}
+    </select>
 </mapper>
\ No newline at end of file

From 958ccb12eab27a24b3c24b1eed2f5683ce63a68d Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 22 Sep 2021 09:59:28 +0800
Subject: [PATCH 29/68] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/filter/CpAuthGatewayFilterFactory.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java b/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
index 538467d2e1..ee9125db57 100644
--- a/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
+++ b/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
@@ -105,10 +105,10 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
                         break;
                 }
             } catch (RenException e) {
-                logger.error("CpAuthGatewayFilterFactory认证出错，错误信息:{}", ExceptionUtils.getErrorStackTrace(e));
+                logger.error("CpAuthGatewayFilterFactory认证出错RenException，错误信息:{}", ExceptionUtils.getErrorStackTrace(e));
                 return response(exchange, new Result<>().error(e.getCode(), e.getMessage()));
             } catch (Exception e) {
-                logger.error("CpAuthGatewayFilterFactory认证出错，错误信息:{}", ExceptionUtils.getErrorStackTrace(e));
+                logger.error("CpAuthGatewayFilterFactory认证出错Exception，错误信息:{}", ExceptionUtils.getErrorStackTrace(e));
                 return response(exchange, new Result<>().error(e.getMessage()));
             }
 

From 8668404a81df46706ede64bbee38a0bc4b358dcf Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 22 Sep 2021 12:06:38 +0800
Subject: [PATCH 30/68] =?UTF-8?q?=E7=BA=A7=E8=81=94=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/epmettduck/result/CascaderDTO.java    | 17 +++++++++---
 .../impl/PrUserProjectServiceImpl.java        | 27 +++++++++++++++++--
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java
index 1421c6b192..82904a64e9 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java
@@ -6,14 +6,14 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- * @Description TODO
+ * @Description 级联选择组件答案参数格式
  * @Author yinzuomei
  * @Date 2021/9/18 3:40 下午
  */
 @Data
 public class CascaderDTO implements Serializable {
     /**
-     * 选项id
+     * 当前选择的选项id
      */
     private Integer id;
     /**
@@ -21,8 +21,19 @@ public class CascaderDTO implements Serializable {
      */
     private String label;
 
+    /**
+     * 选项名
+     */
     private String value;
+
+    /**
+     * pid
+     */
+    private String pid;
+
+    /**
+     * 全路径名字
+     */
     private List<String> labels;
-    private List<Integer> ids;
 }
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 645b2dbd6a..d2e119198e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -26,6 +26,7 @@ import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
@@ -365,12 +366,34 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                 continue;
             }
 
-            //3.4级联 todo
+            //3.4级联
             if(ProjectItemTypeEnum.CASCADER.getValue().equals(currentType)){
+                //目前cascaderExpandStruct 没啥用
                 CascaderExpandStruct cascaderExpandStruct = JSON.parseObject(item.getExpand(), CascaderExpandStruct.class);
+                //共选择了多少次，每道题相加
+                int totalCount = 0;
+                Map<String, Integer> resMap = new HashMap<>();
+                for (PrUserProjectResultEntity res : resultList) {
+                    JSONObject originalData = JSON.parseObject(res.getOriginalData());
+                    List<CascaderDTO> dtoList = JSON.parseArray(originalData.get(key).toString(), CascaderDTO.class);
+                    if(CollectionUtils.isEmpty(dtoList)){
+                        log.info(String.format("当前userId：%s，没有填写本题itemId：%s",res.getUserId(),key));
+                        continue;
+                    }
 
+                    for (CascaderDTO cascaderDTO : dtoList) {
+                        if (null != cascaderDTO && !CollectionUtils.isEmpty(cascaderDTO.getLabels())) {
+                            totalCount += 1;
+                            String pathName = StringUtils.join(cascaderDTO.getLabels(), StringUtils.isNotBlank(cascaderExpandStruct.getSeparator()) ? cascaderExpandStruct.getSeparator() : StrConstant.HYPHEN);
+                            Integer count = resMap.get(pathName);
+                            resMap.put(pathName, count == null ? 1 : count + 1);
+                        }
+                    }
 
-
+                }
+                detail.put("totalCount", totalCount);
+                detail.put("profile", resMap);
+                item.setDetail(detail);
                 continue;
             }
 

From 685089b88a493712746b8cc16f6de9bd72551795 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 22 Sep 2021 12:46:01 +0800
Subject: [PATCH 31/68] =?UTF-8?q?=E8=A1=A5=E5=85=85=E7=BA=A7=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java | 4 ++++
 .../service/epmettduck/impl/PrUserProjectServiceImpl.java     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java
index c572f882af..7961fdbf5d 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java
@@ -41,6 +41,10 @@ public class CascaderExpandStruct {
         public Integer id;
         public String label;
         public String value;
+        /**
+         * 莹姐加了这个参数
+         */
+        public String pid;
         public List<Option> children;
     }
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 2d7f422212..c1bcf57deb 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -366,7 +366,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                 continue;
             }
 
-            //3.4级联
+            //3.4级联  todo
             if(ProjectItemTypeEnum.CASCADER.getValue().equals(currentType)){
                 //目前cascaderExpandStruct 没啥用
                 CascaderExpandStruct cascaderExpandStruct = JSON.parseObject(item.getExpand(), CascaderExpandStruct.class);

From 8756c1243f5837cc7319ecb1f367e93e04465a8a Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 22 Sep 2021 13:38:11 +0800
Subject: [PATCH 32/68] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=851?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmettduck/form/ItemResDetailFormDTO.java | 30 +++++++++++++++++++
 .../epmettduck/form/ProjectKeyCommonDTO.java  |  5 +++-
 .../controller/EpmetTDuckController.java      | 21 ++++++++++---
 3 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java
new file mode 100644
index 0000000000..f0c992eae4
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java
@@ -0,0 +1,30 @@
+package com.epmet.dataaggre.dto.epmettduck.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description 问卷-数据分析-查看详情
+ * @Author yinzuomei
+ * @Date 2021/9/22 1:29 下午
+ */
+@Data
+public class ItemResDetailFormDTO extends ProjectKeyCommonDTO{
+
+    @NotBlank(message = "formItemId不能为空",groups = AddUserInternalGroup.class)
+    private String formItemId;
+    /**
+     * 表单项类型
+     */
+    @NotBlank(message = "type不能为空",groups = AddUserInternalGroup.class)
+    private String type;
+
+
+    /**
+     * 09.22目前产品没要求分页
+     */
+    private Integer pageNo;
+    private Integer pageSize;
+}
+
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ProjectKeyCommonDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ProjectKeyCommonDTO.java
index e8aaee1205..9ed0db927c 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ProjectKeyCommonDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ProjectKeyCommonDTO.java
@@ -2,6 +2,7 @@ package com.epmet.dataaggre.dto.epmettduck.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -11,10 +12,12 @@ import java.io.Serializable;
  */
 @Data
 public class ProjectKeyCommonDTO implements Serializable {
-
+    public interface AddUserInternalGroup {
+    }
     /**
      * 问卷id, 对应pr_user_project.key
      */
+    @NotBlank(message = "projectKey不能为空",groups = AddUserInternalGroup.class)
     private String projectKey;
 }
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
index 8491176bcc..641feb4d28 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
@@ -5,10 +5,7 @@ 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.dataaggre.dto.epmettduck.PrPublishRangeDTO;
-import com.epmet.dataaggre.dto.epmettduck.form.ProjectKeyCommonDTO;
-import com.epmet.dataaggre.dto.epmettduck.form.TDuckDetailFormDTO;
-import com.epmet.dataaggre.dto.epmettduck.form.TDuckHeaderInfoFormDTO;
-import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO;
+import com.epmet.dataaggre.dto.epmettduck.form.*;
 import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.GetRangeResultDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
@@ -17,6 +14,7 @@ import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectItemService;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
+import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -73,6 +71,7 @@ public class EpmetTDuckController {
      */
     @PostMapping("analysisreport")
     public Result<List<AnalysisReportResDTO>> queryAnalysisReport(@RequestBody ProjectKeyCommonDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,ProjectKeyCommonDTO.AddUserInternalGroup.class);
         return new Result<List<AnalysisReportResDTO>>().ok(prUserProjectService.queryAnalysisReport(formDTO.getProjectKey()));
     }
 
@@ -113,4 +112,18 @@ public class EpmetTDuckController {
         return new Result<GetRangeResultDTO>().ok(prUserProjectService.getRange(formDTO.getProjectKey()));
     }
 
+    /**
+     * 查看详情
+     *
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @date 2021/9/22 1:37 下午
+     */
+    @PostMapping("itemresdetail")
+    public Result queryItemResDetail(@RequestBody ItemResDetailFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,ProjectKeyCommonDTO.AddUserInternalGroup.class);
+        //todo
+        return null;
+    }
 }

From 523d14ada0ae239cc131dc880b2305644ac1ae5e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 22 Sep 2021 13:56:32 +0800
Subject: [PATCH 33/68] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=852?=
 =?UTF-8?q?=E5=8D=A0=E4=B8=AA=E5=9D=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmettduck/form/ItemResDetailFormDTO.java   |  3 +++
 .../controller/EpmetTDuckController.java        | 10 ++++++----
 .../epmettduck/PrUserProjectService.java        | 13 +++++++++++++
 .../impl/PrUserProjectServiceImpl.java          | 17 ++++++++++++++++-
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java
index f0c992eae4..381efce3d1 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java
@@ -3,6 +3,7 @@ package com.epmet.dataaggre.dto.epmettduck.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * @Description 问卷-数据分析-查看详情
@@ -24,7 +25,9 @@ public class ItemResDetailFormDTO extends ProjectKeyCommonDTO{
     /**
      * 09.22目前产品没要求分页
      */
+    @NotNull(message = "pageNo不能为空",groups = AddUserInternalGroup.class)
     private Integer pageNo;
+    @NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class)
     private Integer pageSize;
 }
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
index 641feb4d28..ea90244205 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
@@ -1,6 +1,7 @@
 package com.epmet.dataaggre.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+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.commons.tools.validator.ValidatorUtils;
@@ -14,7 +15,6 @@ import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectItemService;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
-import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -114,6 +114,8 @@ public class EpmetTDuckController {
 
     /**
      * 查看详情
+     * 1、联系人组件统一用一个统计显示多少条，点击查看更多显示汇总列表，如有非必填项没有填写显示空（手机号验证不需要统计）
+     * 2、单行文本、多行文本、时间选择、时间范围、日期选择、日期范围，统计填写人数，点击查看列表
      *
      * @param formDTO
      * @return  com.epmet.commons.tools.utils.Result
@@ -121,9 +123,9 @@ public class EpmetTDuckController {
      * @date 2021/9/22 1:37 下午
      */
     @PostMapping("itemresdetail")
-    public Result queryItemResDetail(@RequestBody ItemResDetailFormDTO formDTO){
+    public Result<PageData<List<String>>> queryItemResDetail(@RequestBody ItemResDetailFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO,ProjectKeyCommonDTO.AddUserInternalGroup.class);
-        //todo
-        return null;
+        PageData<List<String>> page=prUserProjectService.queryItemResDetail(formDTO);
+        return new Result<PageData<List<String>>>().ok(page);
     }
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
index 7ba470a900..55323276ea 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
@@ -20,6 +20,7 @@ package com.epmet.dataaggre.service.epmettduck;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
+import com.epmet.dataaggre.dto.epmettduck.form.ItemResDetailFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckHeaderInfoFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
@@ -143,4 +144,16 @@ public interface PrUserProjectService extends BaseService<PrUserProjectEntity> {
      * @Date 2021/9/18 15:18
      */
     GetRangeResultDTO getRange(String projectKey);
+
+    /**
+     * 查看详情
+     * 1、联系人组件统一用一个统计显示多少条，点击查看更多显示汇总列表，如有非必填项没有填写显示空（手机号验证不需要统计）
+     * 2、单行文本、多行文本、时间选择、时间范围、日期选择、日期范围，统计填写人数，点击查看列表
+     *
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @date 2021/9/22 1:37 下午
+     */
+    PageData<List<String>> queryItemResDetail(ItemResDetailFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index c1bcf57deb..de5a424a77 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -34,6 +34,7 @@ import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao;
 import com.epmet.dataaggre.dao.epmettduck.PrVistRecordDao;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
 import com.epmet.dataaggre.dto.epmettduck.ProjectItemTypeEnum;
+import com.epmet.dataaggre.dto.epmettduck.form.ItemResDetailFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckHeaderInfoFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.*;
@@ -531,5 +532,19 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
     }
 
 
-
+    /**
+     * 查看详情
+     * 1、联系人组件统一用一个统计显示多少条，点击查看更多显示汇总列表，如有非必填项没有填写显示空（手机号验证不需要统计）
+     * 2、单行文本、多行文本、时间选择、时间范围、日期选择、日期范围，统计填写人数，点击查看列表
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @date 2021/9/22 1:37 下午
+     */
+    @Override
+    public PageData<List<String>> queryItemResDetail(ItemResDetailFormDTO formDTO) {
+        //todo
+        return null;
+    }
 }
\ No newline at end of file

From 56a211036ccd1413a7038c4e308724bfdca91f29 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 22 Sep 2021 14:44:04 +0800
Subject: [PATCH 34/68] =?UTF-8?q?=E8=8B=B1=E6=96=87=E9=80=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmettduck/form/ItemResDetailFormDTO.java |  9 ++-
 .../controller/EpmetTDuckController.java      |  6 +-
 .../epmettduck/PrUserProjectService.java      |  2 +-
 .../impl/PrUserProjectServiceImpl.java        | 57 ++++++++++++++-----
 4 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java
index 381efce3d1..a107080eea 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dataaggre.dto.epmettduck.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 /**
  * @Description 问卷-数据分析-查看详情
@@ -25,9 +24,9 @@ public class ItemResDetailFormDTO extends ProjectKeyCommonDTO{
     /**
      * 09.22目前产品没要求分页
      */
-    @NotNull(message = "pageNo不能为空",groups = AddUserInternalGroup.class)
-    private Integer pageNo;
-    @NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class)
-    private Integer pageSize;
+    //@NotNull(message = "pageNo不能为空",groups = AddUserInternalGroup.class)
+    //private Integer pageNo;
+    //@NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class)
+    //private Integer pageSize;
 }
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
index ea90244205..8f7638e589 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
@@ -1,7 +1,6 @@
 package com.epmet.dataaggre.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
-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.commons.tools.validator.ValidatorUtils;
@@ -123,9 +122,8 @@ public class EpmetTDuckController {
      * @date 2021/9/22 1:37 下午
      */
     @PostMapping("itemresdetail")
-    public Result<PageData<List<String>>> queryItemResDetail(@RequestBody ItemResDetailFormDTO formDTO){
+    public Result<List<String>> queryItemResDetail(@RequestBody ItemResDetailFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO,ProjectKeyCommonDTO.AddUserInternalGroup.class);
-        PageData<List<String>> page=prUserProjectService.queryItemResDetail(formDTO);
-        return new Result<PageData<List<String>>>().ok(page);
+        return new Result<List<String>>().ok(prUserProjectService.queryItemResDetail(formDTO));
     }
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
index 55323276ea..16d14000d5 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
@@ -155,5 +155,5 @@ public interface PrUserProjectService extends BaseService<PrUserProjectEntity> {
      * @author yinzuomei
      * @date 2021/9/22 1:37 下午
      */
-    PageData<List<String>> queryItemResDetail(ItemResDetailFormDTO formDTO);
+    List<String> queryItemResDetail(ItemResDetailFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index de5a424a77..f04cf54966 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -376,21 +376,22 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                 Map<String, Integer> resMap = new HashMap<>();
                 for (PrUserProjectResultEntity res : resultList) {
                     JSONObject originalData = JSON.parseObject(res.getOriginalData());
-                    List<CascaderDTO> dtoList = JSON.parseArray(originalData.get(key).toString(), CascaderDTO.class);
-                    if(CollectionUtils.isEmpty(dtoList)){
-                        log.info(String.format("当前userId：%s，没有填写本题itemId：%s",res.getUserId(),key));
-                        continue;
-                    }
+                    if(originalData.containsKey(key)){
+                        List<CascaderDTO> dtoList = JSON.parseArray(originalData.get(key).toString(), CascaderDTO.class);
+                        if(CollectionUtils.isEmpty(dtoList)){
+                            log.info(String.format("当前userId：%s，没有填写本题itemId：%s",res.getUserId(),key));
+                            continue;
+                        }
 
-                    for (CascaderDTO cascaderDTO : dtoList) {
-                        if (null != cascaderDTO && !CollectionUtils.isEmpty(cascaderDTO.getLabels())) {
-                            totalCount += 1;
-                            String pathName = StringUtils.join(cascaderDTO.getLabels(), StringUtils.isNotBlank(cascaderExpandStruct.getSeparator()) ? cascaderExpandStruct.getSeparator() : StrConstant.HYPHEN);
-                            Integer count = resMap.get(pathName);
-                            resMap.put(pathName, count == null ? 1 : count + 1);
+                        for (CascaderDTO cascaderDTO : dtoList) {
+                            if (null != cascaderDTO && !CollectionUtils.isEmpty(cascaderDTO.getLabels())) {
+                                totalCount += 1;
+                                String pathName = StringUtils.join(cascaderDTO.getLabels(), StringUtils.isNotBlank(cascaderExpandStruct.getSeparator()) ? cascaderExpandStruct.getSeparator() : StrConstant.HYPHEN);
+                                Integer count = resMap.get(pathName);
+                                resMap.put(pathName, count == null ? 1 : count + 1);
+                            }
                         }
                     }
-
                 }
                 detail.put("totalCount", totalCount);
                 detail.put("profile", resMap);
@@ -543,8 +544,34 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
      * @date 2021/9/22 1:37 下午
      */
     @Override
-    public PageData<List<String>> queryItemResDetail(ItemResDetailFormDTO formDTO) {
-        //todo
-        return null;
+    public List<String> queryItemResDetail(ItemResDetailFormDTO formDTO) {
+        List<PrUserProjectResultEntity> resultList=baseDao.selectResults(formDTO.getProjectKey());
+        if(CollectionUtils.isEmpty(resultList)){
+            return new ArrayList<>();
+        }
+        List<String> stringList=new ArrayList<>();
+        String key="field".concat(formDTO.getFormItemId());
+        for(PrUserProjectResultEntity res:resultList){
+            JSONObject originalData = JSON.parseObject(res.getOriginalData());
+            if(ProjectItemTypeEnum.INPUT.getValue().equals(formDTO.getType())
+                    ||ProjectItemTypeEnum.TEXTAREA.getValue().equals(formDTO.getType())
+                    ||ProjectItemTypeEnum.TIME.getValue().equals(formDTO.getType())
+                    ||ProjectItemTypeEnum.DATE.getValue().equals(formDTO.getType())){
+                if(originalData.containsKey(key)){
+                    stringList.add((String) originalData.get(key));
+                    continue;
+                }
+            }else if(ProjectItemTypeEnum.TIME_RANGE.getValue().equals(formDTO.getType())
+                    ||ProjectItemTypeEnum.DATE_RANGE.getValue().equals(formDTO.getType())){
+                if(originalData.containsKey(key)){
+                    List<String> originalList= (List<String>) originalData.get(key);
+                    if(!CollectionUtils.isEmpty(originalList)){
+                        String rangeStr=StringUtils.join(originalList,StrConstant.COMMA);
+                        stringList.add(rangeStr);
+                    }
+                }
+            }
+        }
+        return stringList;
     }
 }
\ No newline at end of file

From 602700be59c84253e41ca50313259580fd448137 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 22 Sep 2021 14:52:44 +0800
Subject: [PATCH 35/68] headerInfo

---
 .../epmet/dataaggre/entity/epmettduck/PrUserProjectEntity.java | 3 +++
 .../service/epmettduck/impl/PrUserProjectServiceImpl.java      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectEntity.java
index c32091af26..5d06a44213 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectEntity.java
@@ -17,6 +17,7 @@
 
 package com.epmet.dataaggre.entity.epmettduck;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -51,6 +52,7 @@ public class PrUserProjectEntity extends BaseEpmetEntity {
     /**
      * 项目code
      */
+    @TableField("`key`")
 	private String key;
 
     /**
@@ -71,6 +73,7 @@ public class PrUserProjectEntity extends BaseEpmetEntity {
     /**
      * 项目描述
      */
+    @TableField("`describe`")
 	private String describe;
 
     /**
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index f04cf54966..c16b46fd71 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -498,7 +498,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
      */
     @Override
     public PrUserProjectEntity headerInfo(TDuckHeaderInfoFormDTO formDTO) {
-        PrUserProjectEntity prUserProjectEntity = baseDao.selectHeaderInfoByKey(formDTO.getProjectKey());
+        PrUserProjectEntity prUserProjectEntity = baseDao.selectOne(new QueryWrapper<PrUserProjectEntity>().lambda().eq(PrUserProjectEntity::getKey, formDTO.getProjectKey()));
         return prUserProjectEntity;
     }
 

From 250c2e701d8bd54eaf2699bfd1d4cea4448dbcd9 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 22 Sep 2021 16:10:16 +0800
Subject: [PATCH 36/68] itemresdetail-concat

---
 .../result/ConcatTableHeaderDTO.java          | 27 ++++++
 .../result/ItemResDetailConcatResultDTO.java  | 25 +++++
 .../controller/EpmetTDuckController.java      | 21 ++++-
 .../dao/epmettduck/PrUserProjectDao.java      | 10 ++
 .../epmettduck/PrUserProjectItemEntity.java   | 11 ++-
 .../epmettduck/PrUserProjectService.java      | 15 ++-
 .../impl/PrUserProjectServiceImpl.java        | 92 +++++++++++++++++++
 .../mapper/epmettduck/PrUserProjectDao.xml    | 18 ++++
 8 files changed, 207 insertions(+), 12 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ConcatTableHeaderDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ConcatTableHeaderDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ConcatTableHeaderDTO.java
new file mode 100644
index 0000000000..b44f736854
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ConcatTableHeaderDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.dataaggre.dto.epmettduck.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 表头
+ * @Author yinzuomei
+ * @Date 2021/9/22 3:41 下午
+ */
+@Data
+public class ConcatTableHeaderDTO implements Serializable {
+    private static final long serialVersionUID = -1133629000511948034L;
+
+    /**
+     * 显示名称
+     */
+    private String label;
+    /**
+     * 表单项Id
+     */
+    private String formItemId;
+
+    private String type;
+}
+
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java
new file mode 100644
index 0000000000..f8b5acb128
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java
@@ -0,0 +1,25 @@
+package com.epmet.dataaggre.dto.epmettduck.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description TODO
+ * @Author yinzuomei
+ * @Date 2021/9/22 2:54 下午
+ */
+@Data
+public class ItemResDetailConcatResultDTO implements Serializable {
+    private static final long serialVersionUID = -3695200094740706700L;
+    private List<ConcatTableHeaderDTO> tableHeaderList;
+    private List<List<String>> dataList;
+
+    public ItemResDetailConcatResultDTO(){
+        this.tableHeaderList=new ArrayList<>();
+        this.dataList=new ArrayList<>();
+    }
+}
+
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
index 8f7638e589..2d5c8d6d12 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
@@ -6,10 +6,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.epmettduck.PrPublishRangeDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.*;
-import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
-import com.epmet.dataaggre.dto.epmettduck.result.GetRangeResultDTO;
-import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
-import com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.*;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectItemService;
@@ -121,9 +118,23 @@ public class EpmetTDuckController {
      * @author yinzuomei
      * @date 2021/9/22 1:37 下午
      */
-    @PostMapping("itemresdetail")
+    @PostMapping("itemresdetail-list")
     public Result<List<String>> queryItemResDetail(@RequestBody ItemResDetailFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO,ProjectKeyCommonDTO.AddUserInternalGroup.class);
         return new Result<List<String>>().ok(prUserProjectService.queryItemResDetail(formDTO));
     }
+
+    /**
+     * 联系人组件-查看详情
+     *
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result<com.epmet.dataaggre.dto.epmettduck.result.ItemResDetailConcatResultDTO>
+     * @author yinzuomei
+     * @date 2021/9/22 2:57 下午
+     */
+    @PostMapping("itemresdetail-concat")
+    public Result<ItemResDetailConcatResultDTO> queryItemResDetailConcat(@RequestBody ItemResDetailFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,ProjectKeyCommonDTO.AddUserInternalGroup.class);
+        return new Result<ItemResDetailConcatResultDTO>().ok(prUserProjectService.queryItemResDetailConcat(formDTO));
+    }
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
index 6f246a7d4e..2c185e8db7 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
@@ -72,4 +72,14 @@ public interface PrUserProjectDao extends BaseDao<PrUserProjectEntity> {
      * @date 2021/9/22 9:42 上午
      */
     PrUserProjectEntity selectHeaderInfoByKey(@Param("key")String key);
+
+    /**
+     * 当前问卷中所有的联系人组件
+     *
+     * @param projectKey
+     * @return  java.util.List<com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO>
+     * @author yinzuomei
+     * @date 2021/9/22 3:04 下午
+     */
+    List<AnalysisReportResDTO> selectCocatItems(String projectKey);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java
index e01e439e9a..3138b101ab 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java
@@ -19,7 +19,6 @@ package com.epmet.dataaggre.entity.epmettduck;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import com.epmet.dataaggre.dto.epmettduck.ProjectItemTypeEnum;
@@ -30,7 +29,6 @@ import lombok.experimental.Accessors;
 import lombok.experimental.FieldNameConstants;
 import org.apache.ibatis.type.EnumTypeHandler;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -124,5 +122,12 @@ public class PrUserProjectItemEntity extends BaseEpmetEntity{
 	@TableField(typeHandler = JacksonTypeHandler.class)
 	private List<Map<String, Object>> regList;
 
-
+	/**
+	 * 组件类型：联系人组件：concat；输入型组件：input;图片型组件：image;辅助型组件：assist；选择性组件：choose
+	 */
+	private String moduleType;
+	/**
+	 * 与type一致，手机号：mobile；邮箱：email；身份证号：id_card
+	 */
+	private String itemKey;
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
index 16d14000d5..b8f9aac6db 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
@@ -23,10 +23,7 @@ import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.ItemResDetailFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckHeaderInfoFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO;
-import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
-import com.epmet.dataaggre.dto.epmettduck.result.GetRangeResultDTO;
-import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
-import com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.*;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 
 import java.util.List;
@@ -156,4 +153,14 @@ public interface PrUserProjectService extends BaseService<PrUserProjectEntity> {
      * @date 2021/9/22 1:37 下午
      */
     List<String> queryItemResDetail(ItemResDetailFormDTO formDTO);
+
+    /**
+     * 联系人组件
+     *
+     * @param formDTO
+     * @return  com.epmet.dataaggre.dto.epmettduck.result.ItemResDetailConcatResultDTO
+     * @author yinzuomei
+     * @date 2021/9/22 2:57 下午
+     */
+    ItemResDetailConcatResultDTO queryItemResDetailConcat(ItemResDetailFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index f04cf54966..85788c5ab2 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -574,4 +574,96 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
         }
         return stringList;
     }
+
+    /**
+     * 联系人组件
+     *
+     * @param formDTO
+     * @return com.epmet.dataaggre.dto.epmettduck.result.ItemResDetailConcatResultDTO
+     * @author yinzuomei
+     * @date 2021/9/22 2:57 下午
+     */
+    @Override
+    public ItemResDetailConcatResultDTO queryItemResDetailConcat(ItemResDetailFormDTO formDTO) {
+        // 联系人题目
+        List<AnalysisReportResDTO> itemList=baseDao.selectCocatItems(formDTO.getProjectKey());
+        if(CollectionUtils.isEmpty(itemList)){
+            return new ItemResDetailConcatResultDTO();
+        }
+        //答案
+        List<PrUserProjectResultEntity> resultList=baseDao.selectResults(formDTO.getProjectKey());
+        if(CollectionUtils.isEmpty(resultList)){
+            return new ItemResDetailConcatResultDTO();
+        }
+
+        ItemResDetailConcatResultDTO resultDTO=new ItemResDetailConcatResultDTO();
+
+        List<ConcatTableHeaderDTO> tableHeaderList=new ArrayList<>();
+        for(AnalysisReportResDTO item:itemList){
+            ConcatTableHeaderDTO headerDTO=new ConcatTableHeaderDTO();
+            headerDTO.setFormItemId(item.getFormItemId());
+            headerDTO.setLabel(item.getLabel());
+            headerDTO.setType(item.getType());
+            tableHeaderList.add(headerDTO);
+        }
+
+        List<List<String>> dataList=new ArrayList<>();
+        for(PrUserProjectResultEntity res:resultList){
+            List<String> userAnswer=new ArrayList<>();
+            JSONObject originalData = JSON.parseObject(res.getOriginalData());
+
+            for(ConcatTableHeaderDTO header:tableHeaderList){
+                String key="field".concat(header.getFormItemId());
+
+                //手机号、邮箱、身份证、单行文本: INPUT
+                if(ProjectItemTypeEnum.INPUT.getValue().equals(header.getType())){
+                    if(originalData.containsKey(key)){
+                        if(StringUtils.isNotBlank(originalData.get(key).toString())){
+                            userAnswer.add((String) originalData.get(key));
+                        }else{
+                            userAnswer.add(StrConstant.EPMETY_STR);
+                        }
+                    }else{
+                        log.warn("没有当前的key:,可能用户没填写吧"+key);
+                        userAnswer.add(StrConstant.HYPHEN);
+                    }
+                }
+                //省市联动： PROVINCE_CITY
+                if(ProjectItemTypeEnum.PROVINCE_CITY.getValue().equals(header.getType())){
+                    if(originalData.containsKey(key)){
+                        List<String> provinceCityList= (List<String>) originalData.get(key);
+                        if(!CollectionUtils.isEmpty(provinceCityList)){
+                            userAnswer.add(StringUtils.join(provinceCityList,StrConstant.HYPHEN));
+                        }else{
+                            userAnswer.add(StrConstant.EPMETY_STR);
+                        }
+                    }else{
+                        log.warn("没有当前的key:,可能用户没填写吧"+key);
+                        userAnswer.add(StrConstant.HYPHEN);
+                    }
+                }
+
+                //地理位置：INPUT_MAP
+                if(ProjectItemTypeEnum.INPUT_MAP.getValue().equals(header.getType())){
+                    if(originalData.containsKey(key)){
+                        List<String> inputMap= (List<String>) originalData.get(key);
+                        log.info("地理位置："+JSON.toJSONString(inputMap,true));
+                        if (!CollectionUtils.isEmpty(inputMap) && inputMap.size() == 3) {
+                            userAnswer.add(inputMap.get(2));
+                        }else{
+                            userAnswer.add(StrConstant.EPMETY_STR);
+                        }
+                    }else{
+                        log.warn("没有当前的key:,可能用户没填写吧"+key);
+                        userAnswer.add(StrConstant.HYPHEN);
+                    }
+                }
+
+            }
+            dataList.add(userAnswer);
+        }
+        resultDTO.setTableHeaderList(tableHeaderList);
+        resultDTO.setDataList(dataList);
+        return resultDTO;
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
index 55ddf7c707..dde753c53f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
@@ -35,6 +35,24 @@
         order by i.sort asc
     </select>
 
+    <!--  当前问卷中所有的联系人组件   -->
+    <select id="selectCocatItems" parameterType="java.lang.String" resultType="com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO">
+        select
+            i.project_key,
+            i.form_item_id,
+            i.type,
+            i.label,
+            i.is_display_type,
+            i.show_label,
+            i.required,
+            i.sort,
+            i.expand
+        from pr_user_project_item  i
+        where i.del_flag='0'
+          and i.project_key=#{projectKey}
+          and i.module_type='concat'
+        order by i.sort asc
+    </select>
     <!--   调查问卷的答题结果 -->
     <select id="selectResults" parameterType="java.lang.String" resultType="com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity">
         select

From 2f19b9b8b9dbab5cd06b1411fad14d0e84149a54 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 22 Sep 2021 16:23:56 +0800
Subject: [PATCH 37/68] test

---
 .../com/epmet/dataaggre/controller/EpmetTDuckController.java   | 2 +-
 .../dataaggre/service/epmettduck/PrUserProjectService.java     | 3 ++-
 .../service/epmettduck/impl/PrUserProjectServiceImpl.java      | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
index 2d5c8d6d12..0570b55494 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
@@ -133,7 +133,7 @@ public class EpmetTDuckController {
      * @date 2021/9/22 2:57 下午
      */
     @PostMapping("itemresdetail-concat")
-    public Result<ItemResDetailConcatResultDTO> queryItemResDetailConcat(@RequestBody ItemResDetailFormDTO formDTO){
+    public Result<ItemResDetailConcatResultDTO> queryItemResDetailConcat(@RequestBody ProjectKeyCommonDTO formDTO){
         ValidatorUtils.validateEntity(formDTO,ProjectKeyCommonDTO.AddUserInternalGroup.class);
         return new Result<ItemResDetailConcatResultDTO>().ok(prUserProjectService.queryItemResDetailConcat(formDTO));
     }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
index b8f9aac6db..b68943ec11 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.ItemResDetailFormDTO;
+import com.epmet.dataaggre.dto.epmettduck.form.ProjectKeyCommonDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckHeaderInfoFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.*;
@@ -162,5 +163,5 @@ public interface PrUserProjectService extends BaseService<PrUserProjectEntity> {
      * @author yinzuomei
      * @date 2021/9/22 2:57 下午
      */
-    ItemResDetailConcatResultDTO queryItemResDetailConcat(ItemResDetailFormDTO formDTO);
+    ItemResDetailConcatResultDTO queryItemResDetailConcat(ProjectKeyCommonDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 681cff110e..936545842f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -35,6 +35,7 @@ import com.epmet.dataaggre.dao.epmettduck.PrVistRecordDao;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
 import com.epmet.dataaggre.dto.epmettduck.ProjectItemTypeEnum;
 import com.epmet.dataaggre.dto.epmettduck.form.ItemResDetailFormDTO;
+import com.epmet.dataaggre.dto.epmettduck.form.ProjectKeyCommonDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckHeaderInfoFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.*;
@@ -584,7 +585,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
      * @date 2021/9/22 2:57 下午
      */
     @Override
-    public ItemResDetailConcatResultDTO queryItemResDetailConcat(ItemResDetailFormDTO formDTO) {
+    public ItemResDetailConcatResultDTO queryItemResDetailConcat(ProjectKeyCommonDTO formDTO) {
         // 联系人题目
         List<AnalysisReportResDTO> itemList=baseDao.selectCocatItems(formDTO.getProjectKey());
         if(CollectionUtils.isEmpty(itemList)){

From 064edafb567a6f7fc181535b48cf70341a5854ce Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 22 Sep 2021 16:28:29 +0800
Subject: [PATCH 38/68] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0modul?=
 =?UTF-8?q?eType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java  | 2 ++
 .../src/main/resources/mapper/epmettduck/PrUserProjectDao.xml  | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java
index 8c2b7b4ebe..e532068afa 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java
@@ -62,5 +62,7 @@ public class AnalysisReportResDTO implements Serializable {
      */
     @JsonIgnore
     private String expand;
+
+    private String moduleType;
 }
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
index dde753c53f..cfcd370980 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
@@ -27,7 +27,8 @@
             i.show_label,
             i.required,
             i.sort,
-            i.expand
+            i.expand,
+            module_type
         from pr_user_project_item  i
         where i.del_flag='0'
           and i.project_key=#{projectKey}

From bda946b5af0c688e7569edc68b0b69383334f066 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 22 Sep 2021 16:57:40 +0800
Subject: [PATCH 39/68] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0modul?=
 =?UTF-8?q?eType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/epmettduck/PrUserProjectDao.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
index cfcd370980..c3eba867a2 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
@@ -28,7 +28,7 @@
             i.required,
             i.sort,
             i.expand,
-            module_type
+            i.module_type
         from pr_user_project_item  i
         where i.del_flag='0'
           and i.project_key=#{projectKey}

From 0f976f92c51d1898f066c6747912e3b3b63eb521 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 22 Sep 2021 18:08:35 +0800
Subject: [PATCH 40/68] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/entity/epmettduck/PrUserProjectItemEntity.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java
index 3138b101ab..e3ce844e69 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java
@@ -127,7 +127,7 @@ public class PrUserProjectItemEntity extends BaseEpmetEntity{
 	 */
 	private String moduleType;
 	/**
-	 * 与type一致，手机号：mobile；邮箱：email；身份证号：id_card
+	 * 与type一致，手机号：phone；邮箱：email；身份证号：idCard。。。。详见数据库
 	 */
 	private String itemKey;
 }

From 0f45ccba6bbf9102b2767ee93e17d2d0cfbd3899 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 23 Sep 2021 09:46:09 +0800
Subject: [PATCH 41/68] =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E7=BA=A7=E4=B8=8B=E7=BA=A7=E7=BB=84=E7=BB=87=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dataaggre/controller/GovOrgController.java | 4 ++--
 .../epmet/dataaggre/service/govorg/GovOrgService.java    | 2 +-
 .../dataaggre/service/govorg/impl/GovOrgServiceImpl.java | 9 ++++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java
index 824fab2fae..2f4c4af69d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java
@@ -174,9 +174,9 @@ public class GovOrgController {
      * @Date 2021/9/17 14:02
      */
     @PostMapping("agencytree")
-    public Result<OrgTreeResultDTO> getAgencyTree(@LoginUser TokenDto tokenDto, @RequestBody SubOrgFormDTO formDTO) {
+    public Result<List<OrgTreeResultDTO>> getAgencyTree(@LoginUser TokenDto tokenDto, @RequestBody SubOrgFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
-        return new Result<OrgTreeResultDTO>().ok(govOrgService.getAgencyTree(tokenDto, formDTO));
+        return new Result<List<OrgTreeResultDTO>>().ok(govOrgService.getAgencyTree(tokenDto, formDTO));
     }
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
index 2e2b7c6e88..1bd061569e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
@@ -144,5 +144,5 @@ public interface GovOrgService {
      * @Author zhaoqifeng
      * @Date 2021/9/17 14:03
      */
-    OrgTreeResultDTO getAgencyTree(TokenDto tokenDto, SubOrgFormDTO formDTO);
+    List<OrgTreeResultDTO> getAgencyTree(TokenDto tokenDto, SubOrgFormDTO formDTO);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
index 45ee6810fe..d6191a0537 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
@@ -502,11 +502,14 @@ public class GovOrgServiceImpl implements GovOrgService {
      * @Date 2021/9/17 14:03
      */
     @Override
-    public OrgTreeResultDTO getAgencyTree(TokenDto tokenDto, SubOrgFormDTO formDTO) {
+    public List<OrgTreeResultDTO> getAgencyTree(TokenDto tokenDto, SubOrgFormDTO formDTO) {
+        List<OrgTreeResultDTO> list = new ArrayList<>();
         if ("resi".equals(formDTO.getClient())) {
-            return customerAgencyDao.getResiOrgTree(formDTO.getAgencyId());
+            list.add(customerAgencyDao.getResiOrgTree(formDTO.getAgencyId()));
+            return list;
         }
-        return customerAgencyDao.getOrgTree(formDTO.getAgencyId());
+        list.add(customerAgencyDao.getOrgTree(formDTO.getAgencyId()));
+        return list;
     }
 
 }

From 76958714f12f7fce2857bd53a9134afee6b3f5cb Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 23 Sep 2021 10:04:37 +0800
Subject: [PATCH 42/68] =?UTF-8?q?=E4=BF=AE=E6=94=B9pid=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java
index 82904a64e9..44e8edac6f 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java
@@ -29,7 +29,7 @@ public class CascaderDTO implements Serializable {
     /**
      * pid
      */
-    private String pid;
+    private Integer pid;
 
     /**
      * 全路径名字

From 3b57469604d5b192674ee3ac2adce0e6bb79f8bf Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 23 Sep 2021 10:09:49 +0800
Subject: [PATCH 43/68] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java  | 8 --------
 .../main/resources/mapper/epmettduck/PrUserProjectDao.xml | 4 ----
 2 files changed, 12 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
index 2c185e8db7..ed30a5246c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
@@ -65,14 +65,6 @@ public interface PrUserProjectDao extends BaseDao<PrUserProjectEntity> {
      */
     List<TDuckListResultDTO> queryProjectList(@Param("keys")List<String> keys, @Param("status")Integer status,@Param("client")String client);
 
-    /**
-     * @Description  查询头部信息【问卷调查的名字和描述】
-     * @Param key
-     * @author zxc
-     * @date 2021/9/22 9:42 上午
-     */
-    PrUserProjectEntity selectHeaderInfoByKey(@Param("key")String key);
-
     /**
      * 当前问卷中所有的联系人组件
      *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
index c3eba867a2..228419ebea 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
@@ -90,8 +90,4 @@
         ORDER BY created_time DESC
     </select>
 
-    <!-- 查询头部信息【问卷调查的名字和描述】 -->
-    <select id="selectHeaderInfoByKey" resultType="com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity">
-        select * from pr_user_project where del_flag = 0 and `key` = #{key}
-    </select>
 </mapper>
\ No newline at end of file

From 32ad450ca5eebb91fa159e03c6d95e24f7db6995 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 23 Sep 2021 11:56:27 +0800
Subject: [PATCH 44/68] =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E7=BA=A7=E4=B8=8B=E7=BA=A7=E7=BB=84=E7=BB=87=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/govorg/CustomerAgencyDao.java         | 25 +++++++++++++++--
 .../mapper/govorg/CustomerAgencyDao.xml       | 27 +++++++++++++++++--
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java
index 673d317fe6..bd29030255 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java
@@ -71,10 +71,31 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @return
      */
     StaffOrgRelationResultDTO getStaffFromOrgType(@Param("staffId") String staffId);
-
+    /**
+     * @Description 工作端组织级下级组织树
+     * @Param agencyId
+     * @Return {@link OrgTreeResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/23 10:16
+     */
     OrgTreeResultDTO getOrgTree(@Param("agencyId") String agencyId);
     List<OrgTreeResultDTO> getSubOrgList(@Param("pid") String pid);
-
+    /**
+     * @Description 居民端组织级下级组织树
+     * @Param agencyId
+     * @Return {@link OrgTreeResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/23 10:16
+     */
     OrgTreeResultDTO getResiOrgTree(@Param("agencyId") String agencyId);
     List<OrgTreeResultDTO> getResiSubOrgList(@Param("pid") String pid);
+
+    /**
+     * @Description 工作人员所在的组织，部门，网格
+     * @Param staffId
+     * @Return {@link List< String>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/23 10:16
+     */
+    List<String> getOrgList(@Param("staffId") String staffId);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
index d47b736984..aa345e87b3 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
@@ -201,7 +201,7 @@
         select
             ID AS orgId,
             ORGANIZATION_NAME AS orgName,
-            'agency' AS orgName,
+            'agency' AS orgType,
             CONCAT(PIDS,ID) AS orgPids
 
         from
@@ -253,7 +253,7 @@
         select
             ID AS orgId,
             ORGANIZATION_NAME AS orgName,
-            'agency' AS orgName,
+            'agency' AS orgType,
             CONCAT(PIDS,ID) AS orgPids
 
         from
@@ -262,5 +262,28 @@
              DEL_FLAG = 0
             AND ID = #{agencyId}
     </select>
+    <select id="getOrgList" resultType="java.lang.String">
+        SELECT
+            AGENCY_ID AS orgId
+        FROM
+            customer_staff_agency
+        WHERE
+            DEL_FLAG = '0'
+            AND USER_ID = #{staffId} UNION
+        SELECT
+            GRID_ID AS orgId
+        FROM
+            customer_staff_grid
+        WHERE
+            DEL_FLAG = '0'
+            AND USER_ID = #{staffId} UNION
+        SELECT
+            DEPARTMENT_ID AS orgId
+        FROM
+            customer_staff_department
+        WHERE
+            DEL_FLAG = '0'
+            AND USER_ID = #{staffId}
+    </select>
 
 </mapper>

From 912f60a174f8f31675ef77f5b63be5d9c2fd2aff Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 23 Sep 2021 14:26:00 +0800
Subject: [PATCH 45/68] =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E7=BA=A7=E4=B8=8B=E7=BA=A7=E7=BB=84=E7=BB=87=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmettduck/result/RedPointResultDTO.java  | 19 +++++++++
 .../controller/EpmetTDuckController.java      |  5 +++
 .../epmettduck/PrPublishRangeService.java     |  9 +++++
 .../epmettduck/PrUserProjectService.java      | 10 +++++
 .../epmettduck/PrVistRecordService.java       |  9 +++++
 .../impl/PrPublishRangeServiceImpl.java       | 26 ++++++++++++
 .../impl/PrUserProjectServiceImpl.java        | 40 +++++++++++++++++++
 .../impl/PrVistRecordServiceImpl.java         | 22 ++++++++++
 .../service/govorg/GovOrgService.java         |  9 +++++
 .../govorg/impl/GovOrgServiceImpl.java        | 18 ++++++++-
 10 files changed, 165 insertions(+), 2 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/RedPointResultDTO.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/RedPointResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/RedPointResultDTO.java
new file mode 100644
index 0000000000..38654cfd7c
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/RedPointResultDTO.java
@@ -0,0 +1,19 @@
+package com.epmet.dataaggre.dto.epmettduck.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/9/23 10:03
+ */
+@Data
+public class RedPointResultDTO implements Serializable {
+    private static final long serialVersionUID = -2230123089546481389L;
+    /**
+     * redPoint
+     */
+    private String redPoint;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
index 0570b55494..38956e9129 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
@@ -137,4 +137,9 @@ public class EpmetTDuckController {
         ValidatorUtils.validateEntity(formDTO,ProjectKeyCommonDTO.AddUserInternalGroup.class);
         return new Result<ItemResDetailConcatResultDTO>().ok(prUserProjectService.queryItemResDetailConcat(formDTO));
     }
+
+    @PostMapping("redpoint")
+    public Result<RedPointResultDTO> redPoint(@LoginUser TokenDto tokenDto) {
+        return new Result<RedPointResultDTO>().ok(prUserProjectService.redPoint(tokenDto));
+    }
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrPublishRangeService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrPublishRangeService.java
index bef2464a1d..d238150f46 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrPublishRangeService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrPublishRangeService.java
@@ -101,4 +101,13 @@ public interface PrPublishRangeService extends BaseService<PrPublishRangeEntity>
      * @Date 2021/9/18 15:28
      */
     List<String> getRangeOrgList(String projectKey);
+
+    /**
+     * @Description 获取组织范围内的问卷
+     * @Param orgList
+     * @Return {@link List< PrPublishRangeDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/23 10:27
+     */
+    List<PrPublishRangeDTO> getListByOrg(List<String> orgList);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
index b68943ec11..2a35aa5ac1 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
@@ -19,6 +19,7 @@ package com.epmet.dataaggre.service.epmettduck;
 
 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.dataaggre.dto.epmettduck.PrUserProjectDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.ItemResDetailFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.ProjectKeyCommonDTO;
@@ -164,4 +165,13 @@ public interface PrUserProjectService extends BaseService<PrUserProjectEntity> {
      * @date 2021/9/22 2:57 下午
      */
     ItemResDetailConcatResultDTO queryItemResDetailConcat(ProjectKeyCommonDTO formDTO);
+
+    /**
+     * 有新的问卷显示小红点
+     * @Param tokenDto
+     * @Return {@link RedPointResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/23 10:05
+     */
+    RedPointResultDTO redPoint(TokenDto tokenDto);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrVistRecordService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrVistRecordService.java
index a0d8f5a044..691e4cdc95 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrVistRecordService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrVistRecordService.java
@@ -92,4 +92,13 @@ public interface PrVistRecordService extends BaseService<PrVistRecordEntity> {
      * @date 2021-09-15
      */
     void delete(String[] ids);
+
+    /**
+     * @Description 获取最新访问记录
+     * @Param staffId
+     * @Return {@link PrVistRecordDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/23 14:16
+     */
+    PrVistRecordDTO getNewestRecord(String staffId);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java
index cc7d940a6e..d669cc59c8 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
@@ -124,4 +125,29 @@ public class PrPublishRangeServiceImpl extends BaseServiceImpl<PrPublishRangeDao
         return list.stream().map(PrPublishRangeEntity::getOrgId).collect(Collectors.toList());
     }
 
+    /**
+     * @param orgList
+     * @Description 获取组织范围内的问卷
+     * @Param orgList
+     * @Return {@link List< PrPublishRangeDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/23 10:27
+     */
+    @Override
+    public List<PrPublishRangeDTO> getListByOrg(List<String> orgList) {
+        LambdaQueryWrapper<PrPublishRangeEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.and(w -> {
+            for (int i = 0; i < orgList.size(); i++) {
+                if (NumConstant.ZERO == i) {
+                    w.like(PrPublishRangeEntity :: getOrgId, orgList.get(i));
+                } else {
+                    w.or().like(PrPublishRangeEntity :: getOrgId, orgList.get(i));
+                }
+            }
+        });
+        wrapper.orderByDesc(PrPublishRangeEntity::getCreatedTime);
+        List<PrPublishRangeEntity> list = baseDao.selectList(wrapper);
+        return ConvertUtils.sourceToTarget(list, PrPublishRangeDTO.class);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 936545842f..eeba85b869 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -28,11 +28,14 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 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.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao;
 import com.epmet.dataaggre.dao.epmettduck.PrVistRecordDao;
+import com.epmet.dataaggre.dto.epmettduck.PrPublishRangeDTO;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
+import com.epmet.dataaggre.dto.epmettduck.PrVistRecordDTO;
 import com.epmet.dataaggre.dto.epmettduck.ProjectItemTypeEnum;
 import com.epmet.dataaggre.dto.epmettduck.form.ItemResDetailFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.ProjectKeyCommonDTO;
@@ -44,6 +47,8 @@ import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity;
 import com.epmet.dataaggre.service.epmettduck.PrPublishRangeService;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
+import com.epmet.dataaggre.service.epmettduck.PrVistRecordService;
+import com.epmet.dataaggre.service.govorg.GovOrgService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -74,6 +79,10 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
     private PrVistRecordDao visitRecordDao;
     @Resource
     private PrPublishRangeService prPublishRangeService;
+    @Resource
+    private GovOrgService govOrgService;
+    @Resource
+    private PrVistRecordService prVistRecordService;
 
     @Override
     public PageData<PrUserProjectDTO> page(Map<String, Object> params) {
@@ -667,4 +676,35 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
         resultDTO.setDataList(dataList);
         return resultDTO;
     }
+
+    /**
+     * 有新的问卷显示小红点
+     *
+     * @param tokenDto
+     * @Param tokenDto
+     * @Return {@link RedPointResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/23 10:05
+     */
+    @Override
+    public RedPointResultDTO redPoint(TokenDto tokenDto) {
+        RedPointResultDTO result = new RedPointResultDTO();
+        List<String> orgList = govOrgService.getStaffOrgList(tokenDto.getUserId());
+        List<PrPublishRangeDTO> list = prPublishRangeService.getListByOrg(orgList);
+        if (CollectionUtils.isEmpty(list)) {
+            result.setRedPoint(NumConstant.ZERO_STR);
+            return result;
+        }
+        PrVistRecordDTO visitRecord =  prVistRecordService.getNewestRecord(tokenDto.getUserId());
+        if (null == visitRecord) {
+            result.setRedPoint(NumConstant.ONE_STR);
+            return result;
+        }
+        if (list.get(0).getCreatedTime().compareTo(visitRecord.getCreatedTime()) > 0) {
+            result.setRedPoint(NumConstant.ONE_STR);
+        } else {
+            result.setRedPoint(NumConstant.ZERO_STR);
+        }
+        return result;
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java
index 408701f7ce..fbc0034277 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java
@@ -17,6 +17,7 @@
 
 package com.epmet.dataaggre.service.epmettduck.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
@@ -30,6 +31,7 @@ import com.epmet.dataaggre.dto.epmettduck.PrVistRecordDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrVistRecordEntity;
 import com.epmet.dataaggre.service.epmettduck.PrVistRecordService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -101,4 +103,24 @@ public class PrVistRecordServiceImpl extends BaseServiceImpl<PrVistRecordDao, Pr
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @param staffId
+     * @Description 获取最新访问记录
+     * @Param staffId
+     * @Return {@link PrVistRecordDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/23 14:16
+     */
+    @Override
+    public PrVistRecordDTO getNewestRecord(String staffId) {
+        LambdaQueryWrapper<PrVistRecordEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(PrVistRecordEntity::getUserId, staffId);
+        wrapper.orderByDesc(PrVistRecordEntity::getCreatedTime);
+        List<PrVistRecordEntity> list = baseDao.selectList(wrapper);
+        if (CollectionUtils.isEmpty(list)) {
+            return null;
+        }
+        return ConvertUtils.sourceToTarget(list, PrVistRecordDTO.class).get(0);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
index 1bd061569e..41b97b57ac 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
@@ -145,4 +145,13 @@ public interface GovOrgService {
      * @Date 2021/9/17 14:03
      */
     List<OrgTreeResultDTO> getAgencyTree(TokenDto tokenDto, SubOrgFormDTO formDTO);
+
+    /**
+     * @Description 工作人员所在的组织，部门，网格
+     * @Param staffId
+     * @Return {@link List< String>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/23 10:14
+     */
+    List<String> getStaffOrgList(String staffId);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
index a9cd8bbcf4..d4e265cdec 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
@@ -509,13 +509,27 @@ public class GovOrgServiceImpl implements GovOrgService {
      */
     @Override
     public List<OrgTreeResultDTO> getAgencyTree(TokenDto tokenDto, SubOrgFormDTO formDTO) {
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
         List<OrgTreeResultDTO> list = new ArrayList<>();
         if ("resi".equals(formDTO.getClient())) {
-            list.add(customerAgencyDao.getResiOrgTree(formDTO.getAgencyId()));
+            list.add(customerAgencyDao.getResiOrgTree(staffInfo.getAgencyId()));
             return list;
         }
-        list.add(customerAgencyDao.getOrgTree(formDTO.getAgencyId()));
+        list.add(customerAgencyDao.getOrgTree(staffInfo.getAgencyId()));
         return list;
     }
 
+    /**
+     * @param staffId
+     * @Description 工作人员所在的组织，部门，网格
+     * @Param staffId
+     * @Return {@link List< String>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/23 10:14
+     */
+    @Override
+    public List<String> getStaffOrgList(String staffId) {
+        return customerAgencyDao.getOrgList(staffId);
+    }
+
 }

From 856c6a7cf5200a14103d5570e6bebec312daa0e1 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 23 Sep 2021 14:34:29 +0800
Subject: [PATCH 46/68] =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E7=BA=A7=E4=B8=8B=E7=BA=A7=E7=BB=84=E7=BB=87=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dataaggre/controller/GovOrgController.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java
index 2f4c4af69d..17f939b2c6 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java
@@ -175,7 +175,6 @@ public class GovOrgController {
      */
     @PostMapping("agencytree")
     public Result<List<OrgTreeResultDTO>> getAgencyTree(@LoginUser TokenDto tokenDto, @RequestBody SubOrgFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
         return new Result<List<OrgTreeResultDTO>>().ok(govOrgService.getAgencyTree(tokenDto, formDTO));
     }
 

From faaf084b7b3c98776f6d37dc0666a26e0095e6a0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 23 Sep 2021 15:30:21 +0800
Subject: [PATCH 47/68] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/ItemResDetailConcatResultDTO.java  |  9 ++-
 .../impl/PrUserProjectServiceImpl.java        | 79 ++++++++++---------
 2 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java
index f8b5acb128..ea4bb06164 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java
@@ -4,10 +4,12 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
- * @Description TODO
+ * @Description 联系人组件
  * @Author yinzuomei
  * @Date 2021/9/22 2:54 下午
  */
@@ -15,11 +17,12 @@ import java.util.List;
 public class ItemResDetailConcatResultDTO implements Serializable {
     private static final long serialVersionUID = -3695200094740706700L;
     private List<ConcatTableHeaderDTO> tableHeaderList;
-    private List<List<String>> dataList;
+    private Map<String,List<String>> dataMap;
+    //private List<List<String>> dataList;
 
     public ItemResDetailConcatResultDTO(){
         this.tableHeaderList=new ArrayList<>();
-        this.dataList=new ArrayList<>();
+        this.dataMap=new HashMap<>();
     }
 }
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index eeba85b869..4219fc8d2e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -617,63 +617,64 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
             tableHeaderList.add(headerDTO);
         }
 
-        List<List<String>> dataList=new ArrayList<>();
-        for(PrUserProjectResultEntity res:resultList){
-            List<String> userAnswer=new ArrayList<>();
-            JSONObject originalData = JSON.parseObject(res.getOriginalData());
+        Map<String,List<String>> dataList=new HashMap<>();
+        //start
+        for (ConcatTableHeaderDTO header : tableHeaderList) {
+            String mapKey=header.getFormItemId();
+            List<String> mapValue=new ArrayList<>();
 
-            for(ConcatTableHeaderDTO header:tableHeaderList){
-                String key="field".concat(header.getFormItemId());
+            for (PrUserProjectResultEntity res : resultList) {
+                JSONObject originalData = JSON.parseObject(res.getOriginalData());
+                String key = "field".concat(header.getFormItemId());
 
                 //手机号、邮箱、身份证、单行文本: INPUT
-                if(ProjectItemTypeEnum.INPUT.getValue().equals(header.getType())){
-                    if(originalData.containsKey(key)){
-                        if(StringUtils.isNotBlank(originalData.get(key).toString())){
-                            userAnswer.add((String) originalData.get(key));
-                        }else{
-                            userAnswer.add(StrConstant.EPMETY_STR);
+                if (ProjectItemTypeEnum.INPUT.getValue().equals(header.getType())) {
+                    if (originalData.containsKey(key)) {
+                        if (StringUtils.isNotBlank(originalData.get(key).toString())) {
+                            mapValue.add((String) originalData.get(key));
+                        } else {
+                            mapValue.add(StrConstant.EPMETY_STR);
                         }
-                    }else{
-                        log.warn("没有当前的key:,可能用户没填写吧"+key);
-                        userAnswer.add(StrConstant.HYPHEN);
+                    } else {
+                        log.warn("没有当前的key:,可能用户没填写吧" + key);
+                        mapValue.add(StrConstant.HYPHEN);
                     }
                 }
                 //省市联动： PROVINCE_CITY
-                if(ProjectItemTypeEnum.PROVINCE_CITY.getValue().equals(header.getType())){
-                    if(originalData.containsKey(key)){
-                        List<String> provinceCityList= (List<String>) originalData.get(key);
-                        if(!CollectionUtils.isEmpty(provinceCityList)){
-                            userAnswer.add(StringUtils.join(provinceCityList,StrConstant.HYPHEN));
-                        }else{
-                            userAnswer.add(StrConstant.EPMETY_STR);
+                if (ProjectItemTypeEnum.PROVINCE_CITY.getValue().equals(header.getType())) {
+                    if (originalData.containsKey(key)) {
+                        List<String> provinceCityList = (List<String>) originalData.get(key);
+                        if (!CollectionUtils.isEmpty(provinceCityList)) {
+                            mapValue.add(StringUtils.join(provinceCityList, StrConstant.HYPHEN));
+                        } else {
+                            mapValue.add(StrConstant.EPMETY_STR);
                         }
-                    }else{
-                        log.warn("没有当前的key:,可能用户没填写吧"+key);
-                        userAnswer.add(StrConstant.HYPHEN);
+                    } else {
+                        log.warn("没有当前的key:,可能用户没填写吧" + key);
+                        mapValue.add(StrConstant.HYPHEN);
                     }
                 }
 
                 //地理位置：INPUT_MAP
-                if(ProjectItemTypeEnum.INPUT_MAP.getValue().equals(header.getType())){
-                    if(originalData.containsKey(key)){
-                        List<String> inputMap= (List<String>) originalData.get(key);
-                        log.info("地理位置："+JSON.toJSONString(inputMap,true));
+                if (ProjectItemTypeEnum.INPUT_MAP.getValue().equals(header.getType())) {
+                    if (originalData.containsKey(key)) {
+                        List<String> inputMap = (List<String>) originalData.get(key);
+                        log.info("地理位置：" + JSON.toJSONString(inputMap, true));
                         if (!CollectionUtils.isEmpty(inputMap) && inputMap.size() == 3) {
-                            userAnswer.add(inputMap.get(2));
-                        }else{
-                            userAnswer.add(StrConstant.EPMETY_STR);
+                            mapValue.add(inputMap.get(2));
+                        } else {
+                            mapValue.add(StrConstant.EPMETY_STR);
                         }
-                    }else{
-                        log.warn("没有当前的key:,可能用户没填写吧"+key);
-                        userAnswer.add(StrConstant.HYPHEN);
+                    } else {
+                        log.warn("没有当前的key:,可能用户没填写吧" + key);
+                        mapValue.add(StrConstant.HYPHEN);
                     }
                 }
-
             }
-            dataList.add(userAnswer);
-        }
+            dataList.put(mapKey,mapValue);
+        }//end
         resultDTO.setTableHeaderList(tableHeaderList);
-        resultDTO.setDataList(dataList);
+        resultDTO.setDataMap(dataList);
         return resultDTO;
     }
 

From 22cf09fb820a19eb4b2c67d9545a5f43d9d70949 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 23 Sep 2021 15:46:56 +0800
Subject: [PATCH 48/68] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/ItemResDetailConcatResultDTO.java  |  5 +--
 .../impl/PrUserProjectServiceImpl.java        | 42 +++++++++----------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java
index ea4bb06164..8bb7fb8ccc 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java
@@ -4,7 +4,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -17,12 +16,12 @@ import java.util.Map;
 public class ItemResDetailConcatResultDTO implements Serializable {
     private static final long serialVersionUID = -3695200094740706700L;
     private List<ConcatTableHeaderDTO> tableHeaderList;
-    private Map<String,List<String>> dataMap;
+    private List<Map<String,String>> dataMap;
     //private List<List<String>> dataList;
 
     public ItemResDetailConcatResultDTO(){
         this.tableHeaderList=new ArrayList<>();
-        this.dataMap=new HashMap<>();
+        this.dataMap=new ArrayList<>();
     }
 }
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 4219fc8d2e..1030c10c32 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -617,27 +617,25 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
             tableHeaderList.add(headerDTO);
         }
 
-        Map<String,List<String>> dataList=new HashMap<>();
-        //start
-        for (ConcatTableHeaderDTO header : tableHeaderList) {
-            String mapKey=header.getFormItemId();
-            List<String> mapValue=new ArrayList<>();
-
-            for (PrUserProjectResultEntity res : resultList) {
-                JSONObject originalData = JSON.parseObject(res.getOriginalData());
-                String key = "field".concat(header.getFormItemId());
+        List<Map<String,String>> dataMap=new ArrayList<>();
 
+        for (PrUserProjectResultEntity res : resultList) {
+            JSONObject originalData = JSON.parseObject(res.getOriginalData());
+            Map<String,String> mapUnit=new HashMap<>();
+            //start
+            for (ConcatTableHeaderDTO header : tableHeaderList) {
+                String key = "field".concat(header.getFormItemId());
                 //手机号、邮箱、身份证、单行文本: INPUT
                 if (ProjectItemTypeEnum.INPUT.getValue().equals(header.getType())) {
                     if (originalData.containsKey(key)) {
                         if (StringUtils.isNotBlank(originalData.get(key).toString())) {
-                            mapValue.add((String) originalData.get(key));
+                            mapUnit.put(header.getFormItemId(),(String) originalData.get(key));
                         } else {
-                            mapValue.add(StrConstant.EPMETY_STR);
+                            mapUnit.put(header.getFormItemId(),StrConstant.EPMETY_STR);
                         }
                     } else {
                         log.warn("没有当前的key:,可能用户没填写吧" + key);
-                        mapValue.add(StrConstant.HYPHEN);
+                        mapUnit.put(header.getFormItemId(),StrConstant.HYPHEN);
                     }
                 }
                 //省市联动： PROVINCE_CITY
@@ -645,13 +643,13 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                     if (originalData.containsKey(key)) {
                         List<String> provinceCityList = (List<String>) originalData.get(key);
                         if (!CollectionUtils.isEmpty(provinceCityList)) {
-                            mapValue.add(StringUtils.join(provinceCityList, StrConstant.HYPHEN));
+                            mapUnit.put(header.getFormItemId(),StringUtils.join(provinceCityList, StrConstant.HYPHEN));
                         } else {
-                            mapValue.add(StrConstant.EPMETY_STR);
+                            mapUnit.put(header.getFormItemId(),StrConstant.EPMETY_STR);
                         }
                     } else {
                         log.warn("没有当前的key:,可能用户没填写吧" + key);
-                        mapValue.add(StrConstant.HYPHEN);
+                        mapUnit.put(header.getFormItemId(),StrConstant.HYPHEN);
                     }
                 }
 
@@ -661,20 +659,20 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                         List<String> inputMap = (List<String>) originalData.get(key);
                         log.info("地理位置：" + JSON.toJSONString(inputMap, true));
                         if (!CollectionUtils.isEmpty(inputMap) && inputMap.size() == 3) {
-                            mapValue.add(inputMap.get(2));
+                            mapUnit.put(header.getFormItemId(),inputMap.get(2));
                         } else {
-                            mapValue.add(StrConstant.EPMETY_STR);
+                            mapUnit.put(header.getFormItemId(),StrConstant.EPMETY_STR);
                         }
                     } else {
                         log.warn("没有当前的key:,可能用户没填写吧" + key);
-                        mapValue.add(StrConstant.HYPHEN);
+                        mapUnit.put(header.getFormItemId(),StrConstant.HYPHEN);
                     }
                 }
-            }
-            dataList.put(mapKey,mapValue);
-        }//end
+            }//end
+            dataMap.add(mapUnit);
+        }
         resultDTO.setTableHeaderList(tableHeaderList);
-        resultDTO.setDataMap(dataList);
+        resultDTO.setDataMap(dataMap);
         return resultDTO;
     }
 

From e8a789dc4d4ed7ee895f1d9c0ccf9d60522b9192 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 23 Sep 2021 16:03:02 +0800
Subject: [PATCH 49/68] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=20=E6=B7=BB=E5=8A=A0=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=89=80=E5=9C=A8=E7=BB=84=E7=BB=87=E7=9A=84?=
 =?UTF-8?q?=20pids?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/dto/result/CustomerStaffInfoCacheResult.java       | 5 +++++
 .../tools/redis/common/bean/CustomerStaffInfoCache.java      | 5 +++++
 .../dto/epmetuser/result/CustomerStaffResultDTO.java         | 5 +++++
 .../service/epmetuser/impl/EpmetUserServiceImpl.java         | 1 +
 4 files changed, 16 insertions(+)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java
index d8cf9a8265..cc7d144f48 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java
@@ -22,6 +22,11 @@ public class CustomerStaffInfoCacheResult implements Serializable {
      */
     private String agencyId;
 
+    /**
+     * 工作人员所属组织ID的pids
+     */
+    private String agencyPIds;
+
     /**
      * 工作人员所属组织名称
      */
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/CustomerStaffInfoCache.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/CustomerStaffInfoCache.java
index 577bdf3910..98adecdc97 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/CustomerStaffInfoCache.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/CustomerStaffInfoCache.java
@@ -22,6 +22,11 @@ public class CustomerStaffInfoCache implements Serializable {
      */
     private String agencyId;
 
+    /**
+     * 工作人员所属组织ID的pids
+     */
+    private String agencyPIds;
+
     /**
      * 工作人员所属组织名称
      */
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/CustomerStaffResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/CustomerStaffResultDTO.java
index b12ea53fec..a03406f0d0 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/CustomerStaffResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/CustomerStaffResultDTO.java
@@ -21,6 +21,11 @@ public class CustomerStaffResultDTO implements Serializable {
      */
     private String agencyId;
 
+    /**
+     * 工作人员所属组织ID的pids
+     */
+    private String agencyPIds;
+
     /**
      * 工作人员所属组织名称
      */
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
index 92a02290bd..d24650c967 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
@@ -599,6 +599,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
             return null;
         }
         result.setAgencyName(agencyDTO.getOrganizationName());
+        result.setAgencyPIds(agencyDTO.getPids());
         StaffOrgRelationResultDTO fromOrgTypeDto = govOrgService.getStaffFromOrgType(staffId);
         String fromOrgType = OrgTypeEnum.AGENCY.getCode();
         if (fromOrgTypeDto != null){

From 2cf07c6df7a73117cb5f73d44eee209d0f280654 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 23 Sep 2021 16:50:30 +0800
Subject: [PATCH 50/68] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=BD=91=E6=A0=BC=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/commons/tools/redis/RedisKeys.java  |  9 ++++++
 .../epmet/feign/GovOrgOpenFeignClient.java    | 12 ++++++++
 .../GovOrgOpenFeignClientFallback.java        |  5 ++++
 .../com/epmet/controller/GridController.java  |  3 +-
 .../epmet/service/CustomerGridService.java    |  2 +-
 .../service/impl/CustomerGridServiceImpl.java | 28 +++++++++++++++----
 .../com/epmet/feign/GovOrgFeignClient.java    |  4 +--
 .../fallback/GovOrgFeignClientFallBack.java   |  8 +++---
 .../impl/RegisterRelationServiceImpl.java     |  6 +++-
 .../impl/StaffPatrolRecordServiceImpl.java    |  8 ++++--
 10 files changed, 68 insertions(+), 17 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
index 0196f02f44..320f275136 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
@@ -212,6 +212,15 @@ public class RedisKeys {
 		return rootPrefix.concat("gov:agency:").concat(agencyId);
 	}
 
+	/**
+	 * 网格信息key
+	 * @param gridId
+	 * @return
+	 */
+	public static String getGridByIdKey(String gridId) {
+		return rootPrefix.concat("gov:grid:").concat(gridId);
+	}
+
 	/**
 	 * 客户标签排行 缓存Key
 	 * @param customerId
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
index 7e7de0e4b2..39d15fb9a5 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
@@ -427,4 +427,16 @@ public interface GovOrgOpenFeignClient {
      */
     @PostMapping("/gov/org/customeragency/getAgencyInfo")
     Result<OrgResultDTO> getAgencyInfo(@RequestBody OrgFormDTO formDTO);
+
+
+    /**
+     * desc: 获取网格基础数据
+     *
+     * @param customerGridFormDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.CustomerGridDTO>
+     * @author LiuJanJun
+     * @date 2021/4/19 11:19 上午
+     */
+    @PostMapping("/gov/org/grid/getbaseinfo")
+    Result<CustomerGridDTO> getGridBaseInfoByGridId(CustomerGridFormDTO customerGridFormDTO);
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
index 38f5df4626..306ea49022 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
@@ -261,6 +261,11 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAgencyInfo", formDTO);
     }
 
+    @Override
+    public Result<CustomerGridDTO> getGridBaseInfoByGridId(CustomerGridFormDTO customerGridFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridBaseInfoByGridId", customerGridFormDTO);
+    }
+
     @Override
     public Result<String> selectPidsByGridId(String gridId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectPidsByGridId", gridId);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java
index daf3c835cc..ce24000220 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java
@@ -179,6 +179,7 @@ public class GridController {
      */
     @PostMapping("getbaseinfo")
     public Result<CustomerGridDTO> getBaseInfo(@RequestBody CustomerGridFormDTO customerGridFormDTO) {
-        return customerGridService.getBaseInfo(customerGridFormDTO);
+        CustomerGridDTO gridInfo = customerGridService.getBaseInfo(customerGridFormDTO);
+        return new Result<CustomerGridDTO>().ok(gridInfo);
     }
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
index 78221d8fa8..91525436ba 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
@@ -286,7 +286,7 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      * @author LiuJanJun
      * @date 2021/4/19 11:53 上午
      */
-    Result<CustomerGridDTO> getBaseInfo(CustomerGridFormDTO customerGridFormDTO);
+    CustomerGridDTO getBaseInfo(CustomerGridFormDTO customerGridFormDTO);
 
     /**
      * @Description  根据网格ID查询pids
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index dae768cbf9..4c9b98b288 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -17,6 +17,7 @@
 
 package com.epmet.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -26,6 +27,8 @@ import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -77,6 +80,9 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     @Autowired
     private CustomerGridDao customerGridDao;
 
+    @Autowired
+    private RedisUtils redisUtils;
+
     @Override
     public PageData<CustomerGridDTO> page(Map<String, Object> params) {
         IPage<CustomerGridEntity> page = baseDao.selectPage(
@@ -712,13 +718,23 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     }
 
     @Override
-    public Result<CustomerGridDTO> getBaseInfo(CustomerGridFormDTO customerGridFormDTO) {
-        CustomerGridDTO restltDTO = ConvertUtils.sourceToTarget(baseDao.selectById(customerGridFormDTO.getGridId()), CustomerGridDTO.class);
-        if (null != restltDTO) {
-            CustomerAgencyEntity entity = customerAgencyService.selectById(restltDTO.getPid());
-            restltDTO.setAgencyName(null != entity ? entity.getOrganizationName() : "");
+    public CustomerGridDTO getBaseInfo(CustomerGridFormDTO customerGridFormDTO) {
+        String redisKey = RedisKeys.getGridByIdKey(customerGridFormDTO.getGridId());
+        Map<String, Object> gridCache = redisUtils.hGetAll(redisKey);
+        if (gridCache != null && gridCache.size() > 0) {
+            // 直接取缓存中的
+            CustomerGridDTO gridInfo = BeanUtil.mapToBean(gridCache, CustomerGridDTO.class, true);
+            return gridInfo;
         }
-        return new Result<CustomerGridDTO>().ok(restltDTO);
+
+        CustomerGridDTO gridInfo = ConvertUtils.sourceToTarget(baseDao.selectById(customerGridFormDTO.getGridId()), CustomerGridDTO.class);
+        if (null != gridInfo) {
+            CustomerAgencyEntity entity = customerAgencyService.selectById(gridInfo.getPid());
+            gridInfo.setAgencyName(null != entity ? entity.getOrganizationName() : "");
+        }
+
+        redisUtils.hMSet(redisKey, BeanUtil.beanToMap(gridInfo));
+        return gridInfo;
     }
 
     /**
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 7d4a258ccb..a2e6405300 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
@@ -47,7 +47,7 @@ public interface GovOrgFeignClient {
      * @author LiuJanJun
      * @date 2021/4/19 11:19 上午
      */
-    @PostMapping("/gov/org/grid/getbaseinfo")
-    Result<CustomerGridDTO> getGridBaseInfoByGridId(CustomerGridFormDTO customerGridFormDTO);
+    //@PostMapping("/gov/org/grid/getbaseinfo")
+    //Result<CustomerGridDTO> getGridBaseInfoByGridId(CustomerGridFormDTO customerGridFormDTO);
 
 }
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 2fbcf49452..2366577ef6 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
@@ -29,8 +29,8 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridStaffs", gridIdFormDTO);
     }
 
-    @Override
-    public Result<CustomerGridDTO> getGridBaseInfoByGridId(CustomerGridFormDTO customerGridFormDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridBaseInfoByGridId", customerGridFormDTO);
-    }
+    //@Override
+    //public Result<CustomerGridDTO> getGridBaseInfoByGridId(CustomerGridFormDTO customerGridFormDTO) {
+    //    return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridBaseInfoByGridId", customerGridFormDTO);
+    //}
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
index 2d1a9df160..0e0a8ef246 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
@@ -40,6 +40,7 @@ import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.entity.RegisterRelationEntity;
 import com.epmet.entity.UserCustomerEntity;
 import com.epmet.feign.GovOrgFeignClient;
+import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.GridVisitedService;
 import com.epmet.service.RegisterRelationService;
 import com.epmet.util.ModuleConstant;
@@ -72,6 +73,9 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
     @Autowired
     private GovOrgFeignClient govOrgFeignClient;
 
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+
     @Autowired
     private UserCustomerDao userCustomerDao;
 
@@ -299,7 +303,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
     private boolean setGridName(UserInfoOnEnterGridResultDTO resultObj, String gridId) {
         CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO();
         customerGridFormDTO.setGridId(gridId);
-        Result<CustomerGridDTO> gridDTOResult = govOrgFeignClient.getGridBaseInfoByGridId(customerGridFormDTO);
+        Result<CustomerGridDTO> gridDTOResult = govOrgOpenFeignClient.getGridBaseInfoByGridId(customerGridFormDTO);
         if(gridDTOResult.success() && null != gridDTOResult.getData()){
             resultObj.setCurrentGridName(gridDTOResult.getData().getGridName());
             resultObj.setOrgId(resultObj.getCurrentGridId());
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
index 7d6aa5e196..12255c1153 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
@@ -24,6 +24,7 @@ import com.epmet.entity.StaffPatrolDetailEntity;
 import com.epmet.entity.StaffPatrolRecordEntity;
 import com.epmet.entity.StatsStaffPatrolRecordDailyEntity;
 import com.epmet.feign.GovOrgFeignClient;
+import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.feign.GovProjectOpenFeignClient;
 import com.epmet.service.StaffPatrolDetailService;
 import com.epmet.service.StaffPatrolRecordService;
@@ -56,6 +57,9 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 	private StaffPatrolDetailService staffPatrolDetailService;
 	@Resource
 	private GovOrgFeignClient govOrgFeignClient;
+	// 这是是来自org-client的，以后都用这个就好了
+	@Autowired
+	private GovOrgOpenFeignClient govOrgOpenFeignClient;
 	@Autowired
 	private CustomerStaffDao customerStaffDao;
 
@@ -106,7 +110,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		if (PatrolConstant.PATROLLING.equals(entity.getStatus())) {
 			CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO();
 			customerGridFormDTO.setGridId(entity.getGrid());
-			Result<CustomerGridDTO> gridResult = govOrgFeignClient.getGridBaseInfoByGridId(customerGridFormDTO);
+			Result<CustomerGridDTO> gridResult = govOrgOpenFeignClient.getGridBaseInfoByGridId(customerGridFormDTO);
 			if (!gridResult.success() || null == gridResult.getData()) {
 				//查询网格名称失败
 				log.error(String.format("查找网格信息失败，网格Id:【%s】", entity.getGrid()));
@@ -141,7 +145,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 
 		CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO();
 		customerGridFormDTO.setGridId(formDTO.getGridId());
-		Result<CustomerGridDTO> gridResult = govOrgFeignClient.getGridBaseInfoByGridId(customerGridFormDTO);
+		Result<CustomerGridDTO> gridResult = govOrgOpenFeignClient.getGridBaseInfoByGridId(customerGridFormDTO);
 		if (!gridResult.success() || null == gridResult.getData()) {
 			//查询网格名称失败
 			log.error(String.format("查找网格信息失败，网格Id:【%s】", formDTO.getGridId()));

From 5c0a41e624ae3aaadd32aa21c5c3d77901580820 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 23 Sep 2021 17:03:09 +0800
Subject: [PATCH 51/68] =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/constant/TDuckConstant.java     | 17 +++++
 .../dto/epmettduck/form/TDuckListFormDTO.java |  7 ++-
 .../controller/EpmetTDuckController.java      |  1 +
 .../dao/epmettduck/PrUserProjectDao.java      |  2 +-
 .../impl/PrUserProjectServiceImpl.java        | 62 ++++++++++++++++++-
 .../mapper/epmettduck/PrUserProjectDao.xml    |  6 +-
 6 files changed, 90 insertions(+), 5 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/TDuckConstant.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/TDuckConstant.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/TDuckConstant.java
new file mode 100644
index 0000000000..87ef2de7cb
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/TDuckConstant.java
@@ -0,0 +1,17 @@
+package com.epmet.dataaggre.constant;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/23 4:06 下午
+ * @DESC
+ */
+public interface TDuckConstant {
+
+    String CLIENT_GOV = "gov";
+    String CLIENT_RESI = "resi";
+    
+    String ORG_TYPE_AGENCY = "agency";
+    String ORG_TYPE_GRID = "grid";
+    String ORG_TYPE_DEPT = "dept";
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckListFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckListFormDTO.java
index b8165ee2ce..83fc43fd6f 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckListFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckListFormDTO.java
@@ -30,11 +30,14 @@ public class TDuckListFormDTO implements Serializable {
     @NotNull(message = "pageSize不能为空",groups = TDuckListForm.class)
     private Integer pageSize;
 
-    @NotBlank(message = "orgIds不能为空",groups = TDuckListForm.class)
-    private String orgIds;
+    private String orgId;
+
+    private String orgType;
 
     @NotBlank(message = "client不能为空",groups = TDuckListForm.class)
     private String client;
 
     private String userId;
+
+    private String customerId;
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
index 38956e9129..5a34f9d7a8 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
@@ -81,6 +81,7 @@ public class EpmetTDuckController {
     public Result<List<TDuckListResultDTO>> queryProjectList(@RequestBody TDuckListFormDTO formDTO,@LoginUser TokenDto tokenDto){
         ValidatorUtils.validateEntity(formDTO,TDuckListFormDTO.TDuckListForm.class);
         formDTO.setUserId(tokenDto.getUserId());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         return new Result<List<TDuckListResultDTO>>().ok(prUserProjectService.queryProjectList(formDTO));
     }
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
index ed30a5246c..68f185ad89 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java
@@ -55,7 +55,7 @@ public interface PrUserProjectDao extends BaseDao<PrUserProjectEntity> {
      * @author zxc
      * @date 2021/9/17 2:16 下午
      */
-    List<String> selectProjectKey(@Param("orgIds")String orgIds);
+    List<String> selectProjectKey(@Param("orgIds")List<String> orgIds);
 
     /**
      * @Description  根据keys查询project
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 1030c10c32..d9f1627508 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -27,10 +27,16 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.dto.form.IdAndNameDTO;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 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.dataaggre.constant.DataSourceConstant;
+import com.epmet.dataaggre.constant.TDuckConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao;
 import com.epmet.dataaggre.dao.epmettduck.PrVistRecordDao;
 import com.epmet.dataaggre.dto.epmettduck.PrPublishRangeDTO;
@@ -49,6 +55,9 @@ import com.epmet.dataaggre.service.epmettduck.PrPublishRangeService;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
 import com.epmet.dataaggre.service.epmettduck.PrVistRecordService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
+import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.form.CustomerGridFormDTO;
+import com.epmet.feign.GovOrgOpenFeignClient;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -83,6 +92,8 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
     private GovOrgService govOrgService;
     @Resource
     private PrVistRecordService prVistRecordService;
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
 
     @Override
     public PageData<PrUserProjectDTO> page(Map<String, Object> params) {
@@ -157,7 +168,39 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
      */
     @Override
     public List<TDuckListResultDTO> queryProjectList(TDuckListFormDTO formDTO) {
-        List<String> projectKeys = baseDao.selectProjectKey(formDTO.getOrgIds());
+        List<String> orgIds = new ArrayList<>();
+        if (formDTO.getClient().equals(TDuckConstant.CLIENT_GOV)){
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
+            String pids = staffInfo.getAgencyPIds();
+            String agencyId = staffInfo.getAgencyId();
+            if (staffInfo.getFromOrgType().equals(TDuckConstant.ORG_TYPE_DEPT)){
+                List<IdAndNameDTO> deptList = staffInfo.getDeptList();
+                if (CollectionUtils.isEmpty(deptList)){
+                    return new ArrayList<>();
+                }
+                orgIds = joint(pids,agencyId,deptList);
+            }else if (staffInfo.getFromOrgType().equals(TDuckConstant.ORG_TYPE_GRID)){
+                List<IdAndNameDTO> gridList = staffInfo.getGridList();
+                if (CollectionUtils.isEmpty(gridList)){
+                    return new ArrayList<>();
+                }
+                orgIds = joint(pids,agencyId,gridList);
+            }else {
+                String selfOrg = pids + ":" + agencyId;
+                orgIds.add(selfOrg);
+            }
+        }else {
+            CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO();
+            customerGridFormDTO.setGridId(formDTO.getOrgId());
+            Result<CustomerGridDTO> gridResult = govOrgOpenFeignClient.getGridBaseInfoByGridId(customerGridFormDTO);
+            if (!gridResult.success()){
+                throw new RenException("查询网格信息失败了...");
+            }
+            CustomerGridDTO data = gridResult.getData();
+            String oneOrg = data.getPids() + ":" + data.getId();
+            orgIds.add(oneOrg);
+        }
+        List<String> projectKeys = baseDao.selectProjectKey(orgIds);
         if (CollectionUtils.isEmpty(projectKeys)){
             return new ArrayList<>();
         }
@@ -177,6 +220,23 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
         return result;
     }
 
+    /**
+     * @Description  orgIds拼接
+     * @Param pids
+     * @Param agencyId
+     * @Param list
+     * @author zxc
+     * @date 2021/9/23 4:48 下午
+     */
+    public List<String> joint(String pids, String agencyId, List<IdAndNameDTO> list){
+        List<String> orgIds = new ArrayList<>();
+        list.forEach(l -> {
+            String oneOrg = pids + ":" + agencyId + ":" + l.getId();
+            orgIds.add(oneOrg);
+        });
+        return orgIds;
+    }
+
     /**
      * 分析报告
      *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
index 228419ebea..b9e54b758b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
@@ -73,7 +73,11 @@
             DISTINCT project_key
         FROM pr_publish_range
         WHERE del_flag = 0
-          AND #{orgIds} LIKE CONCAT(org_ids,'%')
+          AND (
+              <foreach collection="orgIds" item="orgId" separator=" OR ">
+                  #{orgId} LIKE CONCAT(org_ids,'%')
+              </foreach>
+            )
     </select>
 
     <!-- 根据keys查询project -->

From c18d4f4c7e6ca47b5fbaf40bd247661f3388b65b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 23 Sep 2021 17:10:16 +0800
Subject: [PATCH 52/68] =?UTF-8?q?=E7=BA=A7=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java | 1 +
 .../service/epmettduck/impl/PrUserProjectServiceImpl.java      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java
index 44e8edac6f..3b5888a543 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java
@@ -35,5 +35,6 @@ public class CascaderDTO implements Serializable {
      * 全路径名字
      */
     private List<String> labels;
+    public String pathName;
 }
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 1030c10c32..c1c8c9ec4f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -385,7 +385,8 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                 int totalCount = 0;
                 Map<String, Integer> resMap = new HashMap<>();
                 for (PrUserProjectResultEntity res : resultList) {
-                    JSONObject originalData = JSON.parseObject(res.getOriginalData());
+                    //级联组件，用processdata特殊处理下
+                    JSONObject originalData = JSON.parseObject(res.getProcessData());
                     if(originalData.containsKey(key)){
                         List<CascaderDTO> dtoList = JSON.parseArray(originalData.get(key).toString(), CascaderDTO.class);
                         if(CollectionUtils.isEmpty(dtoList)){

From 1f442f897be90bdf1344313224bdaf5b1b79fadc Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 23 Sep 2021 17:29:24 +0800
Subject: [PATCH 53/68] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E6=97=B6=20=E5=88=A0=E9=99=A4=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/CustomerGridServiceImpl.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index 4c9b98b288..fbb937f2ba 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -297,6 +297,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result deleteGrid(TokenDto tokenDto,DeleteGridFormDTO deleteGridFormDTO) {
+        redisUtils.delete(RedisKeys.getGridInfoKey(deleteGridFormDTO.getGridId()))
         List<UserIdDTO> userIdDTOS = baseDao.selectUserIdByGrid(deleteGridFormDTO.getGridId());
         deleteGridFormDTO.setUserId(tokenDto.getUserId());
         if (userIdDTOS.size()==0){

From 8a208b7f12d1ce9c0813d8a726350444bb487f70 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 23 Sep 2021 17:42:59 +0800
Subject: [PATCH 54/68] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=93=AA=E9=87=8C?=
 =?UTF-8?q?=E6=9D=A5=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/dto/result/CustomerStaffInfoCacheResult.java       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java
index cc7d144f48..c5db9c6718 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java
@@ -62,6 +62,11 @@ public class CustomerStaffInfoCacheResult implements Serializable {
      */
     private String headPhoto;
 
+    /**
+     * 工作人员是从哪中组织添加的 组织Id
+     */
+    private String fromOrgId;
+
     /**
      * 工作人员是从哪中组织类型添加的 3个值：agency，grid，dept
      * @see com.epmet.commons.tools.enums.OrgTypeEnum

From 3256e5b0e65a438e48aea99bc7e57d875fe28eaf Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 23 Sep 2021 17:44:05 +0800
Subject: [PATCH 55/68] orgName

---
 .../epmettduck/result/TDuckListResultDTO.java |  8 +++++++
 .../impl/PrUserProjectServiceImpl.java        | 24 +++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
index 267df6a5f2..0874011bce 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
@@ -79,6 +79,13 @@ public class TDuckListResultDTO implements Serializable {
      */
     private Integer recycled;
 
+    /**
+     * 组织名
+     */
+    private String orgName;
+
+    private String createdBy;
+
     public TDuckListResultDTO() {
         this.customerId = "";
         this.key = "";
@@ -92,5 +99,6 @@ public class TDuckListResultDTO implements Serializable {
         this.client = "";
         this.createdTime = "";
         this.fillStatus = false;
+        this.orgName = "";
     }
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 2d187fdd59..19815e12b1 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -217,6 +217,30 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                 }
             }
         }
+        result.forEach(r -> {
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), r.getCreatedBy());
+            String orgName = "";
+            if (null != staffInfo){
+                if (staffInfo.getFromOrgType().equals(TDuckConstant.ORG_TYPE_AGENCY)){
+                    orgName = staffInfo.getAgencyName();
+                }else if (staffInfo.getFromOrgType().equals(TDuckConstant.ORG_TYPE_GRID)){
+                    for (IdAndNameDTO g : staffInfo.getGridList()) {
+                        if (g.getId().equals(staffInfo.getFromOrgId())){
+                            orgName = g.getName();
+                            continue;
+                        }
+                    }
+                }else if (staffInfo.getFromOrgType().equals(TDuckConstant.ORG_TYPE_DEPT)){
+                    for (IdAndNameDTO d : staffInfo.getDeptList()) {
+                        if (d.getId().equals(staffInfo.getFromOrgId())){
+                            orgName = d.getName();
+                            continue;
+                        }
+                    }
+                }
+            }
+            r.setOrgName(orgName);
+        });
         return result;
     }
 

From 34ff292b02a65b48acede0def3063271ac2c7e7b Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 23 Sep 2021 22:47:49 +0800
Subject: [PATCH 56/68] =?UTF-8?q?wxz=E6=9C=AC=E5=9C=B0=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/commons/tools/redis/RedisKeys.java  |  13 ++
 .../epmettduck/form/TDuckDetailFormDTO.java   |  10 +-
 .../result/PermissionValidateResultDTO.java   |   9 ++
 .../controller/EpmetTDuckController.java      |  47 ++++++-
 .../service/QuestionnaireService.java         |   9 ++
 .../epmettduck/PrUserProjectService.java      |  10 ++
 .../impl/PrUserProjectServiceImpl.java        |   7 +
 .../impl/QuestionnaireServiceImpl.java        | 128 ++++++++++++++++++
 8 files changed, 228 insertions(+), 5 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/PermissionValidateResultDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/QuestionnaireService.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/QuestionnaireServiceImpl.java

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
index 320f275136..a6a83e64e7 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
@@ -543,4 +543,17 @@ public class RedisKeys {
     public static String getGridInfoKey(String gridId) {
 		return rootPrefix.concat("gov:grid:").concat(gridId);
     }
+
+    /**
+     * @description 调查问卷accessKey
+     *
+     * @param userId
+     * @param qKey
+     * @return
+     * @author wxz
+     * @date 2021.09.23 17:38:37
+     */
+    public static String getQuestionnaireAccessKey(String userId, String qKey) {
+    	return rootPrefix.concat("questionnaire:accesskey:").concat(userId).concat(":").concat(qKey);
+	}
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckDetailFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckDetailFormDTO.java
index 8796d3291b..bd5ac26e8e 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckDetailFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckDetailFormDTO.java
@@ -17,15 +17,23 @@ public class TDuckDetailFormDTO implements Serializable {
     private static final long serialVersionUID = 3793280475377993346L;
 
     public interface TDuckDetailForm{}
+    public interface PermissionValidate{}
 
     /**
      * 项目key
      */
-    @NotBlank(message = "项目key不能为空",groups = TDuckDetailForm.class)
+    @NotBlank(message = "项目key不能为空",groups = { TDuckDetailForm.class, PermissionValidate.class })
     private String key;
     /**
      * 是否显示类型
      */
     @NotNull(message = "是否显示类型不能为空",groups = TDuckDetailForm.class)
     private Boolean displayType;
+
+    /** 当前操作人所在的组织的类型(grid:网格,agency:单位) */
+    @NotBlank(message = "当前操作人所在的Org类型不能为空",groups = { PermissionValidate.class })
+    private String orgType;
+
+    /** 当前操作人所在的组织的ID(当orgType为grid的时候必填，为agency的时候留空) */
+    private String orgId;
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/PermissionValidateResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/PermissionValidateResultDTO.java
new file mode 100644
index 0000000000..45897428d9
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/PermissionValidateResultDTO.java
@@ -0,0 +1,9 @@
+package com.epmet.dataaggre.dto.epmettduck.result;
+
+import lombok.Data;
+
+@Data
+public class PermissionValidateResultDTO {
+    private Boolean permitted;
+    private String accessKey;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
index 38956e9129..f5b8d05117 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
@@ -1,6 +1,10 @@
 package com.epmet.dataaggre.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.constant.AppClientConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.exception.ValidateException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -9,14 +13,15 @@ import com.epmet.dataaggre.dto.epmettduck.form.*;
 import com.epmet.dataaggre.dto.epmettduck.result.*;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity;
+import com.epmet.dataaggre.service.QuestionnaireService;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectItemService;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import sun.tools.jstat.Token;
 
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -31,6 +36,8 @@ public class EpmetTDuckController {
     private PrUserProjectService prUserProjectService;
     @Autowired
     private PrUserProjectItemService projectItemService;
+    @Autowired
+    private QuestionnaireService questionnaireService;
 
 
     /**
@@ -142,4 +149,36 @@ public class EpmetTDuckController {
     public Result<RedPointResultDTO> redPoint(@LoginUser TokenDto tokenDto) {
         return new Result<RedPointResultDTO>().ok(prUserProjectService.redPoint(tokenDto));
     }
+
+    /**
+     * @description 校验权限，并且获取accesskey
+     *
+     * @param input
+     * @return
+     * @author wxz
+     * @date 2021.09.23 15:13:53
+     */
+    @PostMapping("/permission-validate")
+    public Result<PermissionValidateResultDTO> permissionValidate(@RequestBody TDuckDetailFormDTO input, @LoginUser TokenDto loginUserInfo, @RequestHeader("customerId") String customerId) {
+        ValidatorUtils.validateEntity(input, TDuckDetailFormDTO.PermissionValidate.class);
+        // 所用端的类型:gov:工作端，resi居民端
+        String app = loginUserInfo.getApp();
+        String orgId = input.getOrgId();
+        String projectKey = input.getKey();
+        String userId = loginUserInfo.getUserId();
+
+        PermissionValidateResultDTO r = null;
+        if (AppClientConstant.APP_RESI.equals(app)) {
+            if (StringUtils.isBlank(orgId)) {
+                // 居民端，orgId是网格id，必填
+                throw new ValidateException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), "缺少orgId参数");
+            }
+            r = questionnaireService.resiPermissionValidate(projectKey, userId, orgId);
+        } else if (AppClientConstant.APP_GOV.equals(app)) {
+            // 工作端
+            r = questionnaireService.govPermissionValidate(projectKey, userId, customerId);
+        }
+
+        return new Result<PermissionValidateResultDTO>().ok(r);
+    }
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/QuestionnaireService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/QuestionnaireService.java
new file mode 100644
index 0000000000..c23f7f1245
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/QuestionnaireService.java
@@ -0,0 +1,9 @@
+package com.epmet.dataaggre.service;
+
+import com.epmet.dataaggre.dto.epmettduck.result.PermissionValidateResultDTO;
+
+public interface QuestionnaireService {
+    PermissionValidateResultDTO resiPermissionValidate(String projectKey, String userId, String gridId);
+
+    PermissionValidateResultDTO govPermissionValidate(String projectKey, String staffId, String customerId);
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
index 2a35aa5ac1..93e437a043 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
@@ -174,4 +174,14 @@ public interface PrUserProjectService extends BaseService<PrUserProjectEntity> {
      * @Date 2021/9/23 10:05
      */
     RedPointResultDTO redPoint(TokenDto tokenDto);
+
+    /**
+     * @description 根据key查询问卷
+     *
+     * @param key
+     * @return
+     * @author wxz
+     * @date 2021.09.23 22:25:57
+     */
+    PrUserProjectEntity getProjectEntityBykey(String key);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 1030c10c32..e4daf90485 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -706,4 +706,11 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
         }
         return result;
     }
+
+    @Override
+    public PrUserProjectEntity getProjectEntityBykey(String key) {
+        LambdaQueryWrapper<PrUserProjectEntity> query = new LambdaQueryWrapper<>();
+        query.eq(PrUserProjectEntity::getKey, key);
+        return baseDao.selectOne(query);
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/QuestionnaireServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/QuestionnaireServiceImpl.java
new file mode 100644
index 0000000000..ad4b5cb6a9
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/QuestionnaireServiceImpl.java
@@ -0,0 +1,128 @@
+package com.epmet.dataaggre.service.impl;
+
+import com.epmet.commons.tools.constant.AppClientConstant;
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.form.IdAndNameDTO;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.feign.ResultDataResolver;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dataaggre.dto.epmettduck.result.PermissionValidateResultDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
+import com.epmet.dataaggre.service.QuestionnaireService;
+import com.epmet.dataaggre.service.epmettduck.PrPublishRangeService;
+import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
+import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.form.CustomerGridFormDTO;
+import com.epmet.feign.GovOrgOpenFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class QuestionnaireServiceImpl implements QuestionnaireService, ResultDataResolver {
+
+    @Autowired
+    private PrUserProjectService prUserProjectService;
+
+    @Autowired
+    private PrPublishRangeService prPublishRangeService;
+
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+
+    @Autowired
+    private RedisUtils redisUtils;
+
+    @Autowired
+    private CustomerStaffRedis customerStaffRedis;
+
+    /**
+     * @description 居民端调查问卷权限校验
+     *
+     * @param projectKey
+     * @param userId
+     * @param gridId
+     * @return
+     * @author wxz
+     * @date 2021.09.23 17:45:25
+     */
+    public PermissionValidateResultDTO resiPermissionValidate(String projectKey, String userId, String gridId) {
+
+        PrUserProjectEntity projectEntity = prUserProjectService.getProjectEntityBykey(projectKey);
+        if (!AppClientConstant.APP_RESI.equals(projectEntity.getClient())) {
+            throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(),
+                    String.format("【调查问卷详情权限校验】该调查问卷发布端为[%s]，当前用户为[%s]", projectEntity.getClient(), AppClientConstant.APP_RESI));
+        }
+
+        CustomerGridFormDTO form = new CustomerGridFormDTO();
+        form.setGridId(gridId);
+        Result<CustomerGridDTO> gridInfoResult = govOrgOpenFeignClient.getGridBaseInfoByGridId(form);
+        CustomerGridDTO gridInfo = getResultDataOrThrowsException(gridInfoResult, ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【调查问卷】校验访问权限，查询网格信息失败");
+        // 网格父级ID列表:网格ID(拼接起来，冒号分割)
+        String gridIdPath = gridInfo.getPids().concat(":").concat(gridInfo.getId());
+        List<String> rangeList = prPublishRangeService.getRangeOrgList(projectKey);
+        PermissionValidateResultDTO r = new PermissionValidateResultDTO();
+        for (String range : rangeList) {
+            if (gridIdPath.contains(range)) {
+                r.setPermitted(true);
+                r.setAccessKey(generateQuestionnaireAccessKey(userId, projectKey));
+                return r;
+            }
+        }
+        r.setPermitted(false);
+        return r;
+    }
+
+    /**
+     * @description 生成调查问卷accessKey
+     *
+     * @param userId
+     * @param qKey
+     * @return
+     * @author wxz
+     * @date 2021.09.23 17:43:50
+     */
+    private String generateQuestionnaireAccessKey(String userId, String qKey) {
+        String accessKey = UUID.randomUUID().toString();
+        redisUtils.set(RedisKeys.getQuestionnaireAccessKey(userId, qKey), accessKey);
+        return accessKey;
+    }
+
+    @Override
+    public PermissionValidateResultDTO govPermissionValidate(String projectKey, String staffId, String customerId) {
+        CustomerStaffInfoCacheResult staffInfo = customerStaffRedis.getStaffInfo(customerId, staffId);
+        PermissionValidateResultDTO r = null;
+        //if ("agency".equals(staffInfo.getFromOrgType())) {
+        //    // 来自agency
+        //
+        //} else if ("grid".equals(staffInfo.getFromOrgType())) {
+        //    List<IdAndNameDTO> belongGridList = staffInfo.getGridList();
+        //
+        //} else if ("dept".equals(staffInfo.getFromOrgType())) {
+        //
+        //}
+
+        String agencyId = staffInfo.getAgencyId();
+
+        List<IdAndNameDTO> gridList = staffInfo.getGridList();
+        for (IdAndNameDTO gridIdAndName : gridList) {
+
+        }
+
+        return r;
+    }
+
+    //private CustomerGridDTO getGridInfoById(String gridId) {
+    //    CustomerGridFormDTO gridInfoForm = new CustomerGridFormDTO();
+    //    gridInfoForm.setGridId(gridId);
+    //    Result<CustomerGridDTO> result = govOrgOpenFeignClient.getGridBaseInfoByGridId(gridInfoForm);
+    //    return getResultDataOrThrowsException(result, ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【调查问卷】获取网格信息失败");
+    //}
+}

From 33321ce46866bac59672f6a01c7265f6e4e1d3f7 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Fri, 24 Sep 2021 12:39:20 +0800
Subject: [PATCH 57/68] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=20=E3=80=90?=
 =?UTF-8?q?=E8=B0=83=E6=9F=A5=E9=97=AE=E5=8D=B7=E3=80=91=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=97=AE=E5=8D=B7=E8=AE=BF=E9=97=AE=E6=9D=83=E9=99=90=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E6=8E=A5=E5=8F=A3=20/data/aggregator/questionnaire/pe?=
 =?UTF-8?q?rmission-validate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmettduck/form/TDuckDetailFormDTO.java   |   1 -
 .../controller/EpmetTDuckController.java      |   4 +-
 .../epmettduck/PrPublishRangeService.java     |  10 ++
 .../impl/PrPublishRangeServiceImpl.java       |   7 +
 .../impl/QuestionnaireServiceImpl.java        | 131 +++++++++++++-----
 5 files changed, 117 insertions(+), 36 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckDetailFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckDetailFormDTO.java
index bd5ac26e8e..3a9b934b69 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckDetailFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckDetailFormDTO.java
@@ -31,7 +31,6 @@ public class TDuckDetailFormDTO implements Serializable {
     private Boolean displayType;
 
     /** 当前操作人所在的组织的类型(grid:网格,agency:单位) */
-    @NotBlank(message = "当前操作人所在的Org类型不能为空",groups = { PermissionValidate.class })
     private String orgType;
 
     /** 当前操作人所在的组织的ID(当orgType为grid的时候必填，为agency的时候留空) */
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
index d12a151996..bcffe238d4 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
@@ -170,9 +170,9 @@ public class EpmetTDuckController {
 
         PermissionValidateResultDTO r = null;
         if (AppClientConstant.APP_RESI.equals(app)) {
-            if (StringUtils.isBlank(orgId)) {
+            if (StringUtils.isBlank(orgId) || !"grid".equals(input.getOrgType())) {
                 // 居民端，orgId是网格id，必填
-                throw new ValidateException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), "缺少orgId参数");
+                throw new ValidateException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), "【调查问卷】校验访问权限-居民端 orgId不能为空，且orgType需要为[grid]");
             }
             r = questionnaireService.resiPermissionValidate(projectKey, userId, orgId);
         } else if (AppClientConstant.APP_GOV.equals(app)) {
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrPublishRangeService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrPublishRangeService.java
index d238150f46..66a2dbb79e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrPublishRangeService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrPublishRangeService.java
@@ -102,6 +102,16 @@ public interface PrPublishRangeService extends BaseService<PrPublishRangeEntity>
      */
     List<String> getRangeOrgList(String projectKey);
 
+    /**
+     * @description 使用projectKey查询发布范围entity
+     *
+     * @param projectKey
+     * @return
+     * @author wxz
+     * @date 2021.09.23 23:04:23
+     */
+    List<PrPublishRangeEntity> getPublishRangeEntity(String projectKey);
+
     /**
      * @Description 获取组织范围内的问卷
      * @Param orgList
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java
index d669cc59c8..6865f8764e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java
@@ -125,6 +125,13 @@ public class PrPublishRangeServiceImpl extends BaseServiceImpl<PrPublishRangeDao
         return list.stream().map(PrPublishRangeEntity::getOrgId).collect(Collectors.toList());
     }
 
+    @Override
+    public List<PrPublishRangeEntity> getPublishRangeEntity(String projectKey) {
+        LambdaQueryWrapper<PrPublishRangeEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(PrPublishRangeEntity::getProjectKey, projectKey);
+        return baseDao.selectList(wrapper);
+    }
+
     /**
      * @param orgList
      * @Description 获取组织范围内的问卷
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/QuestionnaireServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/QuestionnaireServiceImpl.java
index ad4b5cb6a9..1c6aab452d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/QuestionnaireServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/QuestionnaireServiceImpl.java
@@ -12,6 +12,7 @@ import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dataaggre.dto.epmettduck.result.PermissionValidateResultDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrPublishRangeEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.service.QuestionnaireService;
 import com.epmet.dataaggre.service.epmettduck.PrPublishRangeService;
@@ -19,15 +20,22 @@ import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.feign.GovOrgOpenFeignClient;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
 @Service
+@Slf4j
 public class QuestionnaireServiceImpl implements QuestionnaireService, ResultDataResolver {
 
+    /** 调查问卷有效期  15min */
+    public static final long QUESTIONNAIRE_EXPIRE_SECONDS = 15 * 60;
+
     @Autowired
     private PrUserProjectService prUserProjectService;
 
@@ -55,10 +63,11 @@ public class QuestionnaireServiceImpl implements QuestionnaireService, ResultDat
      */
     public PermissionValidateResultDTO resiPermissionValidate(String projectKey, String userId, String gridId) {
 
-        PrUserProjectEntity projectEntity = prUserProjectService.getProjectEntityBykey(projectKey);
-        if (!AppClientConstant.APP_RESI.equals(projectEntity.getClient())) {
-            throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(),
-                    String.format("【调查问卷详情权限校验】该调查问卷发布端为[%s]，当前用户为[%s]", projectEntity.getClient(), AppClientConstant.APP_RESI));
+        PrUserProjectEntity project = prUserProjectService.getProjectEntityBykey(projectKey);
+        if (project == null || !AppClientConstant.APP_RESI.equals(project.getClient())) {
+            // 工作端只能看到发布到居民端的
+            log.warn("【调查问卷】居民端无法查看发布到工作端的调查问卷,staffId:{}, projectKey:{}", userId, projectKey);
+            return generateValidateResult(userId, projectKey, false);
         }
 
         CustomerGridFormDTO form = new CustomerGridFormDTO();
@@ -67,36 +76,44 @@ public class QuestionnaireServiceImpl implements QuestionnaireService, ResultDat
         CustomerGridDTO gridInfo = getResultDataOrThrowsException(gridInfoResult, ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【调查问卷】校验访问权限，查询网格信息失败");
         // 网格父级ID列表:网格ID(拼接起来，冒号分割)
         String gridIdPath = gridInfo.getPids().concat(":").concat(gridInfo.getId());
-        List<String> rangeList = prPublishRangeService.getRangeOrgList(projectKey);
+        List<PrPublishRangeEntity> publishRangeEntity = prPublishRangeService.getPublishRangeEntity(projectKey);
         PermissionValidateResultDTO r = new PermissionValidateResultDTO();
-        for (String range : rangeList) {
-            if (gridIdPath.contains(range)) {
-                r.setPermitted(true);
-                r.setAccessKey(generateQuestionnaireAccessKey(userId, projectKey));
-                return r;
+        for (PrPublishRangeEntity rangeEntity : publishRangeEntity) {
+            if (gridIdPath.contains(rangeEntity.getOrgIds())) {
+                return generateValidateResult(userId, projectKey, true);
             }
         }
         r.setPermitted(false);
         return r;
     }
 
-    /**
-     * @description 生成调查问卷accessKey
-     *
-     * @param userId
-     * @param qKey
-     * @return
-     * @author wxz
-     * @date 2021.09.23 17:43:50
-     */
-    private String generateQuestionnaireAccessKey(String userId, String qKey) {
-        String accessKey = UUID.randomUUID().toString();
-        redisUtils.set(RedisKeys.getQuestionnaireAccessKey(userId, qKey), accessKey);
-        return accessKey;
-    }
-
     @Override
     public PermissionValidateResultDTO govPermissionValidate(String projectKey, String staffId, String customerId) {
+        PrUserProjectEntity project = prUserProjectService.getProjectEntityBykey(projectKey);
+        if (project == null || !"gov".equals(project.getClient())) {
+            // 工作端只能看到发布到工作端的
+            log.warn("【调查问卷】工作端无法查看发布到居民端的调查问卷,staffId:{}, projectKey:{}", staffId, projectKey);
+            return generateValidateResult(staffId, projectKey, false);
+        }
+
+        List<String> gridRangeOrgIds = new ArrayList<>();
+        List<String> agencyRangeOrgIds = new ArrayList<>();
+        List<String> deptRangeOrgIds = new ArrayList<>();
+
+        // 将发布范围分别放到3个不同的列表中
+        List<PrPublishRangeEntity> publishRangeEntitys = prPublishRangeService.getPublishRangeEntity(projectKey);
+        publishRangeEntitys.forEach(rangeEntity -> {
+            if ("grid".equals(rangeEntity.getOrgType())) {
+                gridRangeOrgIds.add(rangeEntity.getOrgIds());
+            } else if ("agency".equals(rangeEntity.getOrgType())) {
+                agencyRangeOrgIds.add(rangeEntity.getOrgIds());
+            } else if ("dept".equals(rangeEntity.getOrgType())) {
+                deptRangeOrgIds.add(rangeEntity.getOrgIds());
+            } else {
+                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), String.format("【调查问卷】未知的发布范围类型:%s", rangeEntity.getOrgType()));
+            }
+        });
+
         CustomerStaffInfoCacheResult staffInfo = customerStaffRedis.getStaffInfo(customerId, staffId);
         PermissionValidateResultDTO r = null;
         //if ("agency".equals(staffInfo.getFromOrgType())) {
@@ -110,19 +127,67 @@ public class QuestionnaireServiceImpl implements QuestionnaireService, ResultDat
         //}
 
         String agencyId = staffInfo.getAgencyId();
+        String agencyPIds = staffInfo.getAgencyPIds();
+
+        // 网格范围内的权限判断
+        List<IdAndNameDTO> staffGridList = staffInfo.getGridList();
+        for (IdAndNameDTO gridIdAndName : staffGridList) {
+            // 工作人员所属的 父orgId路径:网格id
+            String staffGridIdPath = (StringUtils.isEmpty(agencyPIds) ? "" : agencyPIds.concat(":")).concat(agencyId).concat(":").concat(gridIdAndName.getId());
+            for (String gridRangeOrgId : gridRangeOrgIds) {
+                if (staffGridIdPath.contains(gridRangeOrgId)) {
+                    r = generateValidateResult(staffId, projectKey, true);
+                    return r;
+                }
+            }
+        }
 
-        List<IdAndNameDTO> gridList = staffInfo.getGridList();
-        for (IdAndNameDTO gridIdAndName : gridList) {
+        // dept范围内的权限判断
+        List<IdAndNameDTO> staffDeptList = staffInfo.getDeptList();
+        for (IdAndNameDTO deptIdAndName : staffDeptList) {
+            // 工作人员所属的 父orgId路径:网格id
+            String staffDeptIdPath = (StringUtils.isEmpty(agencyPIds) ? "" : agencyPIds.concat(":")).concat(agencyId).concat(":").concat(deptIdAndName.getId());
+            for (String deptRangeOrgIdPath : deptRangeOrgIds) {
+                if (staffDeptIdPath.contains(deptRangeOrgIdPath)) {
+                    r = generateValidateResult(staffId, projectKey, true);
+                    return r;
+                }
+            }
+        }
 
+        // agency范围内的权限判断
+        String staffAgencyIdPath = (StringUtils.isEmpty(agencyPIds) ? "" : agencyPIds.concat(":")).concat(agencyId);
+        for (String agencyRangeOrgId : agencyRangeOrgIds) {
+            if (staffAgencyIdPath.contains(agencyRangeOrgId)) {
+                r = generateValidateResult(staffId, projectKey, true);
+                return r;
+            }
         }
 
+        // 如果上述范围中都不能判断通过，那么返回一个不通过的结果给到前端
+        r = generateValidateResult(staffId, projectKey, false);
         return r;
     }
 
-    //private CustomerGridDTO getGridInfoById(String gridId) {
-    //    CustomerGridFormDTO gridInfoForm = new CustomerGridFormDTO();
-    //    gridInfoForm.setGridId(gridId);
-    //    Result<CustomerGridDTO> result = govOrgOpenFeignClient.getGridBaseInfoByGridId(gridInfoForm);
-    //    return getResultDataOrThrowsException(result, ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【调查问卷】获取网格信息失败");
-    //}
+    /**
+     * @description 生成权限允许的返回结果
+     *
+     * @param userId
+     * @param projectKey
+     * @param permitted 是否允许访问
+     * @return
+     * @author wxz
+     * @date 2021.09.23 23:19:17
+     */
+    private PermissionValidateResultDTO generateValidateResult(String userId, String projectKey, Boolean permitted) {
+        PermissionValidateResultDTO d = new PermissionValidateResultDTO();
+        d.setPermitted(permitted);
+        if (permitted) {
+            String accessKey = UUID.randomUUID().toString().replace("-", "");
+            redisUtils.set(RedisKeys.getQuestionnaireAccessKey(userId, projectKey), accessKey, QUESTIONNAIRE_EXPIRE_SECONDS);
+            d.setAccessKey(accessKey);
+        }
+        return d;
+    }
+
 }

From 0c5d5bbb39d7e312c83bf01c1fbe772cb091d5ee Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Fri, 24 Sep 2021 13:41:38 +0800
Subject: [PATCH 58/68] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=20=E3=80=90?=
 =?UTF-8?q?=E8=B0=83=E6=9F=A5=E9=97=AE=E5=8D=B7=E3=80=91=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E6=97=A0=E6=95=88=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dataaggre/controller/EpmetTDuckController.java  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
index bcffe238d4..101313d56c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
@@ -3,7 +3,6 @@ package com.epmet.dataaggre.controller;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
-import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.exception.ValidateException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@@ -19,9 +18,6 @@ import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import sun.tools.jstat.Token;
-
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**

From 8f60af53f3bdc7c6935ec77592277db5d4b0be72 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 24 Sep 2021 15:55:17 +0800
Subject: [PATCH 59/68] =?UTF-8?q?=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/epmettduck/impl/PrUserProjectServiceImpl.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 89f03e8545..23579dd5d2 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -169,16 +169,20 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
     @Override
     public List<TDuckListResultDTO> queryProjectList(TDuckListFormDTO formDTO) {
         List<String> orgIds = new ArrayList<>();
+        // 工作端不需要传orgId
         if (formDTO.getClient().equals(TDuckConstant.CLIENT_GOV)){
+            // 根据 客户ID 和 人ID 从redis获取信息
             CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
             String pids = staffInfo.getAgencyPIds();
             String agencyId = staffInfo.getAgencyId();
+            // 来源于 部门
             if (staffInfo.getFromOrgType().equals(TDuckConstant.ORG_TYPE_DEPT)){
                 List<IdAndNameDTO> deptList = staffInfo.getDeptList();
                 if (CollectionUtils.isEmpty(deptList)){
                     return new ArrayList<>();
                 }
                 orgIds = joint(pids,agencyId,deptList);
+                // 来源于 网格
             }else if (staffInfo.getFromOrgType().equals(TDuckConstant.ORG_TYPE_GRID)){
                 List<IdAndNameDTO> gridList = staffInfo.getGridList();
                 if (CollectionUtils.isEmpty(gridList)){
@@ -192,6 +196,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
         }else {
             CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO();
             customerGridFormDTO.setGridId(formDTO.getOrgId());
+            // 查询网格信息
             Result<CustomerGridDTO> gridResult = govOrgOpenFeignClient.getGridBaseInfoByGridId(customerGridFormDTO);
             if (!gridResult.success()){
                 throw new RenException("查询网格信息失败了...");
@@ -200,12 +205,14 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
             String oneOrg = data.getPids() + ":" + data.getId();
             orgIds.add(oneOrg);
         }
+        // 根据orgIds查询 问卷调查的key
         List<String> projectKeys = baseDao.selectProjectKey(orgIds);
         if (CollectionUtils.isEmpty(projectKeys)){
             return new ArrayList<>();
         }
         PageInfo<TDuckListResultDTO> projectPageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryProjectList(projectKeys, formDTO.getStatus(), formDTO.getClient()));
         List<TDuckListResultDTO> result = projectPageInfo.getList();
+        // 查询此人已填写过的问卷 并赋值已填写字段
         List<String> records = visitRecordDao.selectVisitRecordByUserId(formDTO.getUserId());
         if (!CollectionUtils.isEmpty(records)){
             for (String r : records) {
@@ -217,6 +224,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                 }
             }
         }
+        //赋值 orgName
         result.forEach(r -> {
             CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), r.getCreatedBy());
             String orgName = "";

From 4d46b8d15f6fb4046ff6abd7644054ecacaf8aeb Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 24 Sep 2021 16:51:31 +0800
Subject: [PATCH 60/68] =?UTF-8?q?=E5=A1=AB=E5=86=99=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/dao/epmettduck/PrUserProjectResultDao.java   | 7 ++++++-
 .../epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java    | 2 +-
 .../service/epmettduck/impl/PrUserProjectServiceImpl.java  | 5 +++--
 .../resources/mapper/epmettduck/PrUserProjectResultDao.xml | 5 +++++
 .../main/resources/mapper/epmettduck/PrVistRecordDao.xml   | 6 ------
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectResultDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectResultDao.java
index 15ae5f7c3a..eac14a49b8 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectResultDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectResultDao.java
@@ -3,6 +3,9 @@ package com.epmet.dataaggre.dao.epmettduck;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 项目表单项
@@ -12,5 +15,7 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PrUserProjectResultDao extends BaseDao<PrUserProjectResultEntity> {
-	
+
+    List<String> selectFillRecordByUserId(@Param("userId")String userId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java
index 279884c678..5714df590e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java
@@ -16,6 +16,6 @@ import java.util.List;
 @Mapper
 public interface PrVistRecordDao extends BaseDao<PrVistRecordEntity> {
 
-    List<String> selectVisitRecordByUserId(@Param("userId")String userId);
+
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 23579dd5d2..5d22f94772 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -38,6 +38,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.constant.TDuckConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao;
+import com.epmet.dataaggre.dao.epmettduck.PrUserProjectResultDao;
 import com.epmet.dataaggre.dao.epmettduck.PrVistRecordDao;
 import com.epmet.dataaggre.dto.epmettduck.PrPublishRangeDTO;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
@@ -85,7 +86,7 @@ import java.util.stream.Stream;
 public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao, PrUserProjectEntity> implements PrUserProjectService {
 
     @Autowired
-    private PrVistRecordDao visitRecordDao;
+    private PrUserProjectResultDao prUserProjectResultDao;
     @Resource
     private PrPublishRangeService prPublishRangeService;
     @Resource
@@ -213,7 +214,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
         PageInfo<TDuckListResultDTO> projectPageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryProjectList(projectKeys, formDTO.getStatus(), formDTO.getClient()));
         List<TDuckListResultDTO> result = projectPageInfo.getList();
         // 查询此人已填写过的问卷 并赋值已填写字段
-        List<String> records = visitRecordDao.selectVisitRecordByUserId(formDTO.getUserId());
+        List<String> records = prUserProjectResultDao.selectFillRecordByUserId(formDTO.getUserId());
         if (!CollectionUtils.isEmpty(records)){
             for (String r : records) {
                 for (TDuckListResultDTO t : result) {
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectResultDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectResultDao.xml
index 21518172dc..76fc783368 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectResultDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectResultDao.xml
@@ -3,4 +3,9 @@
 
 <mapper namespace="com.epmet.dataaggre.dao.epmettduck.PrUserProjectResultDao">
 
+    <select id="selectFillRecordByUserId" resultType="java.lang.String">
+        SELECT DISTINCT project_key FROM pr_user_project_result
+        WHERE del_flag = 0
+          AND user_id = #{userId}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrVistRecordDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrVistRecordDao.xml
index 77f2f5c68a..8ea675b0e9 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrVistRecordDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrVistRecordDao.xml
@@ -3,10 +3,4 @@
 
 <mapper namespace="com.epmet.dataaggre.dao.epmettduck.PrVistRecordDao">
 
-    <!-- 根据userId查询是否已填 -->
-    <select id="selectVisitRecordByUserId" resultType="java.lang.String">
-        SELECT project_key FROM pr_vist_record
-        WHERE del_flag = 0
-          AND user_id = #{userId}
-    </select>
 </mapper>
\ No newline at end of file

From 98952a8142bb16f2aad6b1277100dc75554a3086 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 24 Sep 2021 17:11:20 +0800
Subject: [PATCH 61/68] fill

---
 .../dto/epmettduck/result/TDuckListResultDTO.java   |  4 ++++
 .../epmettduck/impl/PrUserProjectServiceImpl.java   |  2 +-
 .../mapper/epmettduck/PrUserProjectDao.xml          | 13 +++++++------
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
index 0874011bce..b58d156a3d 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
@@ -1,6 +1,7 @@
 package com.epmet.dataaggre.dto.epmettduck.result;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -86,6 +87,9 @@ public class TDuckListResultDTO implements Serializable {
 
     private String createdBy;
 
+    @JsonIgnore
+    private Integer isEveryoneWriteOnceUid;
+
     public TDuckListResultDTO() {
         this.customerId = "";
         this.key = "";
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 5d22f94772..6d78893d55 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -218,7 +218,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
         if (!CollectionUtils.isEmpty(records)){
             for (String r : records) {
                 for (TDuckListResultDTO t : result) {
-                    if (r.equals(t.getKey())){
+                    if (t.getIsEveryoneWriteOnceUid() == NumConstant.ONE && r.equals(t.getKey())){
                         t.setFillStatus(true);
                         continue;
                     }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
index b9e54b758b..541271e826 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
@@ -82,16 +82,17 @@
 
     <!-- 根据keys查询project -->
     <select id="queryProjectList" resultType="com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO">
-        select * from pr_user_project
-        where del_flag = 0
-        AND status = #{status}
-        AND client = #{client}
-        AND `key` in (
+        select up.*,ps.is_everyone_write_once_uid from pr_user_project up
+        LEFT JOIN pr_user_project_setting ps ON (ps.project_key = up.`key` AND ps.del_flag = 0)
+        where up.del_flag = 0
+        AND up.status = #{status}
+        AND up.client = #{client}
+        AND up.`key` in (
             <foreach collection="keys" item="key" separator=",">
                 #{key}
             </foreach>
             )
-        ORDER BY created_time DESC
+        ORDER BY up.created_time DESC
     </select>
 
 </mapper>
\ No newline at end of file

From 812ed27eadff3f331d394fadadb92925b020e6c8 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 24 Sep 2021 17:27:15 +0800
Subject: [PATCH 62/68] fill

---
 .../dataaggre/dto/epmettduck/result/TDuckListResultDTO.java | 6 ++++++
 .../service/epmettduck/impl/PrUserProjectServiceImpl.java   | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
index b58d156a3d..ee412e8ad3 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
@@ -75,6 +75,11 @@ public class TDuckListResultDTO implements Serializable {
      */
     private Boolean fillStatus;
 
+    /**
+     * 是否还能填写问卷，能：true，不能：false
+     */
+    private Boolean isFillQuestion;
+
     /**
      * 回收状态 0:未回收；1已回收
      */
@@ -103,6 +108,7 @@ public class TDuckListResultDTO implements Serializable {
         this.client = "";
         this.createdTime = "";
         this.fillStatus = false;
+        this.isFillQuestion = true;
         this.orgName = "";
     }
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 6d78893d55..8f8176d5dd 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -219,8 +219,10 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
             for (String r : records) {
                 for (TDuckListResultDTO t : result) {
                     if (t.getIsEveryoneWriteOnceUid() == NumConstant.ONE && r.equals(t.getKey())){
+                        t.setIsFillQuestion(false);
+                    }
+                    if (r.equals(t.getKey())){
                         t.setFillStatus(true);
-                        continue;
                     }
                 }
             }

From 886f058e47b8fdc5a780c923977efe5c854a8d1c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sun, 26 Sep 2021 09:18:39 +0800
Subject: [PATCH 63/68] ;

---
 .../java/com/epmet/service/impl/CustomerGridServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index fbb937f2ba..727d1536da 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -297,7 +297,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result deleteGrid(TokenDto tokenDto,DeleteGridFormDTO deleteGridFormDTO) {
-        redisUtils.delete(RedisKeys.getGridInfoKey(deleteGridFormDTO.getGridId()))
+        redisUtils.delete(RedisKeys.getGridInfoKey(deleteGridFormDTO.getGridId()));
         List<UserIdDTO> userIdDTOS = baseDao.selectUserIdByGrid(deleteGridFormDTO.getGridId());
         deleteGridFormDTO.setUserId(tokenDto.getUserId());
         if (userIdDTOS.size()==0){

From 38144d04472478e1828273d66eb0d150ec5d914d Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Sun, 26 Sep 2021 14:19:27 +0800
Subject: [PATCH 64/68] emm

---
 .../src/main/resources/mapper/epmettduck/PrUserProjectDao.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
index 541271e826..e1eb771b64 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
@@ -82,7 +82,7 @@
 
     <!-- 根据keys查询project -->
     <select id="queryProjectList" resultType="com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO">
-        select up.*,ps.is_everyone_write_once_uid from pr_user_project up
+        select up.*,ps.is_everyone_write_once_uid as isEveryoneWriteOnceUid from pr_user_project up
         LEFT JOIN pr_user_project_setting ps ON (ps.project_key = up.`key` AND ps.del_flag = 0)
         where up.del_flag = 0
         AND up.status = #{status}

From fe2d6178cecb516a0ae3bf513ca66fe9597a1019 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Sun, 26 Sep 2021 14:28:45 +0800
Subject: [PATCH 65/68] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=80=BC=200?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/epmettduck/PrUserProjectDao.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
index e1eb771b64..a22d98b11d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
@@ -82,7 +82,7 @@
 
     <!-- 根据keys查询project -->
     <select id="queryProjectList" resultType="com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO">
-        select up.*,ps.is_everyone_write_once_uid as isEveryoneWriteOnceUid from pr_user_project up
+        select up.*,IFNULL(ps.is_everyone_write_once_uid,0) as isEveryoneWriteOnceUid from pr_user_project up
         LEFT JOIN pr_user_project_setting ps ON (ps.project_key = up.`key` AND ps.del_flag = 0)
         where up.del_flag = 0
         AND up.status = #{status}

From 9e904f22e38ae16fbe83e36ba8be688a712697a2 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 28 Sep 2021 17:46:44 +0800
Subject: [PATCH 66/68] =?UTF-8?q?select=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/epmettduck/impl/PrUserProjectServiceImpl.java      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 8f8176d5dd..bc905870e8 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -39,7 +39,6 @@ import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.constant.TDuckConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao;
 import com.epmet.dataaggre.dao.epmettduck.PrUserProjectResultDao;
-import com.epmet.dataaggre.dao.epmettduck.PrVistRecordDao;
 import com.epmet.dataaggre.dto.epmettduck.PrPublishRangeDTO;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
 import com.epmet.dataaggre.dto.epmettduck.PrVistRecordDTO;
@@ -381,7 +380,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                     int currentCount = 0;
                     for (PrUserProjectResultEntity res : resultList) {
                         JSONObject originalData = JSON.parseObject(res.getOriginalData());
-                        if (selectExpandStruct.getMultiple()) {
+                        if (null != selectExpandStruct.getMultiple() && selectExpandStruct.getMultiple()) {
                             //多选
                             if(originalData.containsKey(key)){
                                 List<Integer> answers = (List<Integer>) originalData.get(key);

From c5bc13d3af3ead52754e972a1468c402d193f8c2 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 29 Sep 2021 16:23:59 +0800
Subject: [PATCH 67/68] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=201.=E3=80=90?=
 =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=8E=92=E5=90=8D=E3=80=91&=E3=80=90?=
 =?UTF-8?q?=E8=B0=83=E6=9F=A5=E9=97=AE=E5=8D=B7=E3=80=91=E4=B8=AD=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E7=BC=93=E5=AD=98=E5=86=85=E5=AE=B9=E4=B8=8D=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/commons/tools/redis/RedisKeys.java  |  9 -----
 .../redis/common/bean/GridInfoCache.java      | 12 -------
 .../impl/BizPointTotalDetailServiceImpl.java  | 36 ++++++++-----------
 .../java/com/epmet/dto/CustomerGridDTO.java   |  3 ++
 .../service/impl/CustomerGridServiceImpl.java |  7 ++--
 5 files changed, 21 insertions(+), 46 deletions(-)
 delete mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
index a6a83e64e7..6fe4130225 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
@@ -212,15 +212,6 @@ public class RedisKeys {
 		return rootPrefix.concat("gov:agency:").concat(agencyId);
 	}
 
-	/**
-	 * 网格信息key
-	 * @param gridId
-	 * @return
-	 */
-	public static String getGridByIdKey(String gridId) {
-		return rootPrefix.concat("gov:grid:").concat(gridId);
-	}
-
 	/**
 	 * 客户标签排行 缓存Key
 	 * @param customerId
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java
deleted file mode 100644
index 2900180581..0000000000
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.epmet.commons.tools.redis.common.bean;
-
-import lombok.Data;
-
-@Data
-public class GridInfoCache {
-    private String gridId;
-    private String gridNamePath;
-    private String customerId;
-    private String pid;
-    private String pids;
-}
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
index 78d6fd7c81..87b7b20a32 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
@@ -29,7 +29,7 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.RedisKeys;
-import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
+import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
@@ -47,7 +47,6 @@ import com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO;
 import com.epmet.dto.result.GroupPointRankingResultDTO;
 import com.epmet.entity.BizPointTotalDetailEntity;
 import com.epmet.resi.group.dto.group.ResiGroupDTO;
-import com.epmet.resi.group.dto.group.result.RankingResultDTO;
 import com.epmet.resi.group.enums.SearchScopeTypeEnum;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.service.BizPointTotalDetailService;
@@ -88,6 +87,8 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
     private RedisTemplate<String, ?> redisTemplate;
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
+    @Autowired
+    private RedisUtils redisUtils;
 
     @Override
     public PageData<BizPointTotalDetailDTO> page(Map<String, Object> params) {
@@ -320,8 +321,8 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
                 ranking ++;
             }
 
-            GridInfoCache gridInfo = getGridInfo(g.getGridId());
-            g.setGridId(g.getGridId());
+            CustomerGridDTO gridInfo = getGridInfo(g.getGridId());
+            //g.setGridId(g.getGridId());
             if (gridInfo != null) {
                 g.setGridNamePath(gridInfo.getGridNamePath());
             } else {
@@ -441,28 +442,19 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
      * @author wxz
      * @date 2021.09.08 11:17:17
      */
-    public GridInfoCache getGridInfo(String gridId) {
-        HashOperations<String, String, Object> ope = redisTemplate.opsForHash();
-        Map<String, Object> entries = ope.entries(RedisKeys.getGridInfoKey(gridId));
-        if (entries.size() != 0) {
-            return BeanUtil.mapToBean(entries, GridInfoCache.class, true);
+    public CustomerGridDTO getGridInfo(String gridId) {
+        String redisKey = RedisKeys.getGridInfoKey(gridId);
+        Map<String, Object> gridCache = redisUtils.hGetAll(redisKey);
+        if (gridCache != null && gridCache.size() > 0) {
+            // 直接取缓存中的
+            CustomerGridDTO gridInfo = BeanUtil.mapToBean(gridCache, CustomerGridDTO.class, true);
+            return gridInfo;
         }
 
         CustomerGridFormDTO form = new CustomerGridFormDTO();
         form.setGridId(gridId);
-        Result<CustomerGridDTO> result = govOrgOpenFeignClient.getCustomerGridByGridId(form);
-        if (result == null || !result.success() || result.getData() == null) {
-            return null;
-        }
-
-        GridInfoCache cache = new GridInfoCache();
-        cache.setCustomerId(result.getData().getCustomerId());
-        cache.setGridId(result.getData().getId());
-        cache.setGridNamePath(result.getData().getGridName());
-        cache.setPid(result.getData().getPid());
-        cache.setPids(result.getData().getPids());
-        ope.putAll(RedisKeys.getGridInfoKey(gridId), BeanUtil.beanToMap(cache));
-        return cache;
+        Result<CustomerGridDTO> result = govOrgOpenFeignClient.getGridBaseInfoByGridId(form);
+        return getResultDataOrThrowsException(result, ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【小组排名】查询网格信息失败");
     }
 
     @Override
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java
index 39a0968121..d58682f00a 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java
@@ -49,6 +49,9 @@ public class CustomerGridDTO implements Serializable {
      */
 	private String gridName;
 
+	/** 组织-网格 */
+    private String gridNamePath;
+
     /**
      * 中心位置经度
      */
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index 727d1536da..82b9629274 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -720,7 +720,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
 
     @Override
     public CustomerGridDTO getBaseInfo(CustomerGridFormDTO customerGridFormDTO) {
-        String redisKey = RedisKeys.getGridByIdKey(customerGridFormDTO.getGridId());
+        String redisKey = RedisKeys.getGridInfoKey(customerGridFormDTO.getGridId());
         Map<String, Object> gridCache = redisUtils.hGetAll(redisKey);
         if (gridCache != null && gridCache.size() > 0) {
             // 直接取缓存中的
@@ -730,8 +730,9 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
 
         CustomerGridDTO gridInfo = ConvertUtils.sourceToTarget(baseDao.selectById(customerGridFormDTO.getGridId()), CustomerGridDTO.class);
         if (null != gridInfo) {
-            CustomerAgencyEntity entity = customerAgencyService.selectById(gridInfo.getPid());
-            gridInfo.setAgencyName(null != entity ? entity.getOrganizationName() : "");
+            CustomerAgencyEntity agency = customerAgencyService.selectById(gridInfo.getPid());
+            gridInfo.setAgencyName(null != agency ? agency.getOrganizationName() : "");
+            gridInfo.setGridNamePath(null != agency ? agency.getOrganizationName().concat("-").concat(gridInfo.getGridName()) : gridInfo.getGridName());
         }
 
         redisUtils.hMSet(redisKey, BeanUtil.beanToMap(gridInfo));

From 086299f1d82fbb33a7038d21d2eebf6bb49e267f Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 29 Sep 2021 16:58:33 +0800
Subject: [PATCH 68/68] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=201.=20?=
 =?UTF-8?q?=E3=80=90=E6=9F=A5=E8=AF=A2=E7=BD=91=E6=A0=BC=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=B9=B6=E7=BC=93=E5=AD=98=E3=80=91=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=A4=E6=96=ADdel=5Fflag=3D1=E7=9A=84=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E4=B8=8D=E7=BC=93=E5=AD=98=E7=9A=84=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/CustomerGridServiceImpl.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index 82b9629274..58faa734ac 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -733,9 +733,10 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
             CustomerAgencyEntity agency = customerAgencyService.selectById(gridInfo.getPid());
             gridInfo.setAgencyName(null != agency ? agency.getOrganizationName() : "");
             gridInfo.setGridNamePath(null != agency ? agency.getOrganizationName().concat("-").concat(gridInfo.getGridName()) : gridInfo.getGridName());
+
+            redisUtils.hMSet(redisKey, BeanUtil.beanToMap(gridInfo));
         }
 
-        redisUtils.hMSet(redisKey, BeanUtil.beanToMap(gridInfo));
         return gridInfo;
     }