理论功率异常值处理,曲线拟合请求处理

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/NewDataFittingService.java

@@ -305,7 +305,7 @@ public class NewDataFittingService {
 
         Map<String, Object> map = new HashMap<>();
         ProEconPowerFittingAnalySis obj = null;
-        if (id == null){
+        if (id == null|| id.isEmpty()){
             obj = proEconPowerFittingAnalySisService.select();
         } else {
             obj = proEconPowerFittingAnalySisService.selectItemById(id);
@@ -416,7 +416,7 @@ public class NewDataFittingService {
         /** 添加内容 **/
         List<PowerFittingData> list = new ArrayList<>();
         ProEconPowerFittingAnalySis obj = null;
-        if (id == null){
+        if (id == null || id.isEmpty()){
             obj = proEconPowerFittingAnalySisService.select();
         } else {
             obj = proEconPowerFittingAnalySisService.selectItemById(id);

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MatrixHAService.java

@@ -116,7 +116,7 @@ public class MatrixHAService {
                 powerVo.setLlgl(StringUtils.round(wpRealdatas.get(1).getPointValueInDouble() /1000,2));//兆瓦
                 powerVo.setSjgl(StringUtils.round(wpRealdatas.get(0).getPointValueInDouble(),2));//兆瓦
                 if(powerVo.getLlgl()<=powerVo.getSjgl()){
-                    powerVo.setLlgl(powerVo.getLlgl() * 1.02);
+                    powerVo.setLlgl(StringUtils.round(powerVo.getSjgl() * 1.02,2));
                 }