修编

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/sbjk/SbSearchController.java

@@ -31,6 +31,42 @@ public class SbSearchController extends BaseController {
     @Resource
     private SbSearchService sbSearchService;
 
+    /**
+     * 上传修编成果文件
+     * @param file 修编文件
+     * @param instid 流程主键
+     * @return
+     */
+    @PostMapping("/reuploadThirdpartyReviseData")
+    public JSONObject reuploadThirdpartyReviseData(MultipartFile file, String instid) {
+        return sbSearchService.reuploadThirdpartyReviseData(file, instid);
+    }
+
+    /**
+     * 接收修编成果文件上传的接口测试
+     * @param file 修编文件
+     * @param instId 流程主键
+     * @return
+     */
+    @PostMapping("/reuploadThirdpartyRevise")
+    public WebResult reuploadThirdpartyRevise(MultipartFile file, String instId) {
+        return sbSearchService.reuploadThirdpartyRevise(file, instId);
+    }
+
+    /**
+     * 查询修编成果列表
+     *
+     * @param planType     规划类型，1：总体规划；2：村庄规划
+     * @param current      页码，1为第一页
+     * @param size         页数量, 例：10表示单页显示10条数据
+     * @param divisionCode 行政区域代码
+     * @return
+     */
+    @GetMapping("/getLandGetRevisePageData")
+    public JSONObject getLandGetRevisePageData(Integer planType, Integer current, Integer size, String divisionCode, String subject) {
+        return sbSearchService.getLandGetRevisePageData(planType, current, size , divisionCode, subject);
+    }
+
     /**
      * 查询已办成果流程
      *
@@ -91,6 +127,17 @@ public class SbSearchController extends BaseController {
         return sbSearchService.landMyAttendsData(planType, current, size , divisionCode);
     }
 
+    /**
+     * 查询修编成果列表
+     *
+     * @param planType 规划类型，1：总体规划；2：村庄规划
+     * @return
+     */
+    @PostMapping("/landGetRevisePage")
+    public WebResult landGetRevisePage(Integer planType, Integer current, Integer size, String divisionCode) {
+        return sbSearchService.landGetRevisePage(planType, current, size , divisionCode);
+    }
+
     /**
      * 查询待办成果列表
      *

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/sbjk/SbSearchServiceImpl.java

@@ -1,6 +1,7 @@
 package com.onemap.apply.service.impl.sbjk;
 
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.onemap.apply.domain.sbjk.XzczghcgsbDTO;
 import com.onemap.apply.mapper.sbjk.XzczghcgsbMapper;
@@ -46,6 +47,42 @@ public class SbSearchServiceImpl implements SbSearchService {
     private String landTaskStatusURI;
     @Value("${cgbcxjk.reportDownload}")
     private String reportDownloadURI;
+    @Value("${cgbcxjk.landGetRevisePage}")
+    private String landGetRevisePageURI;
+    @Value("${cgbcxjk.reuploadThirdpartyRevise}")
+    private String reuploadThirdpartyReviseURI;
+
+    @Override
+    public JSONObject reuploadThirdpartyReviseData(MultipartFile file, String instid) {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("instId", instid);
+        jsonObject.put("file", file);
+        return getRequestFileData(reuploadThirdpartyReviseURI, jsonObject);
+    }
+
+    @Override
+    public WebResult reuploadThirdpartyRevise(MultipartFile file, String instId) {
+        WebResult res = new WebResult();
+        res.put("code" , 200);
+        res.put("data" , "");
+        res.put("msg" , "正常");
+        res.put("success" , true);
+        return res;
+    }
+
+    @Override
+    public JSONObject getLandGetRevisePageData(Integer planType, Integer current, Integer size, String divisionCode, String subject) {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("current", current);
+        jsonObject.put("size", size);
+        if (StringUtils.isNotEmpty(subject)) {
+            jsonObject.put("title", subject);
+        }
+        if (StringUtils.isNotEmpty(divisionCode)) {
+            jsonObject.put("divisionCode", divisionCode);
+        }
+        return getRequestData(landGetRevisePageURI, jsonObject);
+    }
 
     @Override
     public JSONObject getLandMyAttendsData(Integer planType, Integer current, Integer size, String divisionCode, String subject) {
@@ -138,6 +175,27 @@ public class SbSearchServiceImpl implements SbSearchService {
         return WebResult.success(map);
     }
 
+    @Override
+    public WebResult landGetRevisePage(Integer planType, Integer current, Integer size, String divisionCode) {
+        List<Map> res = new ArrayList<>();
+
+        for (int i = 0; i < size; i++) {
+            Map<String, Object> object = new HashMap<>();
+            object.put("nodeName", "用地审查");
+            object.put("solId", "1119598296057454592");
+            object.put("createTime", "2023-10-13 14:40:25");
+            object.put("executor", "admin");
+            object.put("id", "20000043560001");
+            object.put("title", "xxxxx国土空间总体规划");
+            object.put("instId", "1163778751483928576" + i);
+            res.add(object);
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("records", res);
+        map.put("total", 999);
+        return WebResult.success(map);
+    }
+
     @Override
     public WebResult landTaskStatus(String id, String instId) {
         List<Map> res = new ArrayList<>();
@@ -238,6 +296,25 @@ public class SbSearchServiceImpl implements SbSearchService {
         return reStrMd5;
     }
 
+    /**
+     * 请求数据
+     *
+     * @param requestURI 请求地址
+     * @param params     请求参数
+     * @return
+     */
+    public JSONObject getRequestFileData(String requestURI, Map<String, Object> params) {
+        String token = getAccessToken();
+        if (StringUtils.isEmpty(token)) {
+            return null;
+        }
+        JSONObject reStrMd5 = RInterfaceUtil.postRemote(token, requestURI, null, params);
+        System.out.println("请求地址：" + requestURI);
+//        System.out.println("请求参数：" + JSON.toJSONString(params));
+        System.out.println("请求结果：" + reStrMd5.toJSONString());
+        return reStrMd5;
+    }
+
     /**
      * 调用接口统一获取token
      *

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/sbjk/SbSearchService.java

@@ -4,6 +4,7 @@ package com.onemap.apply.service.sbjk;
 import com.alibaba.fastjson.JSONObject;
 import com.onemap.apply.domain.sbjk.ZbsbRzDTO;
 import com.onemap.common.core.web.domain.WebResult;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -25,4 +26,12 @@ public interface SbSearchService {
     WebResult reportDownload(String id, String solId, HttpServletResponse response);
 
     JSONObject reportDownloadAction(String id, String solId, HttpServletResponse response);
+
+    JSONObject getLandGetRevisePageData(Integer planType, Integer current, Integer size, String divisionCode, String subject);
+
+    WebResult landGetRevisePage(Integer planType, Integer current, Integer size, String divisionCode);
+
+    JSONObject reuploadThirdpartyReviseData(MultipartFile file, String instid);
+
+    WebResult reuploadThirdpartyRevise(MultipartFile file, String instId);
 }