add

src/main/java/com/zfire/jiasm/syncdata/download/basedata/GLPPGFWebsitWorker.java

@@ -111,16 +111,11 @@ public class GLPPGFWebsitWorker {
     // 品牌网点与平台网点有对应关系才会同步生成相应的网点数据
     @Scheduled(fixedDelayString = "${gfwww}")
     private void processData() {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         if (gfwwwc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 
-        Long startTime = System.currentTimeMillis();
-        log.info("同步师傅数据到到本地库: \uF0B7{}",sdf.format(new Date()));
         glppgfWebsitWorkerService.inputData();
-        Long endTime = System.currentTimeMillis();
-        log.info("同步师傅数据到到本地库结束耗时(毫秒): {}",endTime-startTime);
     }
 
 

src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPGFWebsitWorkerServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -70,21 +71,28 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void inputData(){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         // 提取所有的数据
         List<ItfTblWangdianWxgDownload> recs = new ArrayList<>();
         recs = itfTblWangdianWxgDownloadService.lambdaQuery().list();
 
+        Long startTime = System.currentTimeMillis();
+        log.info("同步师傅数据到到本地库: \uF0B7{}",sdf.format(new Date()));
+
         // 新增或修改师傅数据 worker:师傅信息表
         addWorker(recs);
 
+        Long endTime = System.currentTimeMillis();
+        log.info("同步师傅数据到到本地库结束耗时(毫秒): {}",endTime-startTime);
+
         // 新增网点师傅 websit_worker+商户网点师傅信息 存在修改，不存在新增
         addWebsitWorkerBrandAccountsInfo(recs);
         recs.clear();
     }
 
-    private void addWebsitWorkerBrandAccountsInfo(List<ItfTblWangdianWxgDownload> addRec) {
+    @Transactional(rollbackFor = Exception.class)
+    public void addWebsitWorkerBrandAccountsInfo(List<ItfTblWangdianWxgDownload> addRec) {
         // 新增网点师傅 websit_worker+商户网点师傅信息 存在修改，不存在新增
         Map<String,List<WebsitOrderSign>> websitOrderSignMap = new HashMap<>();
         Map<String, List<Worker>> workerIdCardMap = new HashMap<>();
@@ -647,7 +655,8 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         }
     }
 
-    private void addWorker(List<ItfTblWangdianWxgDownload> Recs) {
+    @Transactional(rollbackFor = Exception.class)
+    public void addWorker(List<ItfTblWangdianWxgDownload> Recs) {
         List<Worker> addWorkerRec = new ArrayList<>();
         // 新增的
         if (Recs.size()>0){