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