完整同步数据代码修改1

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

@@ -63,6 +63,8 @@ public class RyTask {
 
     @Autowired
     private ISyncVisitService visitService;
+    @Autowired
+    private IDocLogService docLogService;
 
     public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) {
         System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
@@ -83,7 +85,12 @@ public class RyTask {
             //同步自治区前期手续信息
             this.syncPreNew();
             //同步住建局手续
-           // this.syncDoc();
+            this.syncDoc();
+            this.syncDocLog();
+            //从公共资源交易中心同步招投标信息
+            this.syncTender();
+//            //从公共资源交易中心同步招投标信息
+            this.syncTenderLog();
             isRun = false;
         }
 /*        //同步自治区前期手续信息
@@ -127,7 +134,42 @@ public class RyTask {
         //任务处理成功,没有返回异常将记录置为已处理
         System.out.println("执行无参方法");
     }
+    private void syncDocLog() {
+        String company = "住建局";
+        List<DocLog> list = new ArrayList<>();
+        try {
+            list = docLogService.listTask();
+        } catch (Exception ex) {
+            System.out.println("数据查询异常" + ex.getMessage());
+        }
 
+        if (list.size() > 0) {
+            //删除之前的同步日志
+            syncLogService.remove(new LambdaQueryWrapper<SyncLog>().eq(SyncLog::getCat, "4").eq(SyncLog::getCompany, company).ne(SyncLog::getState,"2"));
+        }
+        for (DocLog doc : list) {
+            if(doc.getCode().split("-").length!=5){
+                doc.setIsHandle("2");
+                docLogService.saveOrUpdate(doc);
+                continue;
+            }
+            try {
+                if (subInfoService.SyncDocLog(doc, company)) {
+                    doc.setIsHandle("2");
+                    docLogService.saveOrUpdate(doc);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                SyncLog log = new SyncLog();
+                log.setCat("5").setId(UUID.randomUUID().toString()).setContent(JSONUtil.toJsonStr(doc)).setState("3").setInfo(e.getMessage());
+                log.setCreateTime(DateUtil.date()).setCompany(company).setIsHandle("1").setRemark(String.format("同步前期办理手续异常:项目名称【%s】和项目代码【%s】,手续【%s】", doc.getCode(), doc.getCode(), doc.getDocName()));
+                syncLogService.saveOrUpdate(log);
+                System.out.println("执行同步前期手续办理情况异常" + e.getMessage());
+            }
+        }
+        //任务处理成功,没有返回异常将记录置为已处理
+        System.out.println("执行无参方法");
+    }
 
     private void syncDoc() {
         String company = "住建局";

ruoyi-system/src/main/java/com/ruoyi/system/domain/DocLog.java

@@ -11,7 +11,7 @@ import java.util.Date;
 
 
 @Data
-@TableName("zjj_doc_log")
+@TableName("zjj_doc_check")
 public class DocLog {
 
     @TableId(value = "id", type = IdType.UUID)
@@ -44,8 +44,8 @@ public class DocLog {
 
     private String remark;
 
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
+//    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+//    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+//    private Date createTime;
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/SubPreLog.java

@@ -21,7 +21,7 @@ public class SubPreLog {
 
 
     //三方平台账号
-    private String otherId;
+    private String createUserId;
 
     //操作内容
     private String content;

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

@@ -546,7 +546,7 @@ public class SubInfoServiceImpl extends ServiceImpl<SubInfoMapper, SubInfo> impl
                     syncLogMapper.insert(log);
                     return false;
                 }
-                SubPreLog subPreLog = subPreLogMapper.selectOne(new LambdaQueryWrapper<SubPreLog>().eq(SubPreLog::getOtherId, tenderLog.getLsh()));
+                SubPreLog subPreLog = subPreLogMapper.selectOne(new LambdaQueryWrapper<SubPreLog>().eq(SubPreLog::getCreateUserId, tenderLog.getLsh()));
                 boolean isUpdate = true;
                 if (subPreLog == null) {
                     isUpdate = false;
@@ -555,7 +555,7 @@ public class SubInfoServiceImpl extends ServiceImpl<SubInfoMapper, SubInfo> impl
                 }
                 subPreLog.setCat(tenderLog.getCat());
                 subPreLog.setSubId(subInfo.getId());
-                subPreLog.setOtherId(tenderLog.getLsh());
+                subPreLog.setCreateUserId(tenderLog.getLsh());
                 subPreLog.setOpDate(tenderLog.getOpDate());
                 subPreLog.setContent(tenderLog.getContent());
                 subPreLog.setFlowId(flow.getId());