1.平均风速数据减去1.5调整

wrdep-biz/src/main/java/com/jiayue/biz/service/impl/WindTowerDataParentTableServiceImpl.java

@@ -16,6 +16,7 @@ import com.jiayue.biz.util.CalculationUtil;
 import com.jiayue.biz.util.CommonUtil;
 import com.jiayue.biz.util.DateTimeUtil;
 import com.jiayue.biz.util.FileUtil;
+import com.jiayue.common.core.text.Convert;
 import com.jiayue.common.utils.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -130,6 +131,10 @@ public class WindTowerDataParentTableServiceImpl extends ServiceImpl<WindTowerDa
             ProphaseAnemometryData one = new ProphaseAnemometryData();
             //组装子表数据
             one.setWsAve(m.get("wsAve_" + height) == null ? null : CalculationUtil.getBigDecimal(m.get("wsAve_" + height)).setScale(2, RoundingMode.HALF_UP).floatValue());
+
+            dealWsAveDataByLimit(one,equipmentId);
+
+
             one.setWsMin(m.get("wsMin_" + height) == null ? null : CalculationUtil.getBigDecimal(m.get("wsMin_" + height)).setScale(2, RoundingMode.HALF_UP).floatValue());
             one.setWsMax(m.get("wsMax_" + height) == null ? null : CalculationUtil.getBigDecimal(m.get("wsMax_" + height)).setScale(2, RoundingMode.HALF_UP).floatValue());
             one.setWsSta(m.get("wsSta_" + height) == null ? null : CalculationUtil.getBigDecimal(m.get("wsSta_" + height)).setScale(2, RoundingMode.HALF_UP).floatValue());
@@ -222,6 +227,20 @@ public class WindTowerDataParentTableServiceImpl extends ServiceImpl<WindTowerDa
     }
 
     /**
+     * 声雷达数据略高，进行相应处理
+     * @param one
+     * @param equipmentId
+     */
+    private void dealWsAveDataByLimit(ProphaseAnemometryData one, String equipmentId) {
+        String xiangmu2WindTower = "202101034,202101047,202101055,202301008,202301016,202101029,202101009";
+        if(xiangmu2WindTower.contains(equipmentId)){
+           if( one.getWsAve()>=1.5){
+               one.setWsAve(one.getWsAve()-1.5f);
+           }
+        }
+    }
+
+    /**
      * 组装数据
      *
      * @param allData     数据

wrdep-biz/src/test/java/service/TDengineTest.java

@@ -376,6 +376,7 @@ public class TDengineTest {
                             ProphaseAnemometryData one = new ProphaseAnemometryData();
                             //组装子表数据
                             one.setWsAve(!m.containsKey("ws_ave" + height) ? null : CalculationUtil.getBigDecimal(m.get("ws_ave" + height)).setScale(2, RoundingMode.HALF_UP).floatValue());
+
                             one.setWsMax(!m.containsKey("ws_max" + height) ? null : CalculationUtil.getBigDecimal(m.get("ws_max" + height)).setScale(2, RoundingMode.HALF_UP).floatValue());
                             one.setWsMin(!m.containsKey("ws_min" + height) ? null : CalculationUtil.getBigDecimal(m.get("ws_min" + height)).setScale(2, RoundingMode.HALF_UP).floatValue());
                             one.setWsSta(!m.containsKey("ws_sta" + height) ? null : CalculationUtil.getBigDecimal(m.get("ws_sta" + height)).setScale(2, RoundingMode.HALF_UP).floatValue());