添加行政区划数据

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

@@ -126,7 +126,8 @@ public class SbSearchController extends BaseController {
      */
     @PostMapping("/landMyAttendsData")
     public WebResult landMyAttendsData(Integer planType, Integer current, Integer size, String divisionCode) {
-        return sbSearchService.landMyAttendsData(planType, current, size, divisionCode);
+        JSONObject jsonObject= sbSearchService.landMyAttendsData(planType, current, size, divisionCode);
+        return WebResult.success(jsonObject);
     }
 
     /**

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

@@ -48,6 +48,13 @@ public class XzczghcgsbController extends BaseController {
         startRecordPage();
         return getRecordDataTable(xzczghcgsbService.selectList(xzczghcgsbDTO));
     }
+    /**
+     * 获取统计列表
+     */
+    @GetMapping("/getStatistics")
+    public AjaxResult getStatistics() {
+        return AjaxResult.success(xzczghcgsbService.getStatistics());
+    }
 
     /**
      * 上传zip文件

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/res/LandMyAttend.java

@@ -0,0 +1,43 @@
+package com.onemap.apply.domain.res;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@NoArgsConstructor
+@Data
+public class LandMyAttend {
+
+
+    @JsonProperty("records")
+    private List<RecordsDTO> records;
+    @JsonProperty("total")
+    private Integer total;
+    @JsonProperty("size")
+    private Integer size;
+    @JsonProperty("current")
+    private Integer current;
+    @JsonProperty("pages")
+    private Integer pages;
+
+    @NoArgsConstructor
+    @Data
+    public static class RecordsDTO {
+        @JsonProperty("nodeName")
+        private String nodeName;
+        @JsonProperty("instId")
+        private String instId;
+        @JsonProperty("divisionCode")
+        private String divisionCode;
+        @JsonProperty("solId")
+        private String solId;
+        @JsonProperty("createTime")
+        private String createTime;
+        @JsonProperty("executor")
+        private String executor;
+        @JsonProperty("id")
+        private String id;
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/res/LandMyAttendRes.java

@@ -0,0 +1,11 @@
+package com.onemap.apply.domain.res;
+
+import lombok.Data;
+
+@Data
+public class LandMyAttendRes {
+    private String code;
+    private Boolean success;
+    private String msg;
+    private LandMyAttend data;
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/sbjk/TusexzqhDTO.java

@@ -0,0 +1,26 @@
+package com.onemap.apply.domain.sbjk;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@TableName("t_use_xqzqh")
+@Data
+public class TusexzqhDTO {
+    @TableField(value = "xqzqh_code")
+    private String xzqhCode;
+   @TableField(value = "province")
+    private String province;
+    @TableField(value = "city")
+    private String city;
+    @TableField(value = "county")
+    private String county;
+    @TableField(value = "township")
+    private String township;
+    @TableField(value = "village")
+    private String village;
+    @TableField(value = "pid")
+    private String pid;// 上一级的行政区划编码
+    @TableField(value = "use_id")
+    private String useId; //省厅返回用的
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/sbjk/TuseXzqhMapper.java

@@ -0,0 +1,7 @@
+package com.onemap.apply.mapper.sbjk;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.apply.domain.sbjk.TusexzqhDTO;
+
+public interface TuseXzqhMapper extends BaseMapper<TusexzqhDTO> {
+}

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

@@ -155,23 +155,49 @@ public class SbSearchServiceImpl implements SbSearchService {
     }
 
     @Override
-    public WebResult landMyAttendsData(Integer planType, Integer current, Integer size, String divisionCode) {
+    public JSONObject landMyAttendsData(Integer planType, Integer current, Integer size, String divisionCode) {
+        int total = 999;
+        int returnSize = 0;
+        if (current * size > total) {
+            returnSize = total - (current - 1) * size;
+        } else {
+            returnSize = size;
+        }
+
+        List<String> nodeNames = new ArrayList<>();
+        nodeNames.add("补正");
+        nodeNames.add("机审");
+        nodeNames.add("用地审查节点");
+
         List<Map> res = new ArrayList<>();
-        for (int i = 0; i < size; i++) {
+        for (int i = 0; i < returnSize; i++) {
+            int id = i + (current - 1) * size;
             Map<String, Object> object = new HashMap<>();
+            object.put("nodeName", nodeNames.get(i % 3));
             object.put("createBy", "admin");
             object.put("solId", "1108335276203401216");
             object.put("createTime", "2023-10-13 14:40:25");
             object.put("subject", "xxxxx国土空间总体规划");
-            object.put("id", "20000043520247");
+            object.put("id", id);
             object.put("status", "RUNNING");
             object.put("instId", "1162399447005093888" + i);
             res.add(object);
         }
         Map<String, Object> map = new HashMap<>();
         map.put("records", res);
-        map.put("total", 999);
-        return WebResult.success(map);
+        map.put("total", total);
+        map.put("size", size);
+        map.put("current", current);
+        map.put("pages", total / size);
+
+        Map<String, Object> mapRet = new HashMap<>();
+        mapRet.put("code", 200);
+        mapRet.put("success", true);
+        mapRet.put("data", map);
+        mapRet.put("msg", "操作成功");
+
+        JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(mapRet));
+        return jsonObject;
     }
 
     @Override
@@ -187,6 +213,7 @@ public class SbSearchServiceImpl implements SbSearchService {
             object.put("id", "20000043560001");
             object.put("title", "xxxxx国土空间总体规划");
             object.put("instId", "1163778751483928576" + i);
+            object.put("divisionCode", "110000");
             res.add(object);
         }
         Map<String, Object> map = new HashMap<>();
@@ -351,8 +378,7 @@ public class SbSearchServiceImpl implements SbSearchService {
         JSONObject tokenJson = RInterfaceUtil.postRemote(null, oauthUrl, jsonObject, null);
         System.out.println(tokenJson);
         String token = "";
-        if (tokenJson.containsKey("success") && tokenJson.getBoolean("success")
-                && tokenJson.containsKey("data") && tokenJson.getJSONObject("data").containsKey("access_token")) {
+        if (tokenJson.containsKey("success") && tokenJson.getBoolean("success") && tokenJson.containsKey("data") && tokenJson.getJSONObject("data").containsKey("access_token")) {
             token = tokenJson.getJSONObject("data").getString("access_token");
             System.out.println(token);
         }

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

@@ -7,12 +7,18 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.onemap.apply.domain.cggl.ScmxDTO;
 import com.onemap.apply.domain.cggl.ScmxRecordDTO;
 import com.onemap.apply.domain.cggl.TCgglSjbzmlwjDto;
+import com.onemap.apply.domain.res.LandMyAttend;
+import com.onemap.apply.domain.res.LandMyAttendRes;
+import com.onemap.apply.domain.sbjk.XxghcgsbDTO;
 import com.onemap.apply.domain.sbjk.XzczghcgsbDTO;
 import com.onemap.apply.mapper.cggl.EscalationMapper;
 import com.onemap.apply.mapper.cggl.ScmxMapper;
 import com.onemap.apply.mapper.cggl.ScmxRecordMapper;
 import com.onemap.apply.mapper.cggl.TCgglSjbzmlwjMapper;
+import com.onemap.apply.mapper.sbjk.TuseXzqhMapper;
 import com.onemap.apply.mapper.sbjk.XzczghcgsbMapper;
+import com.onemap.apply.service.sbjk.SbSearchService;
+import com.onemap.apply.service.sbjk.XxghcgsbService;
 import com.onemap.apply.service.sbjk.XzczghcgsbService;
 import com.onemap.apply.utils.Md5Utils;
 import com.onemap.apply.utils.RInterfaceUtil;
@@ -21,6 +27,7 @@ import com.onemap.common.core.utils.UnPackageUtils;
 import com.onemap.common.core.utils.uuid.IdUtils;
 import com.onemap.common.core.web.domain.AjaxResult;
 import com.onemap.common.core.web.domain.RequestResult;
+import com.onemap.common.core.web.domain.WebResult;
 import com.onemap.common.redis.service.RedisService;
 import com.onemap.common.security.utils.SecurityUtils;
 import org.apache.commons.io.FileUtils;
@@ -43,6 +50,9 @@ import static com.onemap.common.core.utils.StringUtils.*;
 public class XzczghcgsbServiceImpl implements XzczghcgsbService {
     @Resource
     private XzczghcgsbMapper xzczghcgsbMapper;
+    @Resource
+    private TuseXzqhMapper tuseXzqhMapper;
+
     @Value("${Cggl.temp}")
     private String temp;
     @Value("${Cggl.oauthUrl}")
@@ -73,10 +83,12 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
     private ScmxMapper scmxMapper;
     @Autowired
     private ScmxRecordMapper scmxRecordMapper;
+
+    @Autowired
+    private SbSearchService sbSearchService;
     //规划成果包基本信息存储
     private Map<String, String> xmDetailMap = new HashMap<>();
 
-
     @Override
     public RequestResult startcgsc(String scmodel, String jqscmodel, String cgid) {
         try {
@@ -166,6 +178,55 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
         return xzczghcgsbMapper.selectList(giswrapper);
     }
 
+    @Override
+    public int getStatistics() {
+        // todo
+        // 鄂尔多斯 1506
+        // 通过分页获取全部的数据
+        // sbSearchService.getLandMyAttendsData(2, 1, 10, " 1506", "");
+
+//        int current = 1;
+//        List<LandMyAttend.RecordsDTO> list = getAllLandMyAttendsData(2, current, 200, "1506");
+//        // 根据nodeName组成map数组
+//        Map<String, List<LandMyAttend.RecordsDTO>> mapNodeName = new HashMap<>();
+//        for (LandMyAttend.RecordsDTO record : list) {
+//            if (mapNodeName.containsKey(record.getNodeName())) {
+//                mapNodeName.get(record.getNodeName()).add(record);
+//            } else {
+//                List<LandMyAttend.RecordsDTO> records = new ArrayList<>();
+//                records.add(record);
+//                mapNodeName.put(record.getNodeName(), records);
+//            }
+//        }
+
+        XxghcgsbDTO xxghcgsbDTO = new XxghcgsbDTO();
+        xxghcgsbDTO.setUploadStatus(2);
+        xxghcgsbDTO.setUploadTime(new Date());
+        xxghcgsbDTO.setStatus("22"); //TODO
+//        xxghcgsbDTO.setCounty();
+//        xxghcgsbDTO.setTown();
+//        xxghcgsbDTO.setXzqCode();
+//        xxghcgsbDTO.setXzqName();
+        xxghcgsbDTO.setYear("2025-03-12");
+
+        xzczghcgsbMapper.insert()
+                .insert(xxghcgsbDTO);
+        return 999;
+    }
+
+    private List<LandMyAttend.RecordsDTO> getAllLandMyAttendsData(int planType, int current, int size, String divisionCode) {
+        JSONObject jsonObject = sbSearchService.landMyAttendsData(planType, current, size, divisionCode);
+        List<LandMyAttend.RecordsDTO> list = new ArrayList<>();
+        if (jsonObject.containsKey("success") && jsonObject.getBoolean("success")) {
+            LandMyAttend landMyAttend = jsonObject.getObject("data", LandMyAttend.class);
+            list.addAll(landMyAttend.getRecords());
+            if (current < landMyAttend.getPages() + 1) {
+                list.addAll(getAllLandMyAttendsData(planType, current + 1, size, divisionCode));
+            }
+        }
+        return list;
+    }
+
     /**
      * 新增记录
      *
@@ -425,13 +486,9 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
     public List<String> checkMustFiles(String unzippath, List<TCgglSjbzmlwjDto> sjbzlist, String parentname, List<String> missfiles, String xzqdm, String xzqmc) {
         List<TCgglSjbzmlwjDto> filteredList = new ArrayList<>();
         if (StringUtils.isNotEmpty(parentname)) {
-            filteredList = sjbzlist.stream()
-                    .filter(cur -> parentname.equals(cur.getSjml()))
-                    .collect(Collectors.toList());
+            filteredList = sjbzlist.stream().filter(cur -> parentname.equals(cur.getSjml())).collect(Collectors.toList());
         } else {
-            filteredList = sjbzlist.stream()
-                    .filter(cur -> cur.getSjml() == null)
-                    .collect(Collectors.toList());
+            filteredList = sjbzlist.stream().filter(cur -> cur.getSjml() == null).collect(Collectors.toList());
         }
         for (TCgglSjbzmlwjDto dto : filteredList) {
             if ("O".equals(dto.getYstj()) || "C".equals(dto.getYstj())) {//跳过非必要审查项
@@ -503,8 +560,7 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
             String error = "";
             String fileMd5 = "";
 
-            if (tokenJson.containsKey("success") && tokenJson.getBoolean("success")
-                    && tokenJson.containsKey("data") && tokenJson.getJSONObject("data").containsKey("access_token")) {
+            if (tokenJson.containsKey("success") && tokenJson.getBoolean("success") && tokenJson.containsKey("data") && tokenJson.getJSONObject("data").containsKey("access_token")) {
                 token = tokenJson.getJSONObject("data").getString("access_token");
                 System.out.println(token);
 //                token = tokenJson.getJSONObject("data").getString("access_token");

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

@@ -11,7 +11,7 @@ import java.util.List;
 
 public interface SbSearchService {
 
-    WebResult landMyAttendsData(Integer planType, Integer current, Integer size, String divisionCode);
+    JSONObject landMyAttendsData(Integer planType, Integer current, Integer size, String divisionCode);
 
     WebResult landGetAllTasks(Integer planType, Integer current, Integer size, String divisionCode);
 

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

@@ -0,0 +1,4 @@
+package com.onemap.apply.service.sbjk;
+
+public interface TuseXzqh {
+}

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

@@ -25,6 +25,11 @@ public interface XzczghcgsbService {
      */
     public List<XzczghcgsbDTO> selectList(XzczghcgsbDTO xzczghcgsbDTO);
 
+    /**
+     * 获取统计列表
+     */
+    public int getStatistics();
+
     /**
      * 新增记录
      *