解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java

@@ -239,6 +239,7 @@ public class CommonServiceImpl {
                     JSONObject result1 = (JSONObject) result.get("result1");
                     JSONArray rows = (JSONArray) result1.get("rows");
                     JSONObject values = rows.getJSONObject(0);
+                    idxBizFanPointProcessVariableClassification.setRecDate(new Date());
                     idxBizFanPointProcessVariableClassification.setIntervalValue5(values.getDoubleValue("intervalValue5"));
                     idxBizFanPointProcessVariableClassification.setIntervalValue4(values.getDoubleValue("intervalValue4"));
                     idxBizFanPointProcessVariableClassification.setIntervalValue3(values.getDoubleValue("intervalValue3"));
@@ -285,6 +286,7 @@ public class CommonServiceImpl {
                     JSONObject result1 = (JSONObject) result.get("result1");
                     JSONArray rows = (JSONArray) result1.get("rows");
                     JSONObject values = rows.getJSONObject(0);
+                    idxBizPvPointProcessVariableClassification.setRecDate(new Date());
                     idxBizPvPointProcessVariableClassification.setIntervalValue5(values.getDoubleValue("intervalValue5"));
                     idxBizPvPointProcessVariableClassification.setIntervalValue4(values.getDoubleValue("intervalValue4"));
                     idxBizPvPointProcessVariableClassification.setIntervalValue3(values.getDoubleValue("intervalValue3"));
@@ -444,6 +446,7 @@ public class CommonServiceImpl {
                     JSONObject result1 = (JSONObject) result.get("result1");
                     JSONArray rows = (JSONArray) result1.get("rows");
                     JSONObject values = rows.getJSONObject(0);
+                    idxBizFanPointVarCorrelation.setRecDate(new Date());
                     idxBizFanPointVarCorrelation.setCorrelationCoefficient(values.getDoubleValue("correlation_coefficient"));
                     idxBizFanPointVarCorrelationMapper.updateById(idxBizFanPointVarCorrelation);
                     logger.info("------------------------------------------风机相关性：：相关性更新业务表成功----------------------------------------");
@@ -501,6 +504,7 @@ public class CommonServiceImpl {
                     JSONObject result1 = (JSONObject) result.get("result1");
                     JSONArray rows = (JSONArray) result1.get("rows");
                     JSONObject values = rows.getJSONObject(0);
+                    idxBizPvPointVarCorrelation.setRecDate(new Date());
                     idxBizPvPointVarCorrelation.setCorrelationCoefficient(values.getDoubleValue("correlation_coefficient"));
                     idxBizPvPointVarCorrelationMapper.updateById(idxBizPvPointVarCorrelation);
                     logger.info("------------------------------------------风机相关性：：相关性更新业务表成功----------------------------------------");

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -921,7 +921,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                 }
                 for (ESEquipments indicatorsDto : listData1) {
                     if (listDatum.getEquipmentNumber().equals(indicatorsDto.getEquipmentNumber())) {
-                        listDatum.setValueLabel(String.valueOf(indicatorsDto.getValueF() == null ? 0 : indicatorsDto.getValueF() / 1000));
+                        listDatum.setValueLabel(String.valueOf(indicatorsDto.getValueF() == null ? 0 : indicatorsDto.getValueF()));
                     }
                 }