修改同步事项

base-manager/db/add.sql

@@ -253,3 +253,17 @@ INSERT INTO mortals_xhx_task VALUES (null, '同步全部站点事项材料附件
 -- 2024-07-20
 -- ----------------------------
 INSERT INTO `mortals_sys_base_area`(`id`, `ancestors`, `name`, `iid`, `pid`, `haveSonArea`, `haveSonDept`, `haveGetDept`, `haveGetMatterList`, `areaCode`, `areaLevel`, `shortName`, `domain`, `status`, `createTime`, `createUserId`, `updateTime`) VALUES (null, '', '巴中经济开发区', 'f190133f82dd46f0ae2e2116a8b9b13b', '60a505e9dfa643e9826902e0810de55f', 'false', 'True', 'false', 'false', '511971000000', 3, '巴中经济开发区', 'bzsbzq.sczwfw.gov.cn', 1, '2021-07-19 11:59:30', NULL, NULL);
+
+
+
+-- ----------------------------
+-- 2024-11-20 索引添加
+-- ----------------------------
+CREATE INDEX idx_matterId ON mortals_sys_matter_accept (matterId);
+CREATE INDEX idx_matterId ON mortals_sys_matter_datum (matterId);
+CREATE INDEX idx_matterId ON mortals_sys_matter_charges (matterId);
+CREATE INDEX idx_matterId ON mortals_sys_matter_flowlimit (matterId);
+CREATE INDEX idx_matterId ON mortals_sys_matter_intermediary (matterId);
+CREATE INDEX idx_matterId ON mortals_sys_matter_question (matterId);
+CREATE INDEX idx_matterId ON mortals_sys_matter_setbase (matterId);
+CREATE INDEX idx_datumId ON mortals_sys_matter_datum_file (datumId);
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/common/utils/MatterDetailHtmlParseUtil.java

@@ -81,10 +81,28 @@ public class MatterDetailHtmlParseUtil {
         String blankSampleExp = "//div[@id=\"zhezhao\"]//div[@class='zhezhao4']";
         String sampleExp = "//div[@id=\"zhezhao\"]//div[@class='zhezhao2']";
         String baseInfoExp = "//div[@id=\"zhezhao\"]//div[@class='zhezhao3']";
+        String baseInfoTableNameExp = "//*[@id=\"material\"]//tr//td[2]/span[1]";
+        // String baseInfoTableNameExp = "//*[@id=\"material\"]//tr/td[2]/span[1]";
+        String baseInfoTableMustExp = "//*[@id=\"material\"]//tr/td[3]/span[1]";
         try {
+            Elements baseInfoTableNameElements = dom.selectXpath(baseInfoTableNameExp);
+            Elements baseInfoTableMustElements = dom.selectXpath(baseInfoTableMustExp);
+            int size = baseInfoTableNameElements.size();
+            int size1 = baseInfoTableMustElements.size();
+            Map<String, String> nameMustMap = new HashMap<>();
+
+            if (size == size1) {
+                for (int i = 0; i < size; i++) {
+                    Element element = baseInfoTableNameElements.get(i);
+                    Element element1 = baseInfoTableMustElements.get(i);
+                    if (!ObjectUtils.isEmpty(element)&&!ObjectUtils.isEmpty(element1)) {
+                        nameMustMap.put(element.text(), element1.text());
+                    }
+                }
+            }
+
             Elements elements = dom.selectXpath(blankSampleExp);
             int rowNum = elements.size();
-
             for (int i = 1; i <= rowNum; i++) {
                 HashMap<String, Object> map = new HashMap<>();
                 List<MatterDatumFileEntity> datumFileEntities = new ArrayList<>();
@@ -111,20 +129,8 @@ public class MatterDetailHtmlParseUtil {
 
                         List<String> allGroup = ReUtil.findAllGroup1("'(.*?)'", onclickStr);
                         if (!ObjectUtils.isEmpty(allGroup)) {
-       /*                     String encryUrl = "http://www.sczwfw.gov.cn/jiq/interface/item/annex/encryptUrl?id=" + allGroup.get(0);
-
-                            String resp = HttpUtil.get(encryUrl);
-                            JSONObject obj = JSON.parseObject(resp);
-                            String code = obj.getString("code");
-                            String data = obj.getString("data");
-                            if ("0".equals(code)) {
-                                fileEntity.setFileUrl(data);
-                                fileEntity.setLocalFileUrl(data);
-                            }*/
                             fileEntity.setFileUrl(allGroup.get(0));
                         }
-
-                        // fileEntity.setFileUrl(node.firstChild().attr("href").trim());
                         datumFileEntities.add(fileEntity);
                     }
                 }
@@ -151,25 +157,13 @@ public class MatterDetailHtmlParseUtil {
 
                         List<String> allGroup = ReUtil.findAllGroup1("'(.*?)'", onclickStr);
                         if (!ObjectUtils.isEmpty(allGroup)) {
-/*                            String encryUrl = "http://www.sczwfw.gov.cn/jiq/interface/item/annex/encryptUrl?id=" + allGroup.get(0);
-
-                            String resp = HttpUtil.get(encryUrl);
-                            JSONObject obj = JSON.parseObject(resp);
-                            String code = obj.getString("code");
-                            String data = obj.getString("data");
-                            if ("0".equals(code)) {
-                                fileEntity.setFileUrl(data);
-                                fileEntity.setLocalFileUrl(data);
-                            }*/
                             fileEntity.setFileUrl(allGroup.get(0));
                         }
-                        // fileEntity.setFileUrl(node.firstChild().attr("href").trim());
                         datumSampleFileEntities.add(fileEntity);
                     }
                     map.put("sampleList", datumSampleFileEntities);
                 }
 
-
                 //查询基本信息
                 String tempxPath2 = baseInfoExp + String.format("[%d]//table//tr//td", i);
                 Elements baseinfoList = dom.selectXpath(tempxPath2);
@@ -184,6 +178,11 @@ public class MatterDetailHtmlParseUtil {
                         baseInfoMap.put(prenode.text().trim(), node.text().trim());
                     }
                 }
+                String name = baseInfoMap.get("材料名称");
+                String must = nameMustMap.get(name);
+                if(!ObjectUtils.isEmpty(must)){
+                    baseInfoMap.put("材料必要性", must);
+                }
                 map.put("baseinfo", baseInfoMap);
                 mapList.add(map);
             }
