From 44c06c9fd7675d4e27d5dec61f4ee10eae1492e6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 16 Sep 2021 16:15:11 +0800 Subject: [PATCH 01/37] =?UTF-8?q?=E6=A6=82=E8=A6=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dataaggre/constant/DataSourceConstant.java | 1 + .../epmettduck/impl/AcUserAuthorizeServiceImpl.java | 8 ++++++-- .../service/epmettduck/impl/AcUserServiceImpl.java | 8 ++++++-- .../impl/PrProjectTemplateCategoryServiceImpl.java | 5 +++++ .../epmettduck/impl/PrProjectTemplateItemServiceImpl.java | 8 ++++++-- .../epmettduck/impl/PrProjectTemplateServiceImpl.java | 8 ++++++-- .../epmettduck/impl/PrProjectThemeServiceImpl.java | 8 ++++++-- .../epmettduck/impl/PrPublishRangeServiceImpl.java | 8 ++++++-- .../service/epmettduck/impl/PrResultExtServiceImpl.java | 8 ++++++-- .../epmettduck/impl/PrUserProjectItemServiceImpl.java | 8 ++++++-- .../epmettduck/impl/PrUserProjectLogicServiceImpl.java | 8 ++++++-- .../epmettduck/impl/PrUserProjectResultServiceImpl.java | 8 ++++++-- .../service/epmettduck/impl/PrUserProjectServiceImpl.java | 5 +++++ .../epmettduck/impl/PrUserProjectSettingServiceImpl.java | 8 ++++++-- .../epmettduck/impl/PrUserProjectThemeServiceImpl.java | 8 ++++++-- .../service/epmettduck/impl/PrVistRecordServiceImpl.java | 8 ++++++-- .../service/epmettduck/impl/WxMpUserServiceImpl.java | 8 ++++++-- .../main/resources/mapper/epmettduck/PrUserProjectDao.xml | 4 ++-- 18 files changed, 97 insertions(+), 30 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java index dd9ab18035..c49ee8b39b 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java @@ -33,4 +33,5 @@ public interface DataSourceConstant { String OPERCUSTOMIZE="opercustomize"; String EPMET_MESSAGE="epmetmessage"; + String EPMETTDUCK="epmettduck"; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserAuthorizeServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserAuthorizeServiceImpl.java index 4cddcac638..2887bd8ecf 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserAuthorizeServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserAuthorizeServiceImpl.java @@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.epmettduck.AcUserAuthorizeDao; import com.epmet.dataaggre.dto.epmettduck.AcUserAuthorizeDTO; import com.epmet.dataaggre.entity.epmettduck.AcUserAuthorizeEntity; import com.epmet.dataaggre.service.epmettduck.AcUserAuthorizeService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,6 +44,8 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2021-09-15 */ +@Slf4j +@DataSource(DataSourceConstant.EPMETTDUCK) @Service public class AcUserAuthorizeServiceImpl extends BaseServiceImpl implements AcUserAuthorizeService { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserServiceImpl.java index b85ff41893..c53ce7da8e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/AcUserServiceImpl.java @@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.epmettduck.AcUserDao; import com.epmet.dataaggre.dto.epmettduck.AcUserDTO; import com.epmet.dataaggre.entity.epmettduck.AcUserEntity; import com.epmet.dataaggre.service.epmettduck.AcUserService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,6 +44,8 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2021-09-15 */ +@Slf4j +@DataSource(DataSourceConstant.EPMETTDUCK) @Service public class AcUserServiceImpl extends BaseServiceImpl implements AcUserService { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateCategoryServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateCategoryServiceImpl.java index cd00fb7a9a..bf82320282 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateCategoryServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateCategoryServiceImpl.java @@ -17,7 +17,10 @@ package com.epmet.dataaggre.service.epmettduck.impl; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.service.epmettduck.PrProjectTemplateCategoryService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; /** @@ -26,6 +29,8 @@ import org.springframework.stereotype.Service; * @author generator generator@elink-cn.com * @since v1.0.0 2021-09-15 */ +@Slf4j +@DataSource(DataSourceConstant.EPMETTDUCK) @Service public class PrProjectTemplateCategoryServiceImpl implements PrProjectTemplateCategoryService { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateItemServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateItemServiceImpl.java index cdee7cae3b..a903234d27 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateItemServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateItemServiceImpl.java @@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.epmettduck.PrProjectTemplateItemDao; import com.epmet.dataaggre.dto.epmettduck.PrProjectTemplateItemDTO; import com.epmet.dataaggre.entity.epmettduck.PrProjectTemplateItemEntity; import com.epmet.dataaggre.service.epmettduck.PrProjectTemplateItemService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,6 +44,8 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2021-09-15 */ +@Slf4j +@DataSource(DataSourceConstant.EPMETTDUCK) @Service public class PrProjectTemplateItemServiceImpl extends BaseServiceImpl implements PrProjectTemplateItemService { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateServiceImpl.java index 51c0932019..29eabe1520 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectTemplateServiceImpl.java @@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.epmettduck.PrProjectTemplateDao; import com.epmet.dataaggre.dto.epmettduck.PrProjectTemplateDTO; import com.epmet.dataaggre.entity.epmettduck.PrProjectTemplateEntity; import com.epmet.dataaggre.service.epmettduck.PrProjectTemplateService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,6 +44,8 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2021-09-15 */ +@Slf4j +@DataSource(DataSourceConstant.EPMETTDUCK) @Service public class PrProjectTemplateServiceImpl extends BaseServiceImpl implements PrProjectTemplateService { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectThemeServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectThemeServiceImpl.java index db86a529d7..07345640c1 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectThemeServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrProjectThemeServiceImpl.java @@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.epmettduck.PrProjectThemeDao; import com.epmet.dataaggre.dto.epmettduck.PrProjectThemeDTO; import com.epmet.dataaggre.entity.epmettduck.PrProjectThemeEntity; import com.epmet.dataaggre.service.epmettduck.PrProjectThemeService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,6 +44,8 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2021-09-15 */ +@Slf4j +@DataSource(DataSourceConstant.EPMETTDUCK) @Service public class PrProjectThemeServiceImpl extends BaseServiceImpl implements PrProjectThemeService { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java index f89d60925a..c6bb01a72e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java @@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.epmettduck.PrPublishRangeDao; import com.epmet.dataaggre.dto.epmettduck.PrPublishRangeDTO; import com.epmet.dataaggre.entity.epmettduck.PrPublishRangeEntity; import com.epmet.dataaggre.service.epmettduck.PrPublishRangeService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,6 +44,8 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2021-09-15 */ +@Slf4j +@DataSource(DataSourceConstant.EPMETTDUCK) @Service public class PrPublishRangeServiceImpl extends BaseServiceImpl implements PrPublishRangeService { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrResultExtServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrResultExtServiceImpl.java index fa3011975b..00bff5e49e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrResultExtServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrResultExtServiceImpl.java @@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.epmettduck.PrResultExtDao; import com.epmet.dataaggre.dto.epmettduck.PrResultExtDTO; import com.epmet.dataaggre.entity.epmettduck.PrResultExtEntity; import com.epmet.dataaggre.service.epmettduck.PrResultExtService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,6 +44,8 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2021-09-15 */ +@Slf4j +@DataSource(DataSourceConstant.EPMETTDUCK) @Service public class PrResultExtServiceImpl extends BaseServiceImpl implements PrResultExtService { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java index 7b61e6a6e7..c6b97866b1 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java @@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.epmettduck.PrUserProjectItemDao; import com.epmet.dataaggre.dto.epmettduck.PrUserProjectItemDTO; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity; import com.epmet.dataaggre.service.epmettduck.PrUserProjectItemService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,6 +44,8 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2021-09-15 */ +@Slf4j +@DataSource(DataSourceConstant.EPMETTDUCK) @Service public class PrUserProjectItemServiceImpl extends BaseServiceImpl implements PrUserProjectItemService { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectLogicServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectLogicServiceImpl.java index ed3a9ede57..052d9252a6 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectLogicServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectLogicServiceImpl.java @@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.epmettduck.PrUserProjectLogicDao; import com.epmet.dataaggre.dto.epmettduck.PrUserProjectLogicDTO; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectLogicEntity; import com.epmet.dataaggre.service.epmettduck.PrUserProjectLogicService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,6 +44,8 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2021-09-15 */ +@Slf4j +@DataSource(DataSourceConstant.EPMETTDUCK) @Service public class PrUserProjectLogicServiceImpl extends BaseServiceImpl implements PrUserProjectLogicService { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectResultServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectResultServiceImpl.java index 5d45b7e36d..884b2f2384 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectResultServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectResultServiceImpl.java @@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.epmettduck.PrUserProjectResultDao; import com.epmet.dataaggre.dto.epmettduck.PrUserProjectResultDTO; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity; import com.epmet.dataaggre.service.epmettduck.PrUserProjectResultService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,6 +44,8 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2021-09-15 */ +@Slf4j +@DataSource(DataSourceConstant.EPMETTDUCK) @Service public class PrUserProjectResultServiceImpl extends BaseServiceImpl implements PrUserProjectResultService { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java index 27c2f60212..850cd1eff0 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java @@ -19,15 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao; import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO; import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity; import com.epmet.dataaggre.service.epmettduck.PrUserProjectService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,6 +45,8 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2021-09-15 */ +@Slf4j +@DataSource(DataSourceConstant.EPMETTDUCK) @Service public class PrUserProjectServiceImpl extends BaseServiceImpl implements PrUserProjectService { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectSettingServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectSettingServiceImpl.java index 67bf9b50a5..cbfb3989f0 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectSettingServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectSettingServiceImpl.java @@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.epmettduck.PrUserProjectSettingDao; import com.epmet.dataaggre.dto.epmettduck.PrUserProjectSettingDTO; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectSettingEntity; import com.epmet.dataaggre.service.epmettduck.PrUserProjectSettingService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,6 +44,8 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2021-09-15 */ +@Slf4j +@DataSource(DataSourceConstant.EPMETTDUCK) @Service public class PrUserProjectSettingServiceImpl extends BaseServiceImpl implements PrUserProjectSettingService { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectThemeServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectThemeServiceImpl.java index d153971e1f..ef204311f3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectThemeServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectThemeServiceImpl.java @@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.epmettduck.PrUserProjectThemeDao; import com.epmet.dataaggre.dto.epmettduck.PrUserProjectThemeDTO; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectThemeEntity; import com.epmet.dataaggre.service.epmettduck.PrUserProjectThemeService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,6 +44,8 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2021-09-15 */ +@Slf4j +@DataSource(DataSourceConstant.EPMETTDUCK) @Service public class PrUserProjectThemeServiceImpl extends BaseServiceImpl implements PrUserProjectThemeService { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java index 5427486bb9..408701f7ce 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java @@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.epmettduck.PrVistRecordDao; import com.epmet.dataaggre.dto.epmettduck.PrVistRecordDTO; import com.epmet.dataaggre.entity.epmettduck.PrVistRecordEntity; import com.epmet.dataaggre.service.epmettduck.PrVistRecordService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,6 +44,8 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2021-09-15 */ +@Slf4j +@DataSource(DataSourceConstant.EPMETTDUCK) @Service public class PrVistRecordServiceImpl extends BaseServiceImpl implements PrVistRecordService { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/WxMpUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/WxMpUserServiceImpl.java index bd5d459e90..ac4e961890 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/WxMpUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/WxMpUserServiceImpl.java @@ -19,16 +19,18 @@ package com.epmet.dataaggre.service.epmettduck.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.epmettduck.WxMpUserDao; import com.epmet.dataaggre.dto.epmettduck.WxMpUserDTO; import com.epmet.dataaggre.entity.epmettduck.WxMpUserEntity; import com.epmet.dataaggre.service.epmettduck.WxMpUserService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,6 +44,8 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2021-09-15 */ +@Slf4j +@DataSource(DataSourceConstant.EPMETTDUCK) @Service public class WxMpUserServiceImpl extends BaseServiceImpl implements WxMpUserService { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml index f0086b42af..1e12a386e7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml @@ -6,13 +6,13 @@ \ No newline at end of file From 2d604918a627e80f12ce2fb1d4151d26e41d96f1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 16 Sep 2021 16:39:39 +0800 Subject: [PATCH 02/37] =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-client/pom.xml | 6 ++ .../constant/DataSourceConstant.java | 3 + .../dto/epmettduck/AcUserAuthorizeDTO.java | 29 ++++++- .../dataaggre/dto/epmettduck/AcUserDTO.java | 27 ++++-- .../PrProjectTemplateCategoryDTO.java | 27 +++++- .../dto/epmettduck/PrProjectTemplateDTO.java | 26 +++++- .../epmettduck/PrProjectTemplateItemDTO.java | 26 +++++- .../dto/epmettduck/PrProjectThemeDTO.java | 25 +++++- .../dto/epmettduck/PrPublishRangeDTO.java | 27 ++++-- .../dto/epmettduck/PrResultExtDTO.java | 27 ++++-- .../dto/epmettduck/PrUserProjectDTO.java | 25 ++++-- .../dto/epmettduck/PrUserProjectItemDTO.java | 26 +++++- .../dto/epmettduck/PrUserProjectLogicDTO.java | 24 +++++- .../epmettduck/PrUserProjectResultDTO.java | 24 +++++- .../epmettduck/PrUserProjectSettingDTO.java | 26 +++++- .../dto/epmettduck/PrUserProjectThemeDTO.java | 26 +++++- .../dto/epmettduck/PrVistRecordDTO.java | 27 ++++-- .../dto/epmettduck/ProjectItemTypeEnum.java | 72 ++++++++++++++++ .../dataaggre/dto/epmettduck/WxMpUserDTO.java | 26 +++++- .../epmettduck/form/TDuckDetailFormDTO.java | 31 +++++++ .../struct/CascaderExpandStruct.java | 45 ++++++++++ .../struct/CheckboxExpandStruct.java | 44 ++++++++++ .../epmettduck/struct/ColorExpandStruct.java | 14 ++++ .../epmettduck/struct/DateExpandStruct.java | 20 +++++ .../struct/DateRangeExpandStruct.java | 14 ++++ .../struct/DescTextExpandStruct.java | 24 ++++++ .../struct/DividerExpandStruct.java | 15 ++++ .../epmettduck/struct/EmptyExpandStruct.java | 10 +++ .../struct/ImageCarouselExpandStruct.java | 25 ++++++ .../epmettduck/struct/ImageExpandStruct.java | 12 +++ .../struct/ImageSelectExpandStruct.java | 31 +++++++ .../epmettduck/struct/InputExpandStruct.java | 36 ++++++++ .../struct/ItemDefaultValueStruct.java | 21 +++++ .../epmettduck/struct/NumberExpandStruct.java | 38 +++++++++ .../struct/PaginationExpandStruct.java | 13 +++ .../epmettduck/struct/RadioExpandStruct.java | 31 +++++++ .../epmettduck/struct/RateExpandStruct.java | 35 ++++++++ .../epmettduck/struct/SelectExpandStruct.java | 47 +++++++++++ .../struct/SignPadExpandStruct.java | 19 +++++ .../epmettduck/struct/SliderExpandStruct.java | 35 ++++++++ .../epmettduck/struct/SwitchExpandStruct.java | 14 ++++ .../struct/TextareaExpandStruct.java | 27 ++++++ .../epmettduck/struct/TimeExpandStruct.java | 14 ++++ .../struct/TimeRangeExpandStruct.java | 14 ++++ .../epmettduck/struct/UploadExpandStruct.java | 53 ++++++++++++ .../epmettduck/struct/UploadResultStruct.java | 22 +++++ .../controller/EpmetTDuckController.java | 28 +++++++ .../epmettduck/AcUserAuthorizeEntity.java | 10 --- .../entity/epmettduck/AcUserEntity.java | 14 ---- .../PrProjectTemplateCategoryEntity.java | 13 +-- .../epmettduck/PrProjectTemplateEntity.java | 9 -- .../PrProjectTemplateItemEntity.java | 10 --- .../epmettduck/PrProjectThemeEntity.java | 10 --- .../epmettduck/PrPublishRangeEntity.java | 15 ---- .../entity/epmettduck/PrResultExtEntity.java | 15 ---- .../epmettduck/PrUserProjectEntity.java | 15 ---- .../epmettduck/PrUserProjectItemEntity.java | 42 +++++----- .../epmettduck/PrUserProjectLogicEntity.java | 10 --- .../epmettduck/PrUserProjectResultEntity.java | 10 --- .../PrUserProjectSettingEntity.java | 10 --- .../epmettduck/PrUserProjectThemeEntity.java | 10 --- .../entity/epmettduck/PrVistRecordEntity.java | 15 ---- .../entity/epmettduck/WxMpUserEntity.java | 10 --- .../epmettduck/PrUserProjectItemService.java | 83 ++----------------- .../impl/PrUserProjectItemServiceImpl.java | 79 ++++++------------ 65 files changed, 1226 insertions(+), 385 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/ProjectItemTypeEnum.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckDetailFormDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CheckboxExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ColorExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DateExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DateRangeExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DescTextExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/DividerExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/EmptyExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageCarouselExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ImageSelectExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/InputExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/ItemDefaultValueStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/NumberExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/PaginationExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RadioExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RateExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SignPadExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SliderExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SwitchExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TextareaExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TimeExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/TimeRangeExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/UploadExpandStruct.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/UploadResultStruct.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/pom.xml b/epmet-module/data-aggregator/data-aggregator-client/pom.xml index 4e8beca881..7f6f4cd2ff 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-client/pom.xml @@ -17,6 +17,12 @@ 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