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