江津数据采集 增加历史数据采集, 增加采集任务机制

dc3-gateway/src/main/java/io/github/pnoker/gateway/bizmgr/KprJiangjinWaterBizfun.java

@@ -12,6 +12,7 @@ import org.influxdb.dto.Point;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import java.math.BigDecimal;
 import java.time.*;
@@ -26,6 +27,8 @@ import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import static io.github.pnoker.gateway.comtool.jiangjinThread.KafkaConsumer.convertCubicMetersToLiters;
+
 /**
  * @ClassName KprJiangjinWaterBizfun
  * @Description: TODO
@@ -99,6 +102,19 @@ public class KprJiangjinWaterBizfun {
                 }else{
                     pointBuilder.addField(newKey, (String.valueOf(value)) );
                 }
+                if(newKey.equals("flow_l_cur")||newKey.equals("flow_l_total_pos")){
+                    pointBuilder.addField(newKey,  Double.valueOf(ObjectUtils.isEmpty(value)?"0.0":value.toString()));
+                    if(newKey.equals("flow_l_cur")){
+                        pointBuilder.addField(newKey,  Double.valueOf(ObjectUtils.isEmpty(value)?"0.0"
+                                :convertCubicMetersToLiters(Double.valueOf(value.toString()))));
+                        pointBuilder.addField("flow_cur",  Double.valueOf(ObjectUtils.isEmpty(value)?"0.0":value.toString()));
+                    }
+                    if(newKey.equals("flow_l_total_pos")){
+                        pointBuilder.addField(newKey,  Double.valueOf(ObjectUtils.isEmpty(value)?"0.0"
+                                :convertCubicMetersToLiters(Double.valueOf(value.toString()))));
+                        pointBuilder.addField("flow_total_pos",  Double.valueOf(ObjectUtils.isEmpty(value)?"0.0":value.toString()));
+                    }
+                }
                 break;
             }
         }