Browse Source

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

master
jianjun 4 years ago
parent
commit
76b5437da3
  1. 23
      epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java
  2. 6
      epmet-commons/epmet-commons-tools/pom.xml
  3. 11
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java
  4. 10
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java
  5. 7
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
  6. 25
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
  7. 5
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/CustomerStaffInfoCache.java
  8. 12
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java
  9. 17
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
  10. 42
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java
  11. 9
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Pinyin4jUtil.java
  12. 10
      epmet-gateway/pom.xml
  13. 4
      epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
  14. 11
      epmet-gateway/src/main/resources/bootstrap.yml
  15. 6
      epmet-module/data-aggregator/data-aggregator-client/pom.xml
  16. 4
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java
  17. 17
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/TDuckConstant.java
  18. 67
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/CustomerDataManageFormDTO.java
  19. 5
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/PartyMemberVanguardFormDTO.java
  20. 57
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java
  21. 85
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserAuthorizeDTO.java
  22. 121
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserDTO.java
  23. 19
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/InputMapDTO.java
  24. 85
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateCategoryDTO.java
  25. 111
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateDTO.java
  26. 141
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateItemDTO.java
  27. 101
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectThemeDTO.java
  28. 96
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrPublishRangeDTO.java
  29. 101
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrResultExtDTO.java
  30. 121
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectDTO.java
  31. 141
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectItemDTO.java
  32. 96
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectLogicDTO.java
  33. 141
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectResultDTO.java
  34. 186
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectSettingDTO.java
  35. 126
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectThemeDTO.java
  36. 91
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrVistRecordDTO.java
  37. 75
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/ProjectItemTypeEnum.java
  38. 126
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/WxMpUserDTO.java
  39. 32
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java
  40. 23
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ProjectKeyCommonDTO.java
  41. 38
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckDetailFormDTO.java
  42. 23
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckHeaderInfoFormDTO.java
  43. 43
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckListFormDTO.java
  44. 68
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java
  45. 40
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/CascaderDTO.java
  46. 27
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ConcatTableHeaderDTO.java
  47. 24
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/GetRangeResultDTO.java
  48. 27
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java
  49. 29
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/OptionDTO.java
  50. 9
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/PermissionValidateResultDTO.java
  51. 39
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ProjectProfileResultDTO.java
  52. 19
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/RedPointResultDTO.java
  53. 114
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
  54. 50
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java
  55. 45
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CheckboxExpandStruct.java
  56. 14
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ColorExpandStruct.java
  57. 20
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DateExpandStruct.java
  58. 14
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DateRangeExpandStruct.java
  59. 24
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DescTextExpandStruct.java
  60. 15
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DividerExpandStruct.java
  61. 10
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/EmptyExpandStruct.java
  62. 25
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageCarouselExpandStruct.java
  63. 12
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageExpandStruct.java
  64. 31
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageSelectExpandStruct.java
  65. 36
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/InputExpandStruct.java
  66. 21
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ItemDefaultValueStruct.java
  67. 38
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/NumberExpandStruct.java
  68. 13
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/PaginationExpandStruct.java
  69. 31
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RadioExpandStruct.java
  70. 35
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RateExpandStruct.java
  71. 48
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java
  72. 19
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SignPadExpandStruct.java
  73. 35
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SliderExpandStruct.java
  74. 14
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SwitchExpandStruct.java
  75. 27
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TextareaExpandStruct.java
  76. 14
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TimeExpandStruct.java
  77. 14
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TimeRangeExpandStruct.java
  78. 53
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/UploadExpandStruct.java
  79. 22
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/UploadResultStruct.java
  80. 5
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/CustomerStaffResultDTO.java
  81. 27
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/ScreenAgencyOrGridListDTO.java
  82. 2
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/OrgStaffListFormDTO.java
  83. 4
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/SubOrgFormDTO.java
  84. 21
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgTreeResultDTO.java
  85. 6
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/BranchConAnalysisFormDTO.java
  86. 6
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/GroupActRankFormDTO.java
  87. 28
      epmet-module/data-aggregator/data-aggregator-server/pom.xml
  88. 35
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
  89. 181
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
  90. 13
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java
  91. 35
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
  92. 16
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/AcUserAuthorizeDao.java
  93. 16
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/AcUserDao.java
  94. 16
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectTemplateCategoryDao.java
  95. 16
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectTemplateDao.java
  96. 16
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectTemplateItemDao.java
  97. 16
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectThemeDao.java
  98. 16
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrPublishRangeDao.java
  99. 16
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrResultExtDao.java
  100. 77
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java

