概要

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

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<AcUserAuthorizeDao, AcUserAuthorizeEntity> implements AcUserAuthorizeService {
 

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<AcUserDao, AcUserEntity> implements AcUserService {
 

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 {
 

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<PrProjectTemplateItemDao, PrProjectTemplateItemEntity> implements PrProjectTemplateItemService {
 

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<PrProjectTemplateDao, PrProjectTemplateEntity> implements PrProjectTemplateService {
 

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<PrProjectThemeDao, PrProjectThemeEntity> implements PrProjectThemeService {
 

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<PrPublishRangeDao, PrPublishRangeEntity> implements PrPublishRangeService {
 

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<PrResultExtDao, PrResultExtEntity> implements PrResultExtService {
 

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<PrUserProjectItemDao, PrUserProjectItemEntity> implements PrUserProjectItemService {
 

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<PrUserProjectLogicDao, PrUserProjectLogicEntity> implements PrUserProjectLogicService {
 

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<PrUserProjectResultDao, PrUserProjectResultEntity> implements PrUserProjectResultService {
 

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<PrUserProjectDao, PrUserProjectEntity> implements PrUserProjectService {
 

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<PrUserProjectSettingDao, PrUserProjectSettingEntity> implements PrUserProjectSettingService {
 

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<PrUserProjectThemeDao, PrUserProjectThemeEntity> implements PrUserProjectThemeService {
 

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<PrVistRecordDao, PrVistRecordEntity> implements PrVistRecordService {
 

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<WxMpUserDao, WxMpUserEntity> implements WxMpUserService {
 

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml

@@ -6,13 +6,13 @@
     <select id="queryProjectProfile" parameterType="java.lang.String"  resultType="com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO">
         SELECT
             m.`key` AS projectKey,
-            m.create_time AS createTime,
+            m.created_time AS createTime,
             m.`status`,
             ( SELECT count( re.id ) FROM pr_user_project_result re WHERE re.project_key = #{projectKey} ) AS collectionTotal
         FROM
             pr_user_project m
         WHERE
-            m.is_deleted = '0'
+            m.del_flag = '0'
           AND m.`key` = #{projectKey}
     </select>
 </mapper>