Merge remote-tracking branch 'remotes/origin/dev_question_naire' into dev

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;
 
@@ -110,6 +108,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 userId;
+        userId = getFieldValByName(FieldConstant.USER_ID_HUMP, metaObject);
+        if (userId != null && !userId.equals("")) {
+            // 看entity是否手动设置了，设置了就用设置的
+            return userId;
+        }
+        return loginUserUtil.getLoginUserId();
+    }
 
     public Object getCreatedTimeByFieldValue(MetaObject metaObject) {
         Object createdTime = null;

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;
+
     /**
      * 工作人员所属组织名称
      */
@@ -57,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

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@@ -534,4 +534,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);
+	}
 }

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;
+
     /**
      * 工作人员所属组织名称
      */

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java

@@ -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;
-}

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>
@@ -364,6 +367,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>
@@ -461,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>
@@ -561,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>

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()));
             }
 

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:

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>

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java

@@ -32,5 +32,9 @@ public interface DataSourceConstant {
     String EVALUATION_INDEX = "evaluationIndex";
 
     String OPERCUSTOMIZE="opercustomize";
+
     String EPMET_MESSAGE="epmetmessage";
+
+    String EPMET_T_DUCK = "epmettduck";
+    String EPMETTDUCK="epmettduck";
 }

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";
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserAuthorizeDTO.java

@@ -0,0 +1,85 @@
+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;
+
+
+    /**
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserDTO.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 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;
+
+    /**
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+}

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;
+}
+

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateCategoryDTO.java

@@ -0,0 +1,85 @@
+/**
+ * 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 String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 主题名称
+     */
+	private String name;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateDTO.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.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;
+
+    /**
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateItemDTO.java

@@ -0,0 +1,141 @@
+/**
+ * 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;
+
+    /**
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+    /**
+     * 展示类型组件
+     */
+	private Integer isDisplayType;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectThemeDTO.java

@@ -0,0 +1,101 @@
+/**
+ * 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;
+
+    /**
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrPublishRangeDTO.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.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;
+
+    /**
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrResultExtDTO.java

@@ -0,0 +1,101 @@
+/**
+ * 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;
+
+    /**
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectDTO.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 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;
+
+    /**
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectItemDTO.java

@@ -0,0 +1,141 @@
+/**
+ * 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;
+
+    /**
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectLogicDTO.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.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;
+
+    /**
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectResultDTO.java

@@ -0,0 +1,141 @@
+/**
+ * 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;
+
+    /**
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectSettingDTO.java

@@ -0,0 +1,186 @@
+/**
+ * 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;
+
+    /**
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectThemeDTO.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.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;
+
+    /**
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrVistRecordDTO.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 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;
+
+    /**
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/ProjectItemTypeEnum.java

@@ -0,0 +1,75 @@
+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),
+    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;
+    }
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/WxMpUserDTO.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.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;
+
+    /**
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java

@@ -0,0 +1,32 @@
+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目前产品没要求分页
+     */
+    //@NotNull(message = "pageNo不能为空",groups = AddUserInternalGroup.class)
+    //private Integer pageNo;
+    //@NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class)
+    //private Integer pageSize;
+}
+

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ProjectKeyCommonDTO.java

@@ -0,0 +1,23 @@
+package com.epmet.dataaggre.dto.epmettduck.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description projectKey通用
+ * @Author yinzuomei
+ * @Date 2021/9/16 1:32 下午
+ */
+@Data
+public class ProjectKeyCommonDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+    /**
+     * 问卷id, 对应pr_user_project.key
+     */
+    @NotBlank(message = "projectKey不能为空",groups = AddUserInternalGroup.class)
+    private String projectKey;
+}
+

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckDetailFormDTO.java

@@ -0,0 +1,38 @@
+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{}
+    public interface PermissionValidate{}
+
+    /**
+     * 项目key
+     */
+    @NotBlank(message = "项目key不能为空",groups = { TDuckDetailForm.class, PermissionValidate.class })
+    private String key;
+    /**
+     * 是否显示类型
+     */
+    @NotNull(message = "是否显示类型不能为空",groups = TDuckDetailForm.class)
+    private Boolean displayType;
+
+    /** 当前操作人所在的组织的类型(grid:网格,agency:单位) */
+    private String orgType;
+
+    /** 当前操作人所在的组织的ID(当orgType为grid的时候必填，为agency的时候留空) */
+    private String orgId;
+}

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;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckListFormDTO.java

