1.江津版本切换 , 数据采集优化

2.数据源配置优化 删除多余配置 优化配置流程
3.优化江津采集日志相关代码
4.自来水和江津采集增加重试机制

dc3-gateway/src/main/java/io/github/pnoker/gateway/comtool/ScheduleTaskMgr.java

@@ -496,7 +496,7 @@ public class ScheduleTaskMgr {
 
     //TODO 每小时的10分执行原始小时泵数据计算
     @Scheduled(cron = "0 10 * * * *")
-    public void checkPumpRecordAll(){
+    public void checkPumpRecordAll() {
         new Timer().schedule(new TimerTask() {
             @Override
             public void run() {
@@ -508,9 +508,9 @@ public class ScheduleTaskMgr {
         },5000);
     }
 
-    /**
-     * TODO 汤阴业务相关
-     */
+        /**
+         * TODO 汤阴业务相关
+         */
 //    @Resource(name = "infulxTyDbUtil")
 //    private InfulxTyDbUtil infulxTyDbUtil;
 //
@@ -548,5 +548,4 @@ public class ScheduleTaskMgr {
 //                " time >= " + startLong + " and time<=" + endLong + " ORDER BY time desc tz('Asia/Shanghai')";
 //        KprTangyinWaterBizFun.selectPressCollecation(queryInfluxdbSql);
 //    }
-
 }

dc3-gateway/src/main/java/io/github/pnoker/gateway/dbdao/zilaishuiSource/ZilaishuiRealListDao.java

@@ -58,7 +58,7 @@ public class ZilaishuiRealListDao {
                 try {
                     Thread.sleep(retryDelay);
                 } catch (InterruptedException ie) {
-                    Thread.currentThread().interrupt();
+//                    Thread.currentThread().interrupt();
                     return null;
                 }
             }
@@ -95,7 +95,7 @@ public class ZilaishuiRealListDao {
                 try {
                     Thread.sleep(retryDelay);
                 } catch (InterruptedException ie) {
-                    Thread.currentThread().interrupt();
+//                    Thread.currentThread().interrupt();
                     return null;
                 }
             }