Merge branch 'master' of http://8.137.121.180:10880/longping/subject_gxj

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/SecUserAuthService.java

@@ -0,0 +1,8 @@
+package com.rtrh.projects.modules.projects.service;
+
+import java.util.List;
+
+public interface SecUserAuthService {
+
+	List<String> findSubjectAuthIdsByUserId(String userId);
+}

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SecUserAuthServiceImpl.java

@@ -0,0 +1,22 @@
+package com.rtrh.projects.modules.projects.service.impl;
+
+import com.rtrh.projects.modules.projects.service.SecUserAuthService;
+import com.rtrh.projects.modules.rolemeun.mapper.SecUserAuthMapper;
+import com.rtrh.projects.util.TargetDataSource;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class SecUserAuthServiceImpl implements SecUserAuthService {
+    @Resource
+    private SecUserAuthMapper secUserAuthMapper;
+
+    @Override
+    @TargetDataSource("secondary")
+    public List<String> findSubjectAuthIdsByUserId(String userId) {
+        return secUserAuthMapper.findSubjectAuthIdsByUserId(userId);
+    }
+
+}

projects/src/main/java/com/rtrh/projects/web/controller/BaseController.java

@@ -1,32 +1,22 @@
 package com.rtrh.projects.web.controller;
 
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import cn.hutool.core.collection.CollUtil;
-import com.rtrh.projects.modules.rolemeun.dao.SecUserAuthDao;
-import com.rtrh.projects.modules.rolemeun.mapper.SecUserAuthMapper;
-import com.rtrh.projects.modules.rolemeun.po.SecUserAuth;
+import com.rtrh.projects.modules.projects.service.SecUserAuthService;
+import com.team.security.TeamShiroUser;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.session.Session;
 import org.springframework.web.bind.annotation.ModelAttribute;
 