@@ -0,0 +1,43 @@
+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;
+
+    private String orgId;
+
+    private String orgType;
+
+    @NotBlank(message = "client不能为空",groups = TDuckListForm.class)
+    private String client;
+
+    private String userId;
+
+    private String customerId;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java

@@ -0,0 +1,68 @@
+package com.epmet.dataaggre.dto.epmettduck.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+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, Object> detail;
+
+    /**
+     * 扩展字段 表单项独有字段
+     */
+    @JsonIgnore
+    private String expand;
+
+    private String moduleType;
+}
+

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java

@@ -0,0 +1,40 @@
+package com.epmet.dataaggre.dto.epmettduck.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 级联选择组件答案参数格式
+ * @Author yinzuomei
+ * @Date 2021/9/18 3:40 下午
+ */
+@Data
+public class CascaderDTO implements Serializable {
+    /**
+     * 当前选择的选项id
+     */
+    private Integer id;
+    /**
+     * 选项名
+     */
+    private String label;
+
+    /**
+     * 选项名
+     */
+    private String value;
+
+    /**
+     * pid
+     */
+    private Integer pid;
+
+    /**
+     * 全路径名字
+     */
+    private List<String> labels;
+    public String pathName;
+}
+

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;
+}
+

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;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.dataaggre.dto.epmettduck.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description 联系人组件
+ * @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<Map<String,String>> dataMap;
+    //private List<List<String>> dataList;
+
+    public ItemResDetailConcatResultDTO(){
+        this.tableHeaderList=new ArrayList<>();
+        this.dataMap=new ArrayList<>();
+    }
+}
+

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;
+}
+

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;
+}

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;
+}
+

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;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java

@@ -0,0 +1,114 @@
+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;
+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;
+
+    /**
+     * 是否还能填写问卷，能：true，不能：false
+     */
+    private Boolean isFillQuestion;
+
+    /**
+     * 回收状态 0:未回收；1已回收
+     */
+    private Integer recycled;
+
+    /**
+     * 组织名
+     */
+    private String orgName;
+
+    private String createdBy;
+
+    @JsonIgnore
+    private Integer isEveryoneWriteOnceUid;
+
+    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;
+        this.isFillQuestion = true;
+        this.orgName = "";
+    }
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java

@@ -0,0 +1,50 @@
+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;
+
+    @Data
+    public static class Option {
+        public Integer id;
+        public String label;
+        public String value;
+        /**
+         * 莹姐加了这个参数
+         */
+        public String pid;
+        public List<Option> children;
+    }
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CheckboxExpandStruct.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 11:42
+ **/
+@Data
+public class CheckboxExpandStruct {
+    /**
+     * 最小
+     */
+    private Integer min;
+    /**
+     * 最大
+     */
+    private Integer max;
+
+    /**
+     * 选项类型
+     */
+    private String optionType;
+
+    /**
+     * 选项是按钮时大小
+     */
+    private String size;
+
+    /**
+     * 选项
+     */
+    private List<Option> options;
+
+
+    @Data
+    public static class Option {
+        public String label;
+        public Integer value;
+    }
+
+}

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 {
+
+
+}

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;
+
+}

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 {
+
+
+}

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;
+
+
+}

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 {
+
+
+}

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 {
+}

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;
+    }
+
+}

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;
+
+}

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;
+    }
+
+}

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;
+}

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;
+
+
+}

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;
+}

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 {
+
+}

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;
+
+    @Data
+    public static class Option {
+        public String label;
+        public Integer value;
+    }
+}

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;
+
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java

@@ -0,0 +1,48 @@
+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;
+
+
+    @Data
+    public static class Option {
+        public String label;
+        public Integer value;
+    }
+}

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;
+
+
+}

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;
+}

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 {
+
+
+}

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;
+
+}

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 {
+
+
+}

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 {
+
+
+}

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;
+}

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;
+    }
+}

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;
+
     /**
      * 工作人员所属组织名称
      */

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 否）
      */

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;
+}

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>

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java

