修改重试机制

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

@@ -22,6 +22,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.mortals.xhx.common.key.Constant.MAX_RETRY_COUNT;
+
 @Slf4j
 public class MatterHtmlParseUtil {
 
@@ -29,10 +31,13 @@ public class MatterHtmlParseUtil {
         String matterTotalExp = "//input[@id=\"result_count\"]";
         String matterPageExp = "//input[@id=\"pageNum\"]";
         Map<String, Integer> resultMap = new HashMap<>();
+        int reCount = 0;
+        while (reCount < MAX_RETRY_COUNT) {
             try {
                 Document dom = Jsoup.connect(url)
                         .ignoreContentType(true)
                         .ignoreHttpErrors(true)
+                        .timeout(60 * 1000)
                         .data(params).get();
                 Elements elements = dom.selectXpath(matterTotalExp);
                 if (elements.size() > 0) {
@@ -45,45 +50,20 @@ public class MatterHtmlParseUtil {
                     Integer pageNum = elements.get(0) == null ? 0 : DataUtil.converStr2Int(elements.get(0).attr("value"), 0);
                     resultMap.put("pageNum", pageNum);
                 }
-
             } catch (Exception e) {
-            log.error("获取事项数量异常！params:" + JSON.toJSONString(params), e);
-            return Rest.fail(e.getMessage());
-        }
-
-        return Rest.ok(resultMap);
-    }
-
-
-    public static Rest<Map<String, Integer>> statSiteMatterDeptCount(Map<String, String> params, String url) {
-        String matterTotalExp = "//input[@id=\"result_countDept\"]";
-        String matterPageExp = "//input[@id=\"pageNumDept\"]";
-        Map<String, Integer> resultMap = new HashMap<>();
+                log.error("获取事项数量异常！params:{},重试:{}次", JSON.toJSONString(params), reCount, e);
+                reCount++;
                 try {
-            Document dom = Jsoup.connect(url)
-                    .ignoreContentType(true)
-                    .ignoreHttpErrors(true)
-                    .data(params).get();
-            Elements elements = dom.selectXpath(matterTotalExp);
-            if (elements.size() > 0) {
-                Integer total = elements.get(0) == null ? 0 : DataUtil.converStr2Int(elements.get(0).attr("value"), 0);
-                resultMap.put("total", total);
+                    Thread.sleep(2000);
+                } catch (InterruptedException interruptedException) {
                 }
-
-            elements = dom.selectXpath(matterPageExp);
-            if (elements.size() > 0) {
-                Integer pageNum = elements.get(0) == null ? 0 : DataUtil.converStr2Int(elements.get(0).attr("value"), 0);
-                resultMap.put("pageNum", pageNum);
             }
-
-        } catch (Exception e) {
-            log.error("获取事项数量异常！params:" + JSON.toJSONString(params), e);
-            return Rest.fail(e.getMessage());
         }
 
         return Rest.ok(resultMap);
     }
 
+
     public static Rest<List<MatterEntity>> getMatterList(Map<String, String> params, String url) {
         String matterListExp = "//div[@class=\"sx_list\"]//span[1]";
         String matterListLiExp = "//div[@class=\"sx_list\"]//li/a[1]";
@@ -91,9 +71,15 @@ public class MatterHtmlParseUtil {
         String evaluationUrl = "";
         String netApplyUrl = "";
         String href = "";
+
+        int reCount = 0;
+        while (reCount < MAX_RETRY_COUNT) {
             try {
-            Document dom = Jsoup.connect(url).data(params).get();
-            //System.out.println(dom.html());
+                Document dom = Jsoup.connect(url)
+                        .ignoreContentType(true)
+                        .ignoreHttpErrors(true)
+                        .timeout(60 * 1000)
+                        .data(params).get();
                 Elements elements = dom.selectXpath(matterListExp);
 
                 for (int i = 0; i < elements.size(); i++) {
@@ -160,7 +146,7 @@ public class MatterHtmlParseUtil {
 
                             if ("办事指南".equals(tempElement.text().trim())) {
                                 String onclick = tempElement.attr("onclick");
-                           if(ObjectUtils.isEmpty(onclick)) continue;
+                                if (ObjectUtils.isEmpty(onclick)) continue;
                                 List<String> list = ReUtil.findAllGroup0("'(.*?)'", onclick);
                                 if (list.size() > 1) {
                                     href = StrUtil.subBetween(list.get(0), "'", "'");
@@ -188,10 +174,14 @@ public class MatterHtmlParseUtil {
                 }
 
             } catch (Exception e) {
-            log.error("获取列表异常！params:" + JSON.toJSONString(params), e);
-            return Rest.fail(e.getMessage());
+                log.error("获取列表异常！params:{},重试:{}次", JSON.toJSONString(params), reCount, e);
+                reCount++;
+                try {
+                    Thread.sleep(2000);
+                } catch (InterruptedException interruptedException) {
+                }
+            }
         }
-
         return Rest.ok(matterEntityList);
     }
 
@@ -220,10 +210,13 @@ public class MatterHtmlParseUtil {
     public static Rest<Map<String, String>> syncDeptBySiteId(Map<String, String> params, String url) {
         String deptListExp = "//ul[@class='bm-list']//li";
         Map<String, String> map = new HashMap<>();
+        int reCount = 0;
+        while (reCount < MAX_RETRY_COUNT) {
             try {
             Document dom = Jsoup.connect(url)
                     .ignoreContentType(true)
                     .ignoreHttpErrors(true)
+                    .timeout(60 * 1000)
                     .data(params).get();
             Elements elements = dom.selectXpath(deptListExp);
             for (int i = 0; i < elements.size(); i++) {
@@ -238,7 +231,13 @@ public class MatterHtmlParseUtil {
                 map.put(deptCode, deptName);
             }
         }  catch (Exception e) {
-            return Rest.fail(e.getMessage());
+                log.error("当前站点同步添加部门异常！params:{},重试:{}次", JSON.toJSONString(params), reCount, e);
+                reCount++;
+                try {
+                    Thread.sleep(2000);
+                } catch (InterruptedException interruptedException) {
+                }
+            }
         }
 
         return Rest.ok("当前站点同步添加部门成功！", map);
@@ -248,9 +247,9 @@ public class MatterHtmlParseUtil {
     public static void main(String[] args) {
         String url = "http://www.sczwfw.gov.cn/jiq/interface/item/tags";
         HashMap<String, String> params = new HashMap<>();
-        params.put("dxType", "54");
-        params.put("areaCode", "511503003999");
-        params.put("deptCode", "");
+        params.put("dxType", "6");
+        params.put("areaCode", "511523000000");
+        params.put("deptCode", "2632");
         params.put("searchtext", "");
         params.put("pageno", "1");
         params.put("taskType", "");
@@ -258,6 +257,10 @@ public class MatterHtmlParseUtil {
 
         System.out.println(rest.getData().size());
 
+
+        //{"searchtext":"","areaCode":"511523000000","taskType":"","dxType":"6","deptCode":"2632"}
+
+
 /*        HashMap<String, String> params = new HashMap<>();
 
         params.put("areaCode", "510116000000");

base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterExtServiceImpl.java

@@ -127,26 +127,13 @@ public class MatterExtServiceImpl extends AbstractCRUDServiceImpl<MatterExtDao,
             matterList = matterService.getDao().getMatterListByAreaCode(matterQuery.areaCode(siteEntity.getAreaCode()));
         }
         log.info("开始更新事项详细！");
-
-       // List<MatterEntity> updateList = new ArrayList<>();
-
         for (MatterEntity matterEntity : matterList) {
             Rest<String> rest = matterService.buildMatterDetail(matterEntity, null);
             if (rest.getCode() == YesNoEnum.YES.getValue()) {
                 matterEntity.setUpdateTime(new Date());
-               // updateList.add(matterEntity);
-                //  log.info("id==>{} matterEditon==>{}",matterEntity.getId(),matterEntity.getMatterEdition());
                    matterService.update(matterEntity, null);
             }
         }
-      /*  if (!ObjectUtils.isEmpty(updateList)) {
-            log.info("更新事项详细==》{}", updateList.size());
-            List<List<MatterEntity>> partition = Lists.partition(updateList, 50);
-            for (List<MatterEntity> matterEntityList : partition) {
-                matterService.update(matterEntityList, null);
-            }
-        }*/
-
         return Rest.ok();
     }