新增首页显示月总用水量和日总用水量及每个设备用水量占比

新增统计分析->供水量报表
新增分时用水统计增加按照分区统计数据同能
新增夜间流量报警信息推送

mysy-gis/src/main/java/com/tofly/xrtygis/controller/IndicatorCorrectionController.java

@@ -14,6 +14,7 @@ import com.tofly.xrtygis.service.DmaregionService;
 import com.tofly.xrtygis.service.IndicatorCorrectionService;
 import com.tofly.xrtygis.service.NoiseJobService;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -126,17 +127,31 @@ public class IndicatorCorrectionController {
             @ApiImplicitParam(name = "reviseDate", value = "统计日期 yyyy-MM-dd 统计当前日期各指标", required = true, dataType = "String")
     })
     public ResultRespone leakageRateCalculate(String  reviseDate) {
-        LocalDate localDate1 = DateTimeUtil.fromString2LocalDate(reviseDate, DateTimeUtil.DAY_FORMAT);
-        Date localDate = DateTimeUtil.localDateToDate(localDate1);
-        return ResultRespone.success(indicatorCorrectionService.leakageRateCalculate(localDate));
+        try {
+            LocalDate localDate1 = DateTimeUtil.fromString2LocalDate(reviseDate, DateTimeUtil.DAY_FORMAT);
+            Date localDate = DateTimeUtil.localDateToDate(localDate1);
+            indicatorCorrectionService.leakageRateCalculate(localDate);
+
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResultRespone.failed(e.getMessage());
+        }
+        return ResultRespone.success();
+
     }
     @GetMapping("/test" )
     @ApiOperation(value = "测试111")
 
     public ResultRespone noiseJobServices(String  reviseDate) {
-        LocalDate localDate1 = DateTimeUtil.fromString2LocalDate(reviseDate, DateTimeUtil.DAY_FORMAT);
-        Date localDate = DateTimeUtil.localDateToDate(localDate1);
-        indicatorCorrectionService.totalCalculate(localDate);
+        try {
+            LocalDate localDate1 = DateTimeUtil.fromString2LocalDate(reviseDate, DateTimeUtil.DAY_FORMAT);
+            Date localDate = DateTimeUtil.localDateToDate(localDate1);
+            indicatorCorrectionService.totalCalculate(localDate);
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResultRespone.failed(e.getMessage());
+        }
+
         return ResultRespone.success();
     }
 

mysy-scada/src/main/java/com/tofly/scada/service/ScadaSynHisService.java

@@ -6,6 +6,7 @@ package com.tofly.scada.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.tofly.scada.entity.ScadaSynHis;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
@@ -19,5 +20,6 @@ import java.util.List;
  */
 public interface ScadaSynHisService extends IService<ScadaSynHis> {
 
+    List<String> getSynCodeList(String type);
     public void synchronousThirdParty(List<String> codes);
 }

mysy-scada/src/main/java/com/tofly/scada/service/impl/ScadaApplicationRunner.java

@@ -50,7 +50,7 @@ public class ScadaApplicationRunner implements ApplicationRunner {
     @Override
     public void run(ApplicationArguments args) throws Exception {
         //进行scada实时表记录
-        autoMonitoringData();
+//        autoMonitoringData();
         //月份数据中断补偿操作
 //        autoMouthScada(null);
     }

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

@@ -21,6 +21,7 @@ import com.tofly.scada.mapper.ScadaMapper;
 import com.tofly.scada.mapper.ScadaReportMapper;
 import com.tofly.scada.service.ScadaLjFlowService;
 import com.tofly.scada.service.ScadaService;
+import com.tofly.scada.service.ScadaSynHisService;
 import com.tofly.scada.service.StatisticsScadaService;
 import com.tofly.scada.util.DateTimeUtil;
 import com.tofly.scada.util.SendTidingsUtil;
@@ -87,6 +88,8 @@ public class ScadaServiceImpl extends ServiceImpl<ScadaMapper, Scada> implements
     @Autowired
     private ScadaLjFlowService scadaLjFlowService;
 
+    @Autowired
+    private ScadaSynHisService scadaSynHisService;
 
     /**
      * 根据当前时间动态自动创建月份表，创建完成之后返回表名
@@ -1659,5 +1662,13 @@ public class ScadaServiceImpl extends ServiceImpl<ScadaMapper, Scada> implements
 
         log.info("累计流量差值处理(5分钟求值) 更新完成");
     }
+    // 每日 6点 15点执行
 
+    @Scheduled(cron = "0 0 6,15 * * ? ")
+    public void automaticSynchronousThirdParty(){
+        // 获取对应第三方同步指标列表
+        List<String> synCodeList = scadaSynHisService.getSynCodeList("0");
+        log.info("同步第三方指标列表{}",synCodeList);
+        scadaSynHisService.synchronousThirdParty(synCodeList);
+    }
 }

mysy-scada/src/main/java/com/tofly/scada/service/impl/ScadaSynHisServiceImpl.java

@@ -71,15 +71,13 @@ public class ScadaSynHisServiceImpl extends ServiceImpl<ScadaSynHisMapper, Scada
 
     @Value("${syn.type}")
     private String type;
-    // 每日 6点 15点执行
-    @Scheduled(cron = "0 0 6,15 * * ? ")
-    public void automaticSynchronousThirdParty(){
-        // 获取对应第三方同步指标列表
-        List<String> synCodeList = baseMapper.getSynCodeList(type);
-        synchronousThirdParty(synCodeList);
-    }
 
 
+    @Override
+    public List<String> getSynCodeList(String type) {
+        return baseMapper.getSynCodeList(type);
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void synchronousThirdParty(List<String> codes) {
@@ -108,7 +106,10 @@ public class ScadaSynHisServiceImpl extends ServiceImpl<ScadaSynHisMapper, Scada
             if(1==status){
                 // 批量更新推送数据同步状态
                 List<Long> collect = scadaSynHisList.stream().map(Scada::getId).collect(Collectors.toList());
-                baseMapper.updateBatchSynFlag(collect);
+                if(collect.size()>0){
+                    baseMapper.updateBatchSynFlag(collect);
+                }
+
             }else {
                 // 记录异常,返回失败
                 log.error("新天第三方同步异常:{}",jsonObject.toJSONString());

mysy-scada/src/main/resources/mapper/ScadaSynHisMapper.xml

@@ -11,7 +11,7 @@
     </resultMap>
 
     <select id="getSynCodeList" resultType="string">
-        select code from SCADA_SYN_HIS_SYS where type = #{type}
+        select code from SCADA_SYN_HIS_SYS
     </select>
 
     <select id="getScadaSynHisList" resultType="com.tofly.scada.entity.Scada">