注解放到service文件中

projects/src/main/java/com/rtrh/projects/web/util/TargetDataSource.java → projects-service/src/main/java/com/rtrh/projects/util/TargetDataSource.java

@@ -1,4 +1,4 @@
-package com.rtrh.projects.web.util;
+package com.rtrh.projects.util;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

projects/src/main/java/com/rtrh/projects/web/controller/subject/api/SubInfoApiController.java

@@ -1,38 +1,23 @@
 package com.rtrh.projects.web.controller.subject.api;
 
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.net.URLEncoder;
 import java.util.*;
 import java.util.stream.Collectors;
 
 
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.ExcelImportUtil;
-import cn.afterturn.easypoi.excel.entity.ExportParams;
-import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
-import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
-import cn.afterturn.easypoi.excel.export.ExcelExportService;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.net.URLEncodeUtil;
-import com.rtrh.common.util.DateUtil;
 import com.rtrh.common.util.Identities;
 import com.rtrh.projects.modules.projects.dao.*;
-import com.rtrh.projects.modules.projects.enums.RptContKindEnum;
 import com.rtrh.projects.modules.projects.enums.StatusEnum;
-import com.rtrh.projects.modules.projects.enums.SubIsHideStatusEnum;
 import com.rtrh.projects.modules.projects.po.*;
 import com.rtrh.projects.modules.projects.service.*;
 import com.rtrh.projects.modules.projects.vo.*;
-import com.rtrh.projects.modules.projects.vo.export.CustomExcelExportStyler;
 import com.rtrh.projects.modules.projects.vo.export.SubInfoFixVO;
 import com.rtrh.projects.modules.system.enums.SubLogEnum;
 import com.rtrh.projects.modules.system.service.SubDataLogService;
 import com.rtrh.projects.modules.utils.DateUtils;
 import com.rtrh.projects.vo.subject.*;
 import com.rtrh.projects.web.log.Log;
-import com.rtrh.projects.web.util.TargetDataSource;
-import org.apache.poi.ss.usermodel.Workbook;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.DetachedCriteria;
 import org.hibernate.criterion.Restrictions;
@@ -68,9 +53,6 @@ import com.rtrh.projects.web.controller.BaseController;
 
 import cn.afterturn.easypoi.excel.ExcelImportUtils;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletResponse;
 
 /**
  * 项目信息
@@ -174,10 +156,7 @@ public class SubInfoApiController extends BaseController {
         ListMessage message = new ListMessage();
         try {
             String currUnitId = null;
-//			if(Objects.equals(ProjectStatusEnum.TEMPSAVE.getKey(), queryVO.getStatus())
-//					|| Objects.equals(ProjectStatusEnum.PRE.getKey(), queryVO.getStatus())) {
             currUnitId = getCurUser().getUnitId();
-//			}
             Page pageData = subInfoService.pageQueryReportListSql(page, getCurUser().getLoginUser(), queryVO.getSubName(), currUnitId,
                     null, queryVO.getStatus(), null, null, null, queryVO.getBeginDate(), queryVO.getEndDate());
             message.add(pageData.getList(), pageData.getTotalCount());

projects/src/main/java/com/rtrh/projects/web/util/DataSourceAspect.java

@@ -1,5 +1,6 @@
 package com.rtrh.projects.web.util;
 
+import com.rtrh.projects.util.TargetDataSource;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;