fix:fixbug

src/main/java/com/tykj/transfer/slave_service/impl/Biz088DcBranchTrainStatisticsImpl.java

@@ -30,9 +30,12 @@ import javax.transaction.Transactional;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -68,12 +71,13 @@ public class Biz088DcBranchTrainStatisticsImpl implements Biz088DcBranchTrainSta
         List<Biz088DcBranchTrainStatistics> rs = new ArrayList<>();
         List<YlBranchTrainStatistics> listVo = new ArrayList<>();
         Date date = new Date();
+        String yyyyMMdd = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
         for (BranchesVo branchesVo : branchesList) {
             Biz088DcBranchTrainStatistics VO = new Biz088DcBranchTrainStatistics();
             YlBranchTrainStatistics ylBranchTrainStatistics = new YlBranchTrainStatistics();
             VO.setBranchName(branchesVo.getName());
             Branches allByName = branchesDao.findAllByName(branchesVo.getName()).get(0);
-            VO.setId(allByName.getId() + "");
+            VO.setId(yyyyMMdd + allByName.getId());
             VO.setRegionCode(allByName.getArea());
             List<Activity> allByBranchId = activitiesDao.findAllByBranchId(allByName.getId());
             Long activityApplyCount = 0L;

src/main/java/com/tykj/transfer/slave_service/impl/Biz088DcNetworkStatisticsImpl.java

@@ -77,7 +77,7 @@ public class Biz088DcNetworkStatisticsImpl implements Biz088DcNetworkStatisticsS
             //计数
             i++;
             if (i % 100 == 0) {
-                log.info("{}/{}", i / total);
+                log.info("{}/{}", i , total);
             }
 
         }

src/main/java/com/tykj/transfer/slave_service/impl/Biz088DcTrainStatisticsImpl.java

@@ -17,6 +17,8 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.transaction.Transactional;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -45,6 +47,8 @@ public class Biz088DcTrainStatisticsImpl implements Biz088DcTrainStatisticsServi
         List<Biz088DcTrainStatistics> rs = new ArrayList<>();
         List<YlTrainStatistics> localList=new ArrayList<>();
         Date date = new Date();
+        String yyyyMMdd = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+
         String s = stringRedisTemplate.opsForValue().get("330000YlTotal");
         PageVo pageVo = JSON.parseObject(String.valueOf(s), PageVo.class);
         Biz088DcTrainStatistics provinceVo = new Biz088DcTrainStatistics();
@@ -65,6 +69,7 @@ public class Biz088DcTrainStatisticsImpl implements Biz088DcTrainStatisticsServi
         provinceVo.setLoadTime(date);
         provinceVo.setTongTime(date);
         provinceVo.setTongId(0L);
+
         YlTrainStatistics localProvince=new YlTrainStatistics();
         BeanUtils.copyProperties(provinceVo,localProvince);
         List<RegionModelDo> regionVoList = regionModelRepository.getRegionVo("330000");
@@ -125,10 +130,10 @@ public class Biz088DcTrainStatisticsImpl implements Biz088DcTrainStatisticsServi
         rs.add(provinceVo);
         localList.add(localProvince);
         for (Biz088DcTrainStatistics r : rs) {
-            r.setId(r.getRegionCode());
+            r.setId(yyyyMMdd + r.getRegionCode());
         }
         for (YlTrainStatistics ylTrainStatistics : localList) {
-            ylTrainStatistics.setId(ylTrainStatistics.getRegionCode());
+            ylTrainStatistics.setId(yyyyMMdd + ylTrainStatistics.getRegionCode());
         }
         biz088DcTrainStatisticsDao.saveAll(rs);
         ylTrainStatisticsDao.saveAll(localList);

src/main/java/com/tykj/transfer/slave_service/impl/Biz088DcVolunteerStatisticsImpl.java

@@ -17,6 +17,8 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.transaction.Transactional;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -41,6 +43,8 @@ public class Biz088DcVolunteerStatisticsImpl implements Biz088DcVolunteerStatist
     @Override
 //    @Transactional
     public void transferVolunteer() {
+        String yyyyMMdd = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+
         String s = stringRedisTemplate.opsForValue().get("330000YlTotal");
         List<Biz088DcVolunteerStatistics> rs=new ArrayList<>();
         List<YlVolunteerStatistics> localList=new ArrayList<>();
@@ -111,10 +115,10 @@ public class Biz088DcVolunteerStatisticsImpl implements Biz088DcVolunteerStatist
             }
         }
         for (Biz088DcVolunteerStatistics r : rs) {
-            r.setId(r.getRegionCode());
+            r.setId(yyyyMMdd + r.getRegionCode());
         }
         for (YlVolunteerStatistics ylVolunteerStatistics : localList) {
-            ylVolunteerStatistics.setId(ylVolunteerStatistics.getRegionCode());
+            ylVolunteerStatistics.setId(yyyyMMdd + ylVolunteerStatistics.getRegionCode());
         }
         biz088DcVolunteerStatisticsDao.saveAll(rs);
         ylVolunteerStatisticsDao.saveAll(localList);