23
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;

6
epmet-commons/epmet-commons-tools/pom.xml

@ -153,6 +153,12 @@
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
</dependency>
<dependency>
<groupId>io.github.wnjustdoit</groupId>
<artifactId>pinyin4j</artifactId>
<version>2.6.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>

11
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java

@ -160,4 +160,15 @@ public interface Constant {
// resi_footbar_highlight_num
// gov_footbar_highlight_num
String FOOTBAR_HIGHLIGHT_NUM="_footbar_highlight_num";
/**
* 未被禁用标识
* */
String ENABLE = "enable";
/**
* 被禁用标识
* */
String DISABLE = "disable";
}

10
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个值agencygriddept
* @see com.epmet.commons.tools.enums.OrgTypeEnum

7
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@ -74,6 +74,8 @@ public enum EpmetErrorCode {
AREA_CODE_ALREADY_EXISTS(8208,"组织区划已被占用,请重新选择"),
AGENCY_NAME_ALREADY_EXISTS(8209,"当前组织名称已存在,请重新修改"),
SET_PARENT_AREA_CODE(8210,"请先设置上级组织区划"),
HAVE_GUIDE_CANNOT_DEL(8211,"当前分类已经存在办事指南,不允许删除"),
GUIDE_CATEGORY_NAME_EXITS(8212,"分类已存在"),
REQUIRE_PERMISSION(8301, "您没有足够的操作权限"),
THIRD_PLAT_REQUEST_ERROR(8302, "请求第三方平台错误"),
@ -108,6 +110,8 @@ public enum EpmetErrorCode {
PLEASE_CHOOSE_MEMBER(8611,"请选择成员"),
INFO_GROUP_NAME_EXISTS(8612,"名称已存在"),
INFO_REPLY_CONTENT_LENGTH_LIMIT(8613,"回复内容最多输入500字"),
INFO_GROUP_NOT_EXISTS(8614,"群不存在"),
INFO_GROUP_OPE_PERMISSION_REQUIRED(8615,"无权操作"),
// 爱心互助 居民端
NOT_IN_THE_SIGN_IN_RANGE(8510, "您还未进入指定的签到范围~"),
@ -155,7 +159,8 @@ public enum EpmetErrorCode {
EXISTED_SPECIAL_PROJECT(8807, "已经添加过此专题"),
CAN_NOT_DEL_SPECIAL_PROJECT(8808, "您没有权限删除此专题"),
TAG_NOT_EXIST(8809,"标签不存在"),
GUIDE_IS_NULL(8810,"指南内容不能为空"),
GUIDE_IS_NOT_YOURS(8811,"只能删除自己创建的指南"),
//公众号 865..开头的码
PUBLIC_NOT_EXISTS(8651,"手机号未注册,请先完成信息注册"),
SELECT_CUSTOMER_ERROR(8652,"未查询到注册客户信息"),

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

@ -522,4 +522,29 @@ public class RedisKeys {
public static String getCustomerStaffInfoKey(String customerId, String staffId) {
return rootPrefix.concat("gov:staff:").concat(customerId).concat(StrConstant.COLON).concat(staffId);
}
/**
* @description 网格信息
*
* @param gridId
* @return
* @author wxz
* @date 2021.09.08 11:03:48
*/
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);
}
}

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

12
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java

@ -27,8 +27,14 @@ import org.springframework.core.MethodParameter;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.support.WebDataBinderFactory;
import org.springframework.web.context.request.NativeWebRequest;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.method.support.ModelAndViewContainer;
import org.springframework.web.servlet.HandlerMapping;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import java.util.Map;
/**
* @LoginUser注解的方法参数注入当前登录用户
@ -68,6 +74,12 @@ public class LoginUserHandlerMethodArgumentResolver implements HandlerMethodArgu
@Override
public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer container,
NativeWebRequest request, WebDataBinderFactory factory) throws Exception {
HttpServletRequest nativeReq = (HttpServletRequest) request.getNativeRequest();
String requestURI = nativeReq.getRequestURI();
logger.info("【LoginUserHandlerMethodArgumentResolver】请求uri:{}", requestURI);
//app-client-userId
String redisKey = request.getHeader(Constant.APP_USER_KEY);
if (StringUtils.isEmpty(redisKey)) {

17
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java

@ -418,6 +418,23 @@ public class DateUtils {
return DateUtils.format(date,DateUtils.DATE_PATTERN_YYYYMMDD);
}
public static String getMonthDay(String month){
SimpleDateFormat sdf = new SimpleDateFormat(DATE_PATTERN_YYYYMM);
String now = sdf.format(new Date());//当前时间
if (month.equals(now)) {
Calendar c = Calendar.getInstance();
c.add(Calendar.DATE, - NumConstant.ONE);
Date date = c.getTime();
return DateUtils.format(date, DateUtils.DATE_PATTERN_YYYYMMDD);
}
Date nowDate = parse(month, DATE_PATTERN_YYYYMM);
Calendar calendar = Calendar.getInstance();
calendar.setTime(nowDate);
calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
return DateUtils.format(calendar.getTime(), DateUtils.DATE_PATTERN_YYYYMMDD);
}
/**
* @return java.lang.String
* @param beforDay

42
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java

@ -14,11 +14,13 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.BeanUtils;
import org.springframework.util.CollectionUtils;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
@ -80,4 +82,44 @@ public class ExcelUtils {
exportExcel(response, fileName, targetList, targetClass);
}
public static void exportExcelToTargetDisposeAll(HttpServletResponse response, String fileName, Collection<?> sourceList,
Class<?> targetClass) throws Exception {
if (!CollectionUtils.isEmpty(sourceList)){
List<Object> targetList = new ArrayList<>(sourceList.size());
for(Object source : sourceList){
Object target = targetClass.newInstance();
BeanUtils.copyProperties(source, target);
targetList.add(target);
}
exportExcelDispose(response, fileName, targetList, targetClass);
}else {
exportExcelDispose(response, fileName, new ArrayList<>(), targetClass);
}
}
public static void exportExcelDispose(HttpServletResponse response, String fileName, Collection<?> list,
Class<?> pojoClass) throws IOException {
if(StringUtils.isBlank(fileName)){
//当前日期
fileName = DateUtils.format(new Date());
}
ExportParams params = new ExportParams(fileName,fileName);
Workbook workbook = ExcelExportUtil.exportExcel(params, pojoClass, list);
Sheet sheet1 = workbook.getSheetAt(0);
sheet1.setDefaultColumnWidth(50*256);
sheet1.setDefaultRowHeight((short)(2*256));
response.setCharacterEncoding("UTF-8");
response.setHeader("content-Type", "application/vnd.ms-excel");
fileName = fileName + ".xls";
response.setHeader("Content-Disposition",
"attachment;filename=" +fileName);
ServletOutputStream out = response.getOutputStream();
workbook.write(out);
out.flush();
out.close();
}
}

9
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java → epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Pinyin4jUtil.java

@ -1,4 +1,4 @@
package com.epmet.util;
package com.epmet.commons.tools.utils;
import net.sourceforge.pinyin4j.PinyinHelper;
import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
@ -31,6 +31,7 @@ public class Pinyin4jUtil {
duoyinMap.put('均',new String[]{"jun"});
duoyinMap.put('会', new String[]{"hui"});
duoyinMap.put('属', new String[]{"shu"});
duoyinMap.put('调', new String[]{"diao"});
}
/**
@ -42,7 +43,6 @@ public class Pinyin4jUtil {
*/
public static String getFirstSpellPinYin(String src, boolean isFullSpell) {
String targetStr = Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(src, isFullSpell, 1));
System.out.println(targetStr);
String[] split = targetStr.split(",");
if (split.length > 1) {
targetStr = split[0];
@ -59,7 +59,6 @@ public class Pinyin4jUtil {
*/
public static String getSpellPinYin(String src, boolean isFullSpell,Integer preFont) {
String targetStr = Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(src, isFullSpell, preFont));
System.out.println(targetStr);
String[] split = targetStr.split(",");
if (split.length > 1) {
targetStr = split[0];
@ -139,8 +138,8 @@ public class Pinyin4jUtil {
} else if (((int) c >= 65 && (int) c <= 90)
|| ((int) c >= 97 && (int) c <= 122)) {//英文
temp[i] = new String[]{String.valueOf(srcChar[i])};
} else {
temp[i] = new String[]{""};
} else {//非汉字全盘返回即可
temp[i] = new String[]{String.valueOf(srcChar[i])};
}
}
String[] pingyinArray = exchange(temp);

10
epmet-gateway/pom.xml

@ -224,6 +224,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>
@ -355,6 +358,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>
@ -452,6 +458,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>
@ -552,6 +560,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>

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

11
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:

6
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>

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

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

67
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/CustomerDataManageFormDTO.java

@ -0,0 +1,67 @@
package com.epmet.dataaggre.dto.datastats.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.List;
/**
* @Author zxc
* @DateTime 2021/9/10 11:04 上午
* @DESC
*/
@Data
public class CustomerDataManageFormDTO implements Serializable {
private static final long serialVersionUID = 6462094914874831738L;
public interface CustomerDataManageForm{}
/**
* 客户ID
*/
@NotBlank(message = "客户ID不能为空",groups = CustomerDataManageForm.class)
private String customerId;
/**
* 组织ID
*/
@NotBlank(message = "组织ID不能为空",groups = CustomerDataManageForm.class)
private String agencyId;
/**
* 区间:Interval 截止:end
*/
@NotBlank(message = "type不能为空",groups = CustomerDataManageForm.class)
private String type;
/**
* 开始时间yyyymmdd
*/
private String startTime;
/**
* 结束时间yyyymmdd
*/
@NotBlank(message = "结束时间不能为空",groups = CustomerDataManageForm.class)
private String endTime;
private Integer pageNo = 1;
private Integer pageSize = 20;
/**
* 是否分页true分 false不分
*/
@NotNull(message = "是否分页不能为空",groups = CustomerDataManageForm.class)
private Boolean isPage;
//组织或网格Id集合
private List<String> idList;
//按起始时间还是结束时间查数据【start end】
private String sourceType;
//数据类型【组织agency 网格grid】
private String dataType;
}

5
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/PartyMemberVanguardFormDTO.java

@ -15,4 +15,9 @@ public class PartyMemberVanguardFormDTO implements Serializable {
private String agencyId;
private String orgId;
private String orgType;
private String dateId;
/**
* 月份是当月取前一天不是当月取那个月最后一天
*/
private String monthId;
}

57
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java

@ -0,0 +1,57 @@
package com.epmet.dataaggre.dto.datastats.result;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @Description 运营情况数据导出-接口返参
* @Auth sun
*/
@Data
public class CustomerDataManageResultDTO {
List<CustomerDataManage> list = new ArrayList<>();
private Integer total;
@Data
public static class CustomerDataManage {
//组织、网格Id
private String orgId;
//组织、网格名称
private String orgName;
//用户数
private Integer userCount = 0;
//居民数
private Integer residentCount = 0;
//党员数
private Integer partyMemberCount = 0;
//小组数
private Integer groupCount = 0;
//话题数
private Integer topicCount = 0;
//议题数
private Integer issueCount = 0;
//项目数
private Integer projectCount = 0;
//结案项目数
private Integer closedProjectCount = 0;
//巡查人数
private Integer patrolPeopleCount = 0;
//巡查次数
private Integer patrolCount = 0;
//巡查时长
private String patrolDuration;
//未转换前的巡查时长
private Integer patrolDurationInteger = 0;
//数据对应dateId
@JsonIgnore
private String dateId;
@JsonIgnore
private String staffId;
}
}

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

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

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

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

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

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

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

96
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;
/**
* 最后发布组织的类型departmentagencygrid
*/
private String orgType;
/**
* 删除标识 1删除0未删除
*/
private String delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

114
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 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;
private String updatedTime;
/**
* 是否填写问卷truefalse
*/
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.updatedTime = "";
this.fillStatus = false;
this.isFillQuestion = true;
this.orgName = "";
}
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

27
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/ScreenAgencyOrGridListDTO.java

@ -0,0 +1,27 @@
package com.epmet.dataaggre.dto.evaluationindex;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @author sun
* @Description 根据组织Id判断查询直属下级组织/网格列表组织存在子客户的查询包含子客户组织数据
*/
@Data
public class ScreenAgencyOrGridListDTO implements Serializable {
private static final long serialVersionUID = 6328123559936824470L;
//组织级别(社区级:community,乡(镇、街道)级:street,区县级: district,市级: city,省级:province)
private String level;
//直属下级组织或网格集合
private List<AgencyGrid> agencyGridList;
@Data
public static class AgencyGrid {
//组织id
private String orgId;
//组织名称
private String orgName;
}
}

2
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/OrgStaffListFormDTO.java

@ -45,6 +45,8 @@ public class OrgStaffListFormDTO implements Serializable {
private List<String> staffIds;
//token中用户Id
private String staffId;
//人员是否禁用【未禁用enable,已禁用disabled】
private String enableFlag = "enable";
public interface OrgStaff extends CustomerClientShowGroup {}
}

4
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
*/

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

6
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/BranchConAnalysisFormDTO.java

@ -39,4 +39,10 @@ public class BranchConAnalysisFormDTO implements Serializable {
*/
@NotBlank(message = "orgType不能为空", groups = AddUserInternalGroup.class)
private String orgType;
private String dateId;
/**
* 月份是当月取前一天不是当月取那个月最后一天
*/
private String monthId;
}

6
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/GroupActRankFormDTO.java

@ -45,4 +45,10 @@ public class GroupActRankFormDTO implements Serializable {
* 排序编码可以不传前端自己处理
*/
private String rankCode;
private String dateId;
/**
* 月份是当月取前一天不是当月取那个月最后一天
*/
private String monthId;
}

28
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>

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

@ -1,18 +1,21 @@
package com.epmet.dataaggre.controller;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dataaggre.dto.datastats.form.*;
import com.epmet.dataaggre.dto.datastats.result.*;
import com.epmet.dataaggre.excel.CustomerDataManageExcel;
import com.epmet.dataaggre.service.datastats.DataStatsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* @Author sun
@ -215,4 +218,28 @@ public class DataStatsController {
return new Result<GovrnRatioResultDTO>().ok(dataStatsService.governRatio(formDTO));
}
/**
* @Description 客户数据管理导出
* @Param formDTO
* @Param response
* @author zxc
* @date 2021/9/10 3:52 下午
*/
@PostMapping("operateexport")
public void CustomerDataManage(@RequestBody CustomerDataManageFormDTO formDTO, HttpServletResponse response) throws Exception {
ValidatorUtils.validateEntity(formDTO, CustomerDataManageFormDTO.CustomerDataManageForm.class);
dataStatsService.CustomerDataManage(formDTO,response);
}
/**
* @Param formDTO
* @Description 运营情况数据查询
* @author sun
*/
@PostMapping("operatedata")
public Result<CustomerDataManageResultDTO> operatedata(@RequestBody CustomerDataManageFormDTO formDTO) throws ParseException {
ValidatorUtils.validateEntity(formDTO, CustomerDataManageFormDTO.CustomerDataManageForm.class);
return new Result<CustomerDataManageResultDTO>().ok(dataStatsService.operateExport(formDTO));
}
}

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

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

35
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java

@ -18,6 +18,7 @@
package com.epmet.dataaggre.dao.datastats;
import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO;
import com.epmet.dataaggre.dto.datastats.form.CustomerDataManageFormDTO;
import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
import com.epmet.dataaggre.dto.datastats.result.*;
@ -186,7 +187,7 @@ public interface DataStatsDao {
* @author zhaoqifeng
* @date 2021/5/18 14:40
*/
PartyMemberVanguardDetailResultDTO selectAgencyVanguardDetail(@Param("agencyId") String agencyId);
PartyMemberVanguardDetailResultDTO selectAgencyVanguardDetail(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
/**
* 查询网格党员先锋详情
@ -196,7 +197,7 @@ public interface DataStatsDao {
* @author zhaoqifeng
* @date 2021/5/18 14:40
*/
PartyMemberVanguardDetailResultDTO selectGridVanguardDetail(@Param("grid") String grid);
PartyMemberVanguardDetailResultDTO selectGridVanguardDetail(@Param("grid") String grid, @Param("dateId") String dateId);
/**
* 查询组织党员先锋排行
@ -206,7 +207,7 @@ public interface DataStatsDao {
* @author zhaoqifeng
* @date 2021/5/18 15:02
*/
List<PartyMemberVanguardDetailResultDTO> selectAgencyVanguardRank(@Param("agencyId") String agencyId);
List<PartyMemberVanguardDetailResultDTO> selectAgencyVanguardRank(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
/**
* 查询网格党员先锋排行
@ -216,7 +217,7 @@ public interface DataStatsDao {
* @author zhaoqifeng
* @date 2021/5/18 15:03
*/
List<PartyMemberVanguardDetailResultDTO> selectGridVanguardRank(@Param("agencyId") String agencyId);
List<PartyMemberVanguardDetailResultDTO> selectGridVanguardRank(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
List<FactGroupActDailyDTO> branchConAnalysis(@Param("customerId") String customerId,
@Param("orgId") String orgId,
@ -308,4 +309,30 @@ public interface DataStatsDao {
* @author sun
*/
List<GridMemberPatrolListResultDTO> selectGirdMemberPatrol(GridMemberPatrolListFormDTO formDTO);
/**
* @Description 直属组织或网格下注册用户数据
* @author sun
*/
List<CustomerDataManageResultDTO.CustomerDataManage> regUserList(CustomerDataManageFormDTO formDTO);
/**
* @Description 直属组织或网格下群组数据
* @author sun
*/
List<CustomerDataManageResultDTO.CustomerDataManage> groupList(CustomerDataManageFormDTO formDTO);
/**
* @Description 直属组织或网格下话题数据
* @author sun
*/
List<CustomerDataManageResultDTO.CustomerDataManage> topicList(CustomerDataManageFormDTO formDTO);
/**
* @Description 直属组织或网格下议题数据
* @author sun
*/
List<CustomerDataManageResultDTO.CustomerDataManage> issueList(CustomerDataManageFormDTO formDTO);
/**
* @Description 直属组织或网格下项目数据
* @author sun
*/
List<CustomerDataManageResultDTO.CustomerDataManage> projectList(CustomerDataManageFormDTO formDTO);
}

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

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

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

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

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

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

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

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

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

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save