代码优化

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/WdRedisStoreage.java

@@ -131,7 +131,7 @@ public class WdRedisStoreage {
                     Console.print("{}当前进度：{} {}/{}", '\r', StrUtil.repeat('#', (int) (50 * (cursor.getCurrentIndex() + 1) / total)), cursor.getCurrentIndex() + 1, total);
 
                     RedisUtils.getClient().getGeo(wdInfo.getAddrCode().substring(0, 4)).add(wdInfo.getLng().doubleValue(), wdInfo.getLat().doubleValue(), wdInfo.getWdId());
-                    wdTagAnalyse(wdInfo);
+
                     //存入已处理网点的时间
                     RedisUtils.setCacheObject(RedisContant.WD_TAG_LASTTIME, DateUtil.formatDateTime(wdInfo.getCollectTime()));
                 }

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/statistics/AttentionPoolStat.java

@@ -1,6 +1,10 @@
 package com.ruoyi.demo.utils.statistics;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Console;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.demo.entity.AttentionPoolStatistics;
 import com.ruoyi.demo.mapper.AttentionPoolDao;
 import com.ruoyi.demo.mapper.AttentionPoolStatisticsDao;
@@ -25,16 +29,23 @@ public class AttentionPoolStat {
 
     public void insert() {
         List<String> ins = poolDao.selectAllUser();
-        for (String userId : ins) {
+        for (int i = 0; i < ins.size(); i++) {
+            String userId = ins.get(i);
             AttentionPoolStatistics statistics = new AttentionPoolStatistics();
-            statistics.setStatId(UUID.randomUUID().toString().replace("-", ""));
+            statistics.setStatId(IdUtil.getSnowflakeNextIdStr());
             statistics.setAttentionCount(poolDao.selectCount(userId));
             statistics.setClueCount(opportunitiesDao.selectCount(userId));
             statistics.setOnlineCount(followUpDao.selectCountByWay(userId, "线上电话"));
             statistics.setOfflineCount(followUpDao.selectCountByWay(userId, "实地考察"));
             statistics.setUserId(userId);
             statistics.setStatTime(DateUtil.date());
+
+            //先删除旧数据，再插入新数据
+            statisticsDao.delete(new LambdaQueryWrapper<AttentionPoolStatistics>().eq(AttentionPoolStatistics::getUserId, userId));
             statisticsDao.insert(statistics);
+
+            //打印进度条
+            Console.print("{}当前进度：{} {}/{}", '\r', StrUtil.repeat('#', 50 * (i + 1) / ins.size()), (i + 1), ins.size());
         }
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/statistics/BrandBusinessStat.java

@@ -1,5 +1,7 @@
 package com.ruoyi.demo.utils.statistics;
 
+import cn.hutool.core.lang.Console;
+import cn.hutool.core.util.StrUtil;
 import com.ruoyi.demo.entity.BrandBusiness;
 import com.ruoyi.demo.mapper.BrandBusinessDao;
 import com.ruoyi.demo.mapper.BrandZoneDao;
@@ -24,7 +26,8 @@ public class BrandBusinessStat {
         for (int i = 0; i < brandBusinesses.size(); i++) {
             BrandBusiness business = brandBusinesses.get(i);
             brandBusinessDao.insert(business);
-            System.out.println((i + 1) + "/" + total);
+            //打印进度条
+            Console.print("{}当前进度：{} {}/{}", '\r', StrUtil.repeat('#', 50 * i / total), i, total);
         }
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/statistics/BrandCityStat.java

@@ -1,6 +1,8 @@
 package com.ruoyi.demo.utils.statistics;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Console;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.demo.entity.Brand;
 import com.ruoyi.demo.entity.BrandCity;
@@ -41,7 +43,8 @@ public class BrandCityStat {
             String month = DateUtil.date().toString("yyyy-MM");
             List<BrandCity> cities = brandCityDao.searchByBrandIdOrderByCity(brand.getBrandId(), month);
             if (cities.isEmpty()) {
-                System.out.println(i + "/" + total);
+                //打印进度条
+                Console.print("{}当前进度：{} {}/{}", '\r', StrUtil.repeat('#', 50 * i / total), i, total);
                 continue;
             }
             for (BrandCity city : cities) {
@@ -50,7 +53,8 @@ public class BrandCityStat {
                 city.setUpdateTime(DateUtil.date());
             }
             brandCityDao.insertAll(cities);
-            System.out.println(i + "/" + total);
+            //打印进度条
+            Console.print("{}当前进度：{} {}/{}", '\r', StrUtil.repeat('#', 50 * i / total), i, total);
         }
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/statistics/BrandCityTierStat.java

@@ -1,5 +1,7 @@
 package com.ruoyi.demo.utils.statistics;
 
+import cn.hutool.core.lang.Console;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.demo.entity.AddrCategory;
 import com.ruoyi.demo.entity.BrandCityTier;
@@ -119,7 +121,8 @@ public class BrandCityTierStat {
                 total += brandZoneDao.selectTierCountByBrandIdAndCodes(brandId, map.get(tier));
                 tierMapper.insert(new BrandCityTier(brandId, tier, total));
             }
-            System.out.println(totalBrand + "/" + (i + 1));
+            //打印进度条
+            Console.print("{}当前进度：{} {}/{}", '\r', StrUtil.repeat('#', 50 * (i + 1) / totalBrand), (i + 1), totalBrand);
         }
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/statistics/BrandProvinceStat.java

@@ -1,6 +1,8 @@
 package com.ruoyi.demo.utils.statistics;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Console;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.demo.entity.Brand;
 import com.ruoyi.demo.entity.BrandProvince;
@@ -37,7 +39,8 @@ public class BrandProvinceStat {
             String month = DateUtil.date().toString("yyyy-MM");
             List<BrandProvince> provinces = brandProvinceDao.searchByBrandIdOrderByProvince(brand.getBrandId(), month);
             if (provinces.isEmpty()) {
-                System.out.println(i + "/" + total);
+                //打印进度条
+                Console.print("{}当前进度：{} {}/{}", '\r', StrUtil.repeat('#', 50 * i / total), i, total);
                 continue;
             }
             for (BrandProvince city : provinces) {
@@ -46,7 +49,8 @@ public class BrandProvinceStat {
                 city.setUpdateTime(DateUtil.date());
             }
             brandProvinceDao.insertAll(provinces);
-            System.out.println(i + "/" + total);
+            //打印进度条
+            Console.print("{}当前进度：{} {}/{}", '\r', StrUtil.repeat('#', 50 * i / total), i, total);
         }
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/statistics/BrandStat.java

@@ -1,6 +1,8 @@
 package com.ruoyi.demo.utils.statistics;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Console;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.demo.entity.Brand;
 import com.ruoyi.demo.entity.BrandBusiness;
@@ -74,7 +76,8 @@ public class BrandStat {
             statistics.setTotal(statistics.getBusinessCount() + statistics.getPauseBusinessCount() + statistics.getNoBusinessCount());
             statistics.setUpdateTime(DateUtil.date());
             index += brandStatisticsDao.insert(statistics);
-            System.out.println(index + "/" + total);
+            //打印进度条
+            Console.print("{}当前进度：{} {}/{}", '\r', StrUtil.repeat('#', 50 * index / total), index, total);
         }
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/statistics/BrandZoneStat.java

@@ -1,6 +1,8 @@
 package com.ruoyi.demo.utils.statistics;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Console;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.demo.entity.AddrCategory;
 import com.ruoyi.demo.entity.BrandZone;
@@ -46,7 +48,8 @@ public class BrandZoneStat {
             }
 
             i += brandZoneDao.insert(zone);
-            System.out.println(i + "/" + total);
+            //打印进度条
+            Console.print("{}当前进度：{} {}/{}", '\r', StrUtil.repeat('#', 50 * i / total), i, total);
         }
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/statistics/StoreWdOpcloseStat.java

@@ -1,5 +1,7 @@
 package com.ruoyi.demo.utils.statistics;
 
+import cn.hutool.core.lang.Console;
+import cn.hutool.core.util.StrUtil;
 import com.ruoyi.demo.entity.StoreWdOpclose;
 import com.ruoyi.demo.mapper.StoreWdOpcloseDao;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,7 +52,8 @@ public class StoreWdOpcloseStat {
                 storeWd.setStartTime(minTime);
                 storeWd.setEndTime(maxTime);
                 i += storeWdOpcloseDao.insert(storeWd);
-                System.out.println(i + "/" + total);
+                //打印进度条
+                Console.print("{}当前进度：{} {}/{}", '\r', StrUtil.repeat('#', 50 * i / total), i, total);
             }
         }