2.26bug 远程接口

projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/SubInfoMapper.xml

@@ -1296,7 +1296,10 @@
     <select id="querySubInfoStatusByIds" resultType="java.util.Map">
         select
             status,
-            sub_id
+            sub_id subId,
+            end_date endDate,
+            rg_date rgDate,
+            is_rg boolRg
         from
             sub_info
         where

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

@@ -361,4 +361,6 @@ public interface SubInfoQueryService {
 	Map<String, Object> problemLightStatistics(LoginUserVO loginUser, SubInfoQueryTzVO queryVO);
 
 	List<Map<String, Object>> querySubInfoStatusByIds(List<String> ids);
+
+    List<String> queryIds();
 }

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

@@ -1451,6 +1451,11 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
         return subInfoMapper.querySubInfoStatusByIds(ids);
     }
 
+    @Override
+    public List<String> queryIds() {
+        return null;
+    }
+
     private Map<String, Object> getStringObjectMap(List<SubInfoGxj> list) {
         Map<String, Object> resultMap = new HashMap<>();
         if (com.rtrh.common.util.CollectionUtil.isNotEmpty(list)){

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

@@ -6,7 +6,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.alibaba.fastjson.JSON;
 import com.rtrh.projects.modules.projects.mapper.SubPreFlowMapper;
+import com.rtrh.projects.util.HttpClientUtil;
 import com.rtrh.projects.util.TargetDataSource;
 import org.hibernate.criterion.DetachedCriteria;
 import org.hibernate.criterion.Order;
@@ -68,7 +70,12 @@ public class SubPreFlowServiceImpl implements SubPreFlowService {
 	@Override
 	@TargetDataSource("secondary")
 	public List<SubPreFlow> getList() {
-		return subPreFlowMapper.getList();
+		Object o = HttpClientUtil.fgwGetRequest("/outApi/remote/getSubPreFlowList");
+		if (o != null) {
+			return JSON.parseArray(JSON.toJSONString(o), SubPreFlow.class);
+		}
+		return new ArrayList<>();
+		// return subPreFlowMapper.getList();
 	}
 
 	@Override

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

@@ -1,13 +1,12 @@
 package com.rtrh.projects.modules.projects.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
+import com.alibaba.fastjson.JSON;
 import com.rtrh.projects.modules.projects.dao.SubPreFlowUnitAllDTO;
 import com.rtrh.projects.modules.projects.mapper.SubPreFlowUnitMapper;
+import com.rtrh.projects.util.HttpClientUtil;
 import com.rtrh.projects.util.TargetDataSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -150,6 +149,12 @@ public class SubPreFlowUnitServiceImpl implements SubPreFlowUnitService {
 	@Override
 	@TargetDataSource("secondary")
 	public SubPreFlowUnitVO getFlowUnitAndDepart(String id, String subjectId, String indusKind) {
-		return subPreFlowUnitMapper.getFlowUnitAndDepart(id, subjectId, indusKind);
+		// return subPreFlowUnitMapper.getFlowUnitAndDepart(id, subjectId, indusKind);
+		Object o = HttpClientUtil.fgwGetRequest("/outApi/remote/findPreFlowUnit",new HashMap<String, String>() {{
+			put("preFlowId", id);
+			put("subjectId", subjectId);
+			put("indusKind", indusKind);
+		}});
+		return o == null ? null : JSON.parseObject(JSON.toJSONString(o), SubPreFlowUnitVO.class);
 	}
 }

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

@@ -3,6 +3,7 @@ package com.rtrh.projects.modules.projects.service.impl;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.rtrh.projects.modules.projects.dao.*;
@@ -21,6 +22,7 @@ import com.rtrh.projects.modules.system.service.SubDataLogService;
 import com.rtrh.projects.modules.system.vo.LoginUserVO;
 import com.rtrh.projects.modules.utils.ApiStaticUrl;
 import com.rtrh.projects.modules.utils.DateUtils;
+import com.rtrh.projects.util.HttpClientUtil;
 import com.rtrh.projects.util.TargetDataSource;
 import com.rtrh.projects.vo.subject.SubinfoPreQueryVo;
 import org.apache.commons.lang.StringUtils;
@@ -1585,13 +1587,19 @@ public class SubPreNewServiceImpl implements SubPreNewService {
     @Override
     @TargetDataSource("secondary")
     public List<SubPreNew> findBySubId(String subId) {
-        return subPreNewMapper.findBySubId(subId);
+        Object o = HttpClientUtil.fgwGetRequest("/outApi/remote/findPreNewBySubId?subId=" + subId);
+        if (o != null) {
+            return JSON.parseArray(JSON.toJSONString(o), SubPreNew.class);
+        }
+        return new ArrayList<>();
+        // return subPreNewMapper.findBySubId(subId);
     }
 
     @Override
     @TargetDataSource("secondary")
     public void saveBatch(List<SubPreNew> list) {
-        subPreNewMapper.saveBatch(list);
+        // subPreNewMapper.saveBatch(list);
+        HttpClientUtil.fgwPostRequest("/outApi/remote/saveBatchSubPreNew", list);
     }
 
     @Override

projects-service/src/main/java/com/rtrh/projects/util/HttpClientUtil.java

@@ -5,7 +5,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 // import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.rtrh.core.vo.Message;
+import com.rtrh.projects.modules.projects.po.SubPreNew;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -18,7 +20,9 @@ import org.apache.http.util.EntityUtils;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.util.List;
 import java.util.Map;
+import java.util.ResourceBundle;
 
 @Slf4j
 public class HttpClientUtil {
@@ -37,10 +41,12 @@ public class HttpClientUtil {
             if (params != null && !params.isEmpty()) {
                 sb.append("?");
                 for (Map.Entry<String, String> entry : params.entrySet()) {
-                    sb.append(entry.getKey())
-                            .append("=")
-                            .append(URLEncoder.encode(entry.getValue(), StandardCharsets.UTF_8.toString()))
-                            .append("&");
+                    if (StringUtils.isNotBlank(entry.getValue())){
+                        sb.append(entry.getKey())
+                                .append("=")
+                                .append(URLEncoder.encode(entry.getValue(), StandardCharsets.UTF_8.toString()))
+                                .append("&");
+                    }
                 }
                 sb.deleteCharAt(sb.length() - 1); // 移除最后一个 &
             }
@@ -64,6 +70,15 @@ public class HttpClientUtil {
         return null;
     }
 
+    public static Object fgwGetRequest(String url, Map<String, String> params) {
+        ResourceBundle resourceBundle = ResourceBundle.getBundle("config");
+        String inUrl = resourceBundle.getString("app.fgw.in.url");
+        return sendGetRequest(inUrl + url, params);
+    }
+
+    public static Object fgwGetRequest(String url) {
+        return fgwGetRequest(url, null);
+    }
 
     /**
      * 发送 POST 请求
@@ -122,4 +137,10 @@ public class HttpClientUtil {
     public static Object sendPostRequest(String url, Object jsonBody) {
         return sendPostRequest(url, jsonBody, null);
     }
+
+    public static Object fgwPostRequest(String s, Object jsonBody) {
+        ResourceBundle resourceBundle = ResourceBundle.getBundle("config");
+        String inUrl = resourceBundle.getString("app.fgw.in.url");
+        return sendPostRequest(inUrl + s, jsonBody);
+    }
 }

projects-service/src/main/java/com/rtrh/projects/vo/RemoteRequestDto.java

@@ -0,0 +1,24 @@
+package com.rtrh.projects.vo;
+
+import com.rtrh.core.repository.Page;
+import com.rtrh.projects.modules.system.vo.LoginUserVO;
+import com.rtrh.projects.vo.subject.SubinfoPreQueryVo;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Setter
+@Getter
+@Accessors(chain = true)
+public class RemoteRequestDto implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Page page;
+    private SubinfoPreQueryVo queryVO;
+    private LoginUserVO userVO;
+    private List<String> subIds;
+
+}

projects/src/main/java/com/rtrh/projects/web/controller/system/api/RemoteRequestController.java → projects/src/main/java/com/rtrh/projects/outapi/controller/projects/RemoteRequestController.java

@@ -1,4 +1,4 @@
-package com.rtrh.projects.web.controller.system.api;
+package com.rtrh.projects.outapi.controller.projects;
 
 import com.rtrh.core.vo.Message;
 import com.rtrh.projects.modules.projects.service.SubInfoQueryService;
@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 @RestController
-@RequestMapping("/api/remote")
+@RequestMapping("/outApi/remote")
 public class RemoteRequestController {
     @Resource
     private SubInfoQueryService subInfoQueryService;

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

@@ -1,6 +1,8 @@
 package com.rtrh.projects.web.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.rtrh.projects.modules.projects.service.SecUserAuthService;
+import com.rtrh.projects.util.HttpClientUtil;
 import com.team.security.TeamShiroUser;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
@@ -12,6 +14,9 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 public abstract class BaseController {
@@ -48,7 +53,12 @@ public abstract class BaseController {
 	// 区域数据权限
 	public List<String> getSubjectIds() {
 		TeamShiroUser principal = (TeamShiroUser)SecurityUtils.getSubject().getPrincipal();
-		return secUserAuthService.findSubjectAuthIdsByUserId(principal.getId());
+		Object o = HttpClientUtil.fgwGetRequest("/outApi/remote/findSubjectAuthIdsByUserId?userId=" + principal.getId(), null);
+		if (o != null) {
+			return JSON.parseArray(JSON.toJSONString(o), String.class);
+		}
+		return new ArrayList<>();
+		// return secUserAuthService.findSubjectAuthIdsByUserId(principal.getId());
 	}
 	
 	@ModelAttribute

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

@@ -24,6 +24,7 @@ import com.rtrh.projects.modules.system.dao.TSystableDao;
 import com.rtrh.projects.modules.system.po.TSystable;
 import com.rtrh.projects.modules.system.service.ISubInduService;
 import com.rtrh.projects.modules.utils.DateUtils;
+import com.rtrh.projects.util.HttpClientUtil;
 import com.rtrh.projects.web.log.Log;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -146,7 +147,9 @@ public class SubInfoController extends BaseController {
     @Log("页面：【项目前期管理-前期手续办理情况】，执行操作：查看部门统计情况")
     @GetMapping("reportDepartment")
     public ModelAndView reportDepartment(ModelMap model) {
-        List<Map<String, Object>> unit = jUnitService.getCheckUnit();
+        // List<Map<String, Object>> unit = jUnitService.getCheckUnit();
+        Object o = HttpClientUtil.fgwGetRequest("/outApi/remote/getCheckUnit");
+        List<Map<String, Object>> unit = (List<Map<String, Object>>) o;
         model.put("Junit", unit);
         return new ModelAndView("/vmodules/subject/subInfo/report_department.jsp", model);
     }

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

@@ -10,6 +10,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
+import com.alibaba.fastjson.JSON;
 import com.rtrh.common.util.Identities;
 import com.rtrh.projects.modules.projects.dao.*;
 import com.rtrh.projects.modules.projects.enums.StatusEnum;
@@ -21,6 +22,8 @@ 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.util.HttpClientUtil;
+import com.rtrh.projects.vo.RemoteRequestDto;
 import com.rtrh.projects.vo.subject.*;
 import com.rtrh.projects.web.log.Log;
 import com.rtrh.projects.web.log.WebLogAspect;
@@ -1353,8 +1356,20 @@ public class SubInfoApiController extends BaseController {
     public ListMessage pageQueryRreDepartment(@RequestBody Page page, @RequestBody SubinfoPreQueryVo queryVO) {
         ListMessage message = new ListMessage();
         try {
-            Page pageData = subInfoService.pageQueryRreDepartment(page, queryVO, getCurUser().getLoginUser());
-            message.add(pageData.getList(), pageData.getTotalCount());
+            List<String> subIds = subInfoQueryService.queryIds();
+            Object o = HttpClientUtil.fgwPostRequest("/outApi/remote/pageQueryRreDepartment",
+                    new RemoteRequestDto()
+                            .setPage(page)
+                            .setQueryVO(queryVO)
+                            .setUserVO(getCurUser().getLoginUser())
+                            .setSubIds(subIds)
+            );
+            if (o!=null){
+                Page pageData = JSON.parseObject(JSON.toJSONString(o), Page.class);
+                // Page pageData = subInfoService.pageQueryRreDepartment(page, queryVO, getCurUser().getLoginUser());
+                message.add(pageData.getList(), pageData.getTotalCount());
+            }
+
         } catch (Exception e) {
             logger.error("", e);
             message.add("获取失败");

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

@@ -18,7 +18,7 @@
 				<value>/outApi/projects/statics/yearReport</value>
 				<value>/outApi/subInfoExport/**</value>
 				<value>/api/sync/**</value>
-				<value>/api/remote/**</value>
+				<value>/outApi/remote/**</value>
 				<value>/pdfHtml/**</value>
 				<value>/api/jumpLogin</value>
 			</list>
@@ -28,7 +28,7 @@
 				<value>/outApi/file/**</value>
 				<value>/outApi/subInfoExport/**</value>
 				<value>/api/sync/**</value>
-				<value>/api/remote/**</value>
+				<value>/outApi/remote/**</value>
 				<value>/pdfHtml/**</value>
 				<value>/api/jumpLogin</value>
 			</list>

projects/src/main/webapp/vmodules/subject/subInfo/detailView.jsp

@@ -181,7 +181,7 @@
 				<button class="btn btn2" :class="{active: tabActive === 6}" @click="onChangeActive(6)">项目前期手续办理情况</button>
 				<button class="btn btn2" :class="{active: tabActive === 7}" @click="onChangeActive(7)">问题督办</button>
 				<button class="btn btn2" :class="{active: tabActive === 9}" @click="onChangeActive(9)">项目图片及影像</button>
-				<button class="btn btn2" :class="{active: tabActive === 11}" @click="onChangeActive(11)">重大事项</button>
+<%--				<button class="btn btn2" :class="{active: tabActive === 11}" @click="onChangeActive(11)">重大事项</button>--%>
 				<c:if test="${completeCheck}">
 					<button class="btn btn2" :class="{active: tabActive === 10}" @click="onChangeActive(10)">竣工报告</button>
 				</c:if>