@@ -0,0 +1,181 @@
+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.ValidateException;
+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.*;
+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.*;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/15 2:43 下午
+ * @DESC
+ */
+@RestController
+@RequestMapping("questionnaire")
+public class EpmetTDuckController {
+    @Autowired
+    private PrUserProjectService prUserProjectService;
+    @Autowired
+    private PrUserProjectItemService projectItemService;
+    @Autowired
+    private QuestionnaireService questionnaireService;
+
+
+    /**
+     * 问卷概要
+     *
+     * @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()));
+    }
+
+    /**
+     * @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));
+    }
+    /**
+     * 分析报告
+     *
+     * @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){
+        ValidatorUtils.validateEntity(formDTO,ProjectKeyCommonDTO.AddUserInternalGroup.class);
+        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);
+        formDTO.setUserId(tokenDto.getUserId());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        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));
+    }
+
+    /**
+     * @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()));
+    }
+
+    /**
+     * 查看详情
+     * 1、联系人组件统一用一个统计显示多少条，点击查看更多显示汇总列表，如有非必填项没有填写显示空（手机号验证不需要统计）
+     * 2、单行文本、多行文本、时间选择、时间范围、日期选择、日期范围，统计填写人数，点击查看列表
+     *
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @date 2021/9/22 1:37 下午
+     */
+    @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 ProjectKeyCommonDTO formDTO){
+        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));
+    }
+
+    /**
+     * @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) || !"grid".equals(input.getOrgType())) {
+                // 居民端，orgId是网格id，必填
+                throw new ValidateException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), "【调查问卷】校验访问权限-居民端 orgId不能为空，且orgType需要为[grid]");
+            }
+            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);
+    }
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java

@@ -165,4 +165,17 @@ 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<List<OrgTreeResultDTO>> getAgencyTree(@LoginUser TokenDto tokenDto, @RequestBody SubOrgFormDTO formDTO) {
+        return new Result<List<OrgTreeResultDTO>>().ok(govOrgService.getAgencyTree(tokenDto, formDTO));
+    }
+
 }

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> {
+	
+}

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> {
+	
+}

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 {
+	
+}

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> {
+	
+}

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> {
+	
+}

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> {
+	
+}

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> {
+	
+}

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> {
+	
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java

@@ -0,0 +1,77 @@
+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;
+
+/**
+ * 项目表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@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);
+
+    /**
+     * 分析报告展示的题目列表
+     *
+     * @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);
+
+    /**
+     * @Description  查询范围内的问卷调查
+     * @Param orgId
+     * @author zxc
+     * @date 2021/9/17 2:16 下午
+     */
+    List<String> selectProjectKey(@Param("orgIds")List<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,@Param("client")String client);
+
+    /**
+     * 当前问卷中所有的联系人组件
+     *
+     * @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);
+}

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> {
+	
+}

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> {
+	
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectResultDao.java

@@ -0,0 +1,21 @@
+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;
+
+/**
+ * 项目表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Mapper
+public interface PrUserProjectResultDao extends BaseDao<PrUserProjectResultEntity> {
+
+    List<String> selectFillRecordByUserId(@Param("userId")String userId);
+
+}

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> {
+	
+}

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> {
+	
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java

@@ -0,0 +1,21 @@
+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;
+
+/**
+ * 用户访问问卷记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-09-15
+ */
+@Mapper
+public interface PrVistRecordDao extends BaseDao<PrVistRecordEntity> {
+
+
+
+}

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> {
+	
+}

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,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);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserAuthorizeEntity.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.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;
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserEntity.java

@@ -0,0 +1,97 @@
+/**
+ * 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;
+
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateCategoryEntity.java

@@ -0,0 +1,62 @@
+/**
+ * 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 extends BaseEpmetEntity{
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 主题名称
+     */
+	private String name;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateEntity.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_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;
+
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateItemEntity.java

@@ -0,0 +1,116 @@
+/**
+ * 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 Integer isDisplayType;
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectThemeEntity.java

@@ -0,0 +1,77 @@
+/**
+ * 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;
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrPublishRangeEntity.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_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;
+
+}