-import com.team.security.TeamShiroUser;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
+import java.util.List;
 
 public abstract class BaseController {
 	@Resource
-	private SecUserAuthDao userAuthDao;
-
-	@Resource
-	private SecUserAuthMapper userAuthMapper;
+	private SecUserAuthService secUserAuthService;
 
 	/**
 	 * 当前用户的session
@@ -58,13 +48,7 @@ public abstract class BaseController {
 	// 区域数据权限
 	public List<String> getSubjectIds() {
 		TeamShiroUser principal = (TeamShiroUser)SecurityUtils.getSubject().getPrincipal();
-		if ("1".equals(principal.getStatusSubject())){
-			// List<SecUserAuth> list = userAuthDao.findListByUserId(principal.getId());
-			// return CollUtil.isEmpty(list)? new ArrayList<>():list.stream().map(SecUserAuth::getSubjectId).collect(Collectors.toList());
-			return userAuthMapper.findSubjectAuthIdsByUserId(principal.getId());
-		}else {
-			return new ArrayList<>();
-		}
+		return "1".equals(principal.getStatusSubject()) ? secUserAuthService.findSubjectAuthIdsByUserId(principal.getId()) : null;
 	}
 	
 	@ModelAttribute

projects/src/main/java/com/rtrh/projects/web/controller/subject/SubInfoController.java

@@ -227,7 +227,13 @@ public class SubInfoController extends BaseController {
         model.put("ZJLY", tSysTableService.getByKind(SysTableKind.ZJLY));
         model.put("XMLX", tSysTableService.getByKind(SysTableKind.XMLX));   //项目类型
         model.put("JSXZ", tSysTableService.getByKind(SysTableKind.JSXZ));
-        model.put("JSDD", tSysTableService.getByKind(SysTableKind.JSDD));   //项目属地
+        List<TSystable> byKind = tSysTableService.getByKind(SysTableKind.JSDD);
+        List<String> subjectIds = getSubjectIds();
+        if (CollectionUtil.isNotEmpty(subjectIds)){
+            byKind = byKind.stream().filter(item -> subjectIds.contains(item.getCode())).collect(Collectors.toList());
+        }
+        model.put("JSDD",byKind);   //项目属地
+
         model.put("TZXZ", tSysTableService.getByKind(SysTableKind.TZXZ));
         model.put("HYDW", jUnitService.getUnitByKind(JUnitKind.ZFDW));
         model.put("BQ", tSysTableService.getByKind(SysTableKind.BQ));

projects/src/main/java/com/rtrh/projects/web/controller/subject/SubInfoExportController.java

@@ -874,10 +874,7 @@ public class SubInfoExportController extends BaseController {
      */
     @PostMapping("/exportDetailExcel")
     public void exportDetailExcel(HttpServletResponse response, @RequestBody SubInfoQueryTzVO queryVO) {
-        if ("1".equals(getCurUser().getStatusSubject())){
-            List<String> subjectIds = getSubjectIds();
-            queryVO.setSubjectAuthIds(subjectIds);
-        }
+        queryVO.setSubjectAuthIds(getSubjectIds());
         List<SubInfoGxj> list = subInfoQueryService.queryAll(getCurUser().getLoginUser(), queryVO);
         // 行业字典
         Map<String, String> hyDictMap = subInduService.queryParentAll().stream().collect(Collectors.toMap(SubIndu::getCode, SubIndu::getTitle));
@@ -1115,10 +1112,7 @@ public class SubInfoExportController extends BaseController {
      */
     @PostMapping("/exportTotalExcelByStatus")
     public void exportTotalExcelByStatus(HttpServletResponse response, @RequestBody SubInfoQueryTzVO vo) {
-        if ("1".equals(getCurUser().getStatusSubject())){
-            List<String> subjectIds = getSubjectIds();
-            vo.setSubjectAuthIds(subjectIds);
-        }
+        vo.setSubjectAuthIds(getSubjectIds());
         // 查询数据以及字典
         List<SubInfoTotalExcel> list = subInfoService.exportTotalExcelByStatus(vo);
         List<TSystable> jsddDict = tSysTableService.getByKind(SysTableKind.JSDD);

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

@@ -134,10 +134,7 @@ public class SubInfoQueryApiController extends BaseController {
     // 查询项目
     @PostMapping("queryPage")
     public ListMessage queryPage(@RequestBody Page page, @RequestBody SubInfoQueryTzVO queryVO) {
-        if ("1".equals(getCurUser().getStatusSubject())){
-            List<String> subjectIds = getSubjectIds();
-            queryVO.setSubjectAuthIds(subjectIds);
-        }
+        queryVO.setSubjectAuthIds(getSubjectIds());
         ListMessage message = new ListMessage();
         try {
             Page pageData = subInfoQueryService.queryPage(page, getCurUser().getLoginUser(), queryVO);
@@ -597,11 +594,9 @@ public class SubInfoQueryApiController extends BaseController {
     }
     @PostMapping("statistics")
     public Message statistics(@RequestBody SubInfoQueryTzVO queryVO) {
+        queryVO.setSubjectAuthIds(getSubjectIds());
         Message message = new Message();
-        if ("1".equals(getCurUser().getStatusSubject())){
-            List<String> subjectIds = getSubjectIds();
-            queryVO.setSubjectAuthIds(subjectIds);
-        }
+        queryVO.setSubjectAuthIds(getSubjectIds());
         StatisticsVO vo = subInfoQueryService.queryStatistics(queryVO, getCurUser().getLoginUser());
         message.setData(vo);
         return message;

projects/src/main/resources/rtrh-crypto.xml

@@ -18,6 +18,7 @@
 				<value>/outApi/projects/statics/yearReport</value>
 				<value>/outApi/subInfoExport/**</value>
 				<value>/outApi/auth/gxjLogin</value>
+				<value>/api/app/switch/toFgw</value>
 				<value>/pdfHtml/**</value>
 			</list>
 		</property>