diff --git a/epmet-module/data-aggregator/data-aggregator-client/pom.xml b/epmet-module/data-aggregator/data-aggregator-client/pom.xml index 4e8beca881..7f6f4cd2ff 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-client/pom.xml @@ -17,6 +17,12 @@ epmet-commons-tools 2.0.0 + + com.baomidou + mybatis-plus-annotation + 3.2.0 + compile + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java index c49ee8b39b..8ae93cc5d4 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java @@ -32,6 +32,9 @@ public interface DataSourceConstant { String EVALUATION_INDEX = "evaluationIndex"; String OPERCUSTOMIZE="opercustomize"; + String EPMET_MESSAGE="epmetmessage"; + + String EPMET_T_DUCK = "epmettduck"; String EPMETTDUCK="epmettduck"; } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserAuthorizeDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserAuthorizeDTO.java index e987a07ea4..3db0c9939d 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserAuthorizeDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserAuthorizeDTO.java @@ -51,14 +51,35 @@ public class AcUserAuthorizeDTO implements Serializable { */ private String userInfo; + /** - * + * 删除标识 1删除；0未删除 */ - private Date createTime; + private String delFlag; /** - * + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 */ - private Date updateTime; + private Date updatedTime; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserDTO.java index 89b8157c9c..a1bb83f55b 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserDTO.java @@ -89,18 +89,33 @@ public class AcUserDTO implements Serializable { private String lastLoginIp; /** - * 状态 + * 删除标识 1删除；0未删除 */ - private Integer deleted; + private String delFlag; /** - * + * 乐观锁 */ - private Date createTime; + private Integer revision; /** - * + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 */ - private Date updateTime; + private Date updatedTime; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateCategoryDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateCategoryDTO.java index 476c97019b..8c0956058f 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateCategoryDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateCategoryDTO.java @@ -36,7 +36,7 @@ public class PrProjectTemplateCategoryDTO implements Serializable { /** * */ - private Long id; + private String id; /** * 客户Id @@ -54,13 +54,32 @@ public class PrProjectTemplateCategoryDTO implements Serializable { private Integer sort; /** - * 更新时间 + * 删除标识 1删除；0未删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 */ - private Date updateTime; + private String createdBy; /** * 创建时间 */ - private Date createTime; + private Date createdTime; + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateDTO.java index c5cab8a752..1b995189c6 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateDTO.java @@ -79,13 +79,33 @@ public class PrProjectTemplateDTO implements Serializable { private Integer status; /** - * 更新时间 + * 删除标识 1删除；0未删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 */ - private Date updateTime; + private String createdBy; /** * 创建时间 */ - private Date createTime; + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateItemDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateItemDTO.java index c407e0c52d..2174d4f39d 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateItemDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateItemDTO.java @@ -104,14 +104,34 @@ public class PrProjectTemplateItemDTO implements Serializable { private String regList; /** - * 更新时间 + * 删除标识 1删除；0未删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 */ - private Date updateTime; + private String createdBy; /** * 创建时间 */ - private Date createTime; + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; /** * 展示类型组件 diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectThemeDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectThemeDTO.java index 0c3168ff7e..8bf8538c2a 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectThemeDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectThemeDTO.java @@ -70,13 +70,32 @@ public class PrProjectThemeDTO implements Serializable { private String btnsColor; /** - * 更新时间 + * 删除标识 1删除；0未删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 */ - private Date updateTime; + private String createdBy; /** * 创建时间 */ - private Date createTime; + private Date createdTime; + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrPublishRangeDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrPublishRangeDTO.java index 5e5f8ef311..944965d1ec 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrPublishRangeDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrPublishRangeDTO.java @@ -64,18 +64,33 @@ public class PrPublishRangeDTO implements Serializable { private String orgType; /** - * 状态 + * 删除标识 1删除；0未删除 */ - private Integer deleted; + private String delFlag; /** - * + * 乐观锁 */ - private Date createTime; + private Integer revision; /** - * + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 */ - private Date updateTime; + private Date updatedTime; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrResultExtDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrResultExtDTO.java index 85bc9f6ac9..4f0ade42a5 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrResultExtDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrResultExtDTO.java @@ -69,18 +69,33 @@ public class PrResultExtDTO implements Serializable { private String fromOrgType; /** - * 状态 + * 删除标识 1删除；0未删除 */ - private Integer deleted; + private String delFlag; /** - * + * 乐观锁 */ - private Date createTime; + private Integer revision; /** - * + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 */ - private Date updateTime; + private Date updatedTime; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectDTO.java index 2217879d96..7f9bba34cb 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectDTO.java @@ -89,18 +89,33 @@ public class PrUserProjectDTO implements Serializable { private String client; /** - * 是否删除 + * 删除标识 1删除；0未删除 */ - private Integer isDeleted; + private String delFlag; /** - * 更新时间 + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 */ - private Date updateTime; + private String createdBy; /** * 创建时间 */ - private Date createTime; + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectItemDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectItemDTO.java index 3bd5f2eb1d..614236b09c 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectItemDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectItemDTO.java @@ -109,13 +109,33 @@ public class PrUserProjectItemDTO implements Serializable { private String regList; /** - * 更新时间 + * 删除标识 1删除；0未删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 */ - private Date updateTime; + private String createdBy; /** * 创建时间 */ - private Date createTime; + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectLogicDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectLogicDTO.java index d59b6617ea..901a8b41ba 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectLogicDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectLogicDTO.java @@ -63,14 +63,34 @@ public class PrUserProjectLogicDTO implements Serializable { */ private String conditionList; + /** + * 删除标识 1删除；0未删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + /** * 创建时间 */ - private Date createTime; + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; /** * 更新时间 */ - private Date updateTime; + private Date updatedTime; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectResultDTO.java index fe59df25bb..dd81d962fc 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectResultDTO.java @@ -108,14 +108,34 @@ public class PrUserProjectResultDTO implements Serializable { */ private String wxUserInfo; + /** + * 删除标识 1删除；0未删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + /** * 创建时间 */ - private Date createTime; + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; /** * 更新时间 */ - private Date updateTime; + private Date updatedTime; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectSettingDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectSettingDTO.java index 461d064f9a..bb44c7e351 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectSettingDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectSettingDTO.java @@ -154,13 +154,33 @@ public class PrUserProjectSettingDTO implements Serializable { private String shareDesc; /** - * 更新时间 + * 删除标识 1删除；0未删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 */ - private Date updateTime; + private String createdBy; /** * 创建时间 */ - private Date createTime; + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectThemeDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectThemeDTO.java index 52575ded34..e42dd917fc 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectThemeDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectThemeDTO.java @@ -94,13 +94,33 @@ public class PrUserProjectThemeDTO implements Serializable { private Integer showNumber; /** - * 更新时间 + * 删除标识 1删除；0未删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 */ - private Date updateTime; + private String createdBy; /** * 创建时间 */ - private Date createTime; + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrVistRecordDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrVistRecordDTO.java index f35b8731a5..7e747c2680 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrVistRecordDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrVistRecordDTO.java @@ -59,18 +59,33 @@ public class PrVistRecordDTO implements Serializable { private String projectKey; /** - * 状态 + * 删除标识 1删除；0未删除 */ - private Integer deleted; + private String delFlag; /** - * + * 乐观锁 */ - private Date createTime; + private Integer revision; /** - * + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 */ - private Date updateTime; + private Date updatedTime; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/ProjectItemTypeEnum.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/ProjectItemTypeEnum.java new file mode 100644 index 0000000000..13eb7a3eca --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/ProjectItemTypeEnum.java @@ -0,0 +1,72 @@ +package com.epmet.dataaggre.dto.epmettduck; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import com.epmet.dataaggre.dto.epmettduck.struct.*; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @Author zxc + * @DateTime 2021/9/16 2:28 下午 + * @DESC + */ +@AllArgsConstructor +@Getter +public enum ProjectItemTypeEnum { + + INPUT("INPUT", "单行文本", InputExpandStruct.class), + TEXTAREA("TEXTAREA", "多行文本", TextareaExpandStruct.class), + PASSWORD_INPUT("PASSWORD_INPUT", "密码输入", null), + NUMBER_INPUT("NUMBER_INPUT", "数字输入", NumberExpandStruct.class), + SELECT("SELECT", "下拉框", SelectExpandStruct.class), + CASCADER("CASCADER", "级联选择", CascaderExpandStruct.class), + RADIO("RADIO", "单选框", RadioExpandStruct.class), + CHECKBOX("CHECKBOX", "多选框", CheckboxExpandStruct.class), + SWITCH("SWITCH", "开关", SwitchExpandStruct.class), + SLIDER("SLIDER", "滑块", SliderExpandStruct.class), + TIME("TIME", "时间选择", TimeExpandStruct.class), + TIME_RANGE("TIME_RANGE", "时间范围", TimeRangeExpandStruct.class), + DATE("DATE", "日期选择", DateExpandStruct.class), + DATE_RANGE("DATE_RANGE", "日期范围", DateRangeExpandStruct.class), + RATE("RATE", "评分", RateExpandStruct.class), + COLOR("COLOR", "颜色", ColorExpandStruct.class), + UPLOAD("UPLOAD", "文件上传组件", UploadExpandStruct.class), + IMAGE("IMAGE", "图片展示", ImageExpandStruct.class), + IMAGE_SELECT("IMAGE_SELECT", "图片选择", ImageSelectExpandStruct.class), + IMAGE_CAROUSEL("IMAGE_CAROUSEL", "图片轮播", ImageCarouselExpandStruct.class), + DESC_TEXT("DESC_TEXT", "文字描述", DescTextExpandStruct.class), + SIGN_PAD("SIGN_PAD", "手写签名", SignPadExpandStruct.class), + PAGINATION("PAGINATION", "分页", PaginationExpandStruct.class), + DIVIDER("DIVIDER", "分割线", DividerExpandStruct.class), + PROVINCE_CITY("PROVINCE_CITY", "省市联动", EmptyExpandStruct.class), + PHONE_VERIFICATION("PHONE_VERIFICATION", "手机号验证", EmptyExpandStruct.class), + INPUT_MAP("INPUT_MAP", "地理位置", EmptyExpandStruct.class); + + @EnumValue + @JsonValue + private String value; + + private String desc; + /** + * 扩展属性类 + */ + private Class expandClass; + + /** + * 枚举入参注解 + * + * @param value + * @return + */ + @JsonCreator + public static ProjectItemTypeEnum getByValue(String value) { + for (ProjectItemTypeEnum typeEnum : values()) { + if (typeEnum.getValue().equals(value)) { + return typeEnum; + } + } + return null; + } +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/WxMpUserDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/WxMpUserDTO.java index bda847abdd..e50b5fffab 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/WxMpUserDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/WxMpUserDTO.java @@ -94,13 +94,33 @@ public class WxMpUserDTO implements Serializable { private String userId; /** - * 更新时间 + * 删除标识 1删除；0未删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 */ - private Date updateTime; + private String createdBy; /** * 创建时间 */ - private Date createTime; + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckDetailFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckDetailFormDTO.java new file mode 100644 index 0000000000..8796d3291b --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckDetailFormDTO.java @@ -0,0 +1,31 @@ +package com.epmet.dataaggre.dto.epmettduck.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/9/16 2:00 下午 + * @DESC + */ +@Data +public class TDuckDetailFormDTO implements Serializable { + + private static final long serialVersionUID = 3793280475377993346L; + + public interface TDuckDetailForm{} + + /** + * 项目key + */ + @NotBlank(message = "项目key不能为空",groups = TDuckDetailForm.class) + private String key; + /** + * 是否显示类型 + */ + @NotNull(message = "是否显示类型不能为空",groups = TDuckDetailForm.class) + private Boolean displayType; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java new file mode 100644 index 0000000000..ebc62596f8 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java @@ -0,0 +1,45 @@ +package com.epmet.dataaggre.dto.epmettduck.struct; + +import lombok.Data; + +import java.util.List; + +/** + * @author : smalljop + * @description : 级联选择 + * @create : 2020-11-19 15:13 + **/ +@Data +public class CascaderExpandStruct { + /** + * 选项 + */ + private List