同步数据代码修改

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -17,10 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.utils.StringUtils;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
+import java.util.regex.Pattern;
 
 import static java.lang.System.in;
 
@@ -82,14 +80,14 @@ public class RyTask {
             isRun = true;
             //从自治区同步项目信息
             this.syncSubInfo();
-            //同步自治区前期手续信息
+//            //同步自治区前期手续信息
             this.syncPreNew();
-            //同步住建局手续
+//           //同步住建局手续
             this.syncDoc();
             this.syncDocLog();
-            //从公共资源交易中心同步招投标信息
-            this.syncTender();
 //            //从公共资源交易中心同步招投标信息
+            this.syncTender();
+//           //从公共资源交易中心同步招投标信息
             this.syncTenderLog();
             isRun = false;
         }
@@ -153,6 +151,9 @@ public class RyTask {
                 docLogService.saveOrUpdate(doc);
                 continue;
             }
+//            if (doc.getDocName().contains("-")){
+//                doc.setDocName(doc.getDocName().split("-")[0]);
+//            }
             try {
                 if (subInfoService.SyncDocLog(doc, company)) {
                     doc.setIsHandle("2");
@@ -186,10 +187,10 @@ public class RyTask {
         }
 
         for (SubDoc doc : list) {
-            if(doc.getCode().split("-").length!=5){
-                doc.setIsHandle("2");
-                subDocService.saveOrUpdate(doc);
-                continue;
+            String code = doc.getCode();
+            String[] parts = code.split("-");
+            if (parts.length >= 5) {
+                doc.setCode(String.join("-", Arrays.copyOfRange(parts, 0, 5)));
             }
             try {
                 if (subInfoService.syncDoc(doc, company)) {
@@ -264,6 +265,14 @@ public class RyTask {
             syncLogService.remove(new LambdaQueryWrapper<SyncLog>().eq(SyncLog::getCat, "1"));
         }
         for (Sub sub : list) {
+            if (sub.getProjectid().contains("X")||sub.getProjectid().contains("x")){
+                continue;
+            }
+            String prefix = sub.getProjectid().substring(0, 4);
+            String regex = "^\\d{2}(0[1-9]|1[0-2])"; // 两位数字年份，后接两位数字月份
+            if (!Pattern.matches(regex,prefix)){
+                continue;
+            }
             try {
                 if (subInfoService.syncSubInfo(sub, company)) {
                     sub.setIsHandle("2");

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SubInfoServiceImpl.java

@@ -444,6 +444,7 @@ public class SubInfoServiceImpl extends ServiceImpl<SubInfoMapper, SubInfo> impl
         if (lstSubInfo == null || lstSubInfo.size() == 0) {
             lstSubInfo = subInfoMapper.selectList(new LambdaQueryWrapper<SubInfo>().eq(SubInfo::getSubCode, document.getCode()));
         }
+
         if (lstSubInfo.size() > 0) {
             for (SubInfo subInfo : lstSubInfo) {
                 SubPreFlow flow = null;
@@ -712,7 +713,7 @@ public class SubInfoServiceImpl extends ServiceImpl<SubInfoMapper, SubInfo> impl
             }
             SyncLog log = new SyncLog();
             log.setCat("3").setId(UUID.randomUUID().toString()).setCompany(company).setContent(JSONUtil.toJsonStr(tenderLog)).setState("2");
-            log.setCreateTime(DateUtil.date()).setIsHandle("2").setRemark(String.format("同步前期办理手续审批记录:项目名称【%s】和项目代码【%s】未找到,手续【%s】已同步", tenderLog.getTitle(), tenderLog.getCode(), "招标投标"));
+            log.setCreateTime(DateUtil.date()).setIsHandle("2").setRemark(String.format("同步前期办理手续审批记录:项目名称【%s】和项目代码【%s】已找到,手续【%s】已同步", tenderLog.getTitle(), tenderLog.getCode(), "招标投标"));
             syncLogMapper.insert(log);
         } else {
             //将需要手动处理的放入到正式库里面