修改同步事项

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

@@ -1027,13 +1027,13 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
     public Rest<String> buildMatterDetail(MatterEntity matterEntity, Context context) {
         //根据事项url 获取事项详细信息，构建相关详细信息
         // String html = null;
-        Boolean bool = false;
+        //Boolean bool = false;
         String msg = "";
         int reCount = 0;
         while (reCount < MAX_RETRY_COUNT) {
             try {
                 if (ObjectUtils.isEmpty(matterEntity.getUrl())) {
-                    bool = true;
+                   // bool = true;
                     msg = "事项url不能为空!";
                     break;
                     //return Rest.fail("事项url不能为空!");
@@ -1061,7 +1061,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
                 Integer matterEditionRemote = DataUtil.converStr2Int(baseInfoMap.getOrDefault("事项版本", "0"), 0);
 
                 if (matterEditionLocal >= matterEditionRemote) {
-                    bool = true;
+                    //bool = true;
                     msg = "本地事项版本大于等于远端，不需要更新！!";
                     break;
                     // return Rest.fail("本地事项版本大于等于远端，不需要更新！");
@@ -1101,6 +1101,8 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
 
                 matterEntity.setMatterEdition(matterEditionRemote+"");
 
+                return Rest.ok("更新详细成功！");
+
             } catch (SocketTimeoutException readTimeoutException) {
                 log.info("请求超时，休眠后重试");
                 reCount++;
@@ -1124,16 +1126,18 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
                 }
             } catch (Exception e) {
                 log.error(String.format("获取详细异常! id:%s,matterCode:%s,url:%s", matterEntity.getId(), matterEntity.getMatterNo(), matterEntity.getUrl()), e);
-                bool = true;
+                //bool = true;
                 msg = e.getMessage();
                 break;
                 // return Rest.fail("更新事项失败！" + e.getMessage());
             }
         }
-        return Rest.ok("更新详细成功！");
+
+        return Rest.fail(msg);
 /*        if (bool) {
             return Rest.fail(msg);
         } else {
+            return Rest.ok("更新详细成功！");
         }*/
 
     }