@@ -441,7 +440,8 @@ public class MatterDetailHtmlParseUtil {
         // String url = "http://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=511500000000&itemCode=511A0151400000-511500000000-000-511501-7-1-00&taskType=1&deptCode=511501-7";
         // String url = "http://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=511500000000&itemCode=511A0000400004-511500000000-000-1151120000870212XU-1-00&taskType=1&deptCode=3922757070285361152";
         // String url = "http://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=511500000000&itemCode=512036008003-511500000000-000-11511200MB1503849K-1-00&taskType=20&deptCode=3907787168696946688";
-        String url = "https://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=511500000000&itemCode=511A0101600004-511500000000-000-11511200008702584B-1-00&taskType=1&deptCode=511501-7";
+        //String url = "https://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=511500000000&itemCode=511A0101600004-511500000000-000-11511200008702584B-1-00&taskType=1&deptCode=511501-7";
+        String url = "http://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=511500000000&itemCode=511A0358400001-511500000000-000-11511200MB1666138E-1-00&taskType=1&deptCode=11511200008702664Y";
 
         Document dom = MatterDetailHtmlParseUtil.getDomByHtml(url);
         Map<String, String> baseInfoMap = MatterDetailHtmlParseUtil.getbaseInfoMapByHtml(dom);

base-manager/src/test/java/com/mortals/httpclient/app/AppController.http

@@ -24,9 +24,8 @@ POST {{baseUrl}}/app/interlist
 Content-Type: application/json
 
 {
+  "idList": [2,3,1],
   "siteId": 1,
-  "appTypeNotList": [4],
-  "aaa": 111,
   "page": 1,
   "size": -1
 }

base-manager/src/test/java/com/mortals/httpclient/matter/MatterController.http

@@ -45,12 +45,14 @@ Content-Type: application/json
 
 
 ###基础事项列表
-POST {{baseUrl}}/site/matter/list
+POST {{baseUrl}}/site/matter/interlist
 Content-Type: application/json
 
 {
   "page": 1,
-  "size": 10
+  "size": 10,
+  "siteId": 1,
+  "matterName": "特种设备作业人员资格认定取证"
 }
 
 ###微官网事项列表
@@ -151,7 +153,7 @@ client.global.set("Matter_id", JSON.parse(response.body).data.id);
 %}
 
 ###基础事项查看
-GET {{baseUrl}}/matter/interinfo?id=34081
+GET {{baseUrl}}/matter/interinfo?id=40248
 Accept: application/json
 
 ###基础事项编辑