供水数据处理

hnls-scada/src/main/java/com/tofly/scada/controller/ScadaController.java

@@ -157,7 +157,7 @@ public class ScadaController extends BaseController {
         return decide("批量同步成功");
     }
 
-    @ApiOperation(value = "手动同步指定日期范围内每天的售水数据,注意时间格式，只需要年月日")
+    /*@ApiOperation(value = "手动同步指定日期范围内每天的售水数据,注意时间格式，只需要年月日")
     @PostMapping("/synSalesWater")
     public ResultRespone synSalesWater(
 
@@ -172,7 +172,7 @@ public class ScadaController extends BaseController {
             return decide(e.getMessage());
         }
         return decide("批量同步成功");
-    }
+    }*/
 
     @ApiOperation(value = "手动同步指定日期范围内每天的用户抄表数据,注意时间格式，只需要年月日")
     @PostMapping("/synOsmRecords")

hnls-scada/src/main/java/com/tofly/scada/handle/ScadaHandle.java

@@ -2,6 +2,7 @@ package com.tofly.scada.handle;
 
 import cn.hutool.core.date.DateUtil;
 import com.tofly.common.constant.CalendarHelper;
+import com.tofly.scada.service.OsmRecordsService;
 import com.tofly.scada.service.ScadaHistorySynService;
 import com.tofly.scada.service.impl.ScadaServiceImpl;
 import com.xxl.job.core.biz.model.ReturnT;
@@ -25,6 +26,9 @@ public class ScadaHandle {
     @Autowired
     private ScadaHistorySynService scadaHistorySynService;
 
+    @Autowired
+    private OsmRecordsService osmRecordsService;
+
 
     /**
      * 每月最后28日凌晨2点执行创建下个月的数据表
@@ -99,14 +103,16 @@ public class ScadaHandle {
         Calendar calendar = Calendar.getInstance();
         Date date = new Date();
         calendar.setTime(date);
+        String dateEndStr = CalendarHelper.getFormatDate(date,"yyyy-MM-dd");
         //延迟一天
-        calendar.add(Calendar.DAY_OF_MONTH, -1);
+        calendar.add(Calendar.DAY_OF_MONTH, -2);
         calendar.set(Calendar.HOUR_OF_DAY, 0);
         calendar.set(Calendar.MINUTE, 0);
         calendar.set(Calendar.SECOND, 0);
         calendar.set(Calendar.MILLISECOND, 0);
         String dateStr = CalendarHelper.getFormatDate(calendar.getTime(),"yyyy-MM-dd");
-        scadaService.synSalesWater(dateStr,dateStr); //天
+        osmRecordsService.synData(calendar.getTime(),date);
+
         return ReturnT.SUCCESS;
     }
 

hnls-scada/src/main/java/com/tofly/scada/service/ScadaService.java

@@ -79,10 +79,4 @@ public interface ScadaService extends IService<Scada> {
 
     void syncDaysData(String data,String codes);
 
-    /**
-     * 同步售水数据
-     * @param startStr
-     * @param endStr
-     */
-   void synSalesWater(String startStr,String endStr);
 }

hnls-scada/src/main/java/com/tofly/scada/service/impl/OsmRecordsServiceImpl.java

@@ -12,6 +12,7 @@ import com.tofly.scada.service.StatisticsScadaService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.xml.crypto.Data;
 import java.util.Date;
@@ -27,7 +28,7 @@ import java.util.List;
 public class OsmRecordsServiceImpl extends ServiceImpl<OsmRecordsMapper, OsmRecords> implements OsmRecordsService {
 
     @Override
-    @Async
+    @Transactional
     public void synData(Date start, Date end) {
         Long count=this.baseMapper.synDataCount(start,end);
         if(count>0){

hnls-scada/src/main/java/com/tofly/scada/service/impl/ScadaServiceImpl.java

@@ -487,56 +487,6 @@ public class ScadaServiceImpl extends ServiceImpl<ScadaMapper, Scada> implements
 
         }
 
-    @Async
-    @Override
-    public void synSalesWater(String startStr,String endStr){
-       List<String> dates=CalendarHelper.getDayBetweenDate(startStr,endStr,"yyyy-MM-dd");
-        ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(
-                6,
-                12,
-                480,
-                TimeUnit.SECONDS,
-                new LinkedBlockingQueue<>(1000),
-                (r) -> {
-                    Thread t = new Thread(r);
-                    t.setName("thread-" + ((int) (Math.random() * 1000)));
-                    return t;
-                },
-                new ThreadPoolExecutor.CallerRunsPolicy());
-
-        dates.forEach(item->{
-            threadPoolExecutor.execute(()-> synSalesWaterComm(item));
-            ;
-        });
-
-    }
-    /** 同步指定日期范围内，每天的售水数据
-     * @param dateStar yyyy-MM-dd
-     */
-    @Async
-    public  void synSalesWaterComm(String dateStar){
-        //整个日历调整时间
-        Calendar calendar = Calendar.getInstance();
-        Date date =CalendarHelper.ConvertStrToDate(dateStar,"yyyy-MM-dd");;
-
-        calendar.setTime(date);
-        calendar.set(Calendar.HOUR_OF_DAY, 0);
-        calendar.set(Calendar.MINUTE, 0);
-        calendar.set(Calendar.SECOND, 0);
-        calendar.set(Calendar.MILLISECOND, 0);
-        Date startTime = calendar.getTime();
-
-
-        calendar.set(Calendar.HOUR_OF_DAY, 23);
-        calendar.set(Calendar.MINUTE, 59);
-        calendar.set(Calendar.SECOND, 59);
-        calendar.set(Calendar.MILLISECOND, 999);
-        Date endTime = calendar.getTime();
-        osmRecordsService.synData(startTime,endTime);
-    }
-
-
-
     @Async
     public void syncDataCommNew(List<Allocation> allocationList, Date startTime, Date endTime, Integer type) {