From db8472b9471de96a68c7fcdb2e66124b2f16854b Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期三, 02 四月 2025 17:14:56 +0800
Subject: [PATCH] 采纳建议接口
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 124 +++++++++++++++++++++++++++++++----------
1 files changed, 94 insertions(+), 30 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
index 7a3a97b..d54714e 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
@@ -25,9 +25,9 @@
import com.iailab.module.model.mcs.pre.entity.MmPredictAlarmMessageEntity;
import com.iailab.module.model.mcs.pre.service.*;
import com.iailab.module.model.mcs.pre.vo.MmItemOutputRespVO;
+import com.iailab.module.model.mcs.pre.vo.MmPredictAlarmConfigSaveReqVO;
import com.iailab.module.model.mcs.pre.vo.MmPredictAlarmMessageSaveReqVO;
import com.iailab.module.model.mcs.pre.vo.MmPredictItemRespVO;
-import com.iailab.module.model.mcs.sche.entity.StAdjustConfigDetEntity;
import com.iailab.module.model.mcs.sche.entity.StScheduleModelEntity;
import com.iailab.module.model.mcs.sche.entity.StScheduleSuggestEntity;
import com.iailab.module.model.mcs.sche.service.*;
@@ -79,6 +79,9 @@
private MmItemResultJsonService mmItemResultJsonService;
@Autowired
+ private StAdjustResultService stAdjustResultService;
+
+ @Autowired
private ChartService chartService;
@Autowired
@@ -116,7 +119,6 @@
@Autowired
private StAdjustConfigService stAdjustConfigService;
-
private int HOUR_MINS = 60;
@Override
@@ -197,6 +199,7 @@
Calendar calendar = Calendar.getInstance();
calendar.setTime(predictTime);
calendar.add(Calendar.HOUR_OF_DAY, 1);
+ calendar.add(Calendar.MINUTE, 1);
endTime = calendar.getTime();
}
@@ -212,10 +215,13 @@
viewDto.setOutId(outId);
viewDto.setResultstr(output.getResultstr());
viewDto.setResultName(output.getResultName());
- viewDto.setRealData(getHisData(output.getPointid(), startTime, endTime));
+ viewDto.setRealData(getHisData(output.getPointid(), startTime, endTime, reqVO.getPrec()));
viewDto.setPreDataN(mmItemResultService.getData(output.getId(), startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
viewDto.setPreDataL(mmItemResultLastPointService.getData(output.getId(), startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
- viewDto.setCurData(mmItemResultJsonService.getData(output.getId(), predictTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, 3));
+ viewDto.setCurData(mmItemResultJsonService.getData(output.getId(), predictTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ // 模拟调整曲线
+ viewDto.setAdjData(stAdjustResultService.getData(output.getId(), predictTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+
List<Double> values = new ArrayList<>();
if (!CollectionUtils.isEmpty(viewDto.getRealData())) {
List<Double> hisValues = new ArrayList<>();
@@ -265,7 +271,7 @@
//处理预测累计
if (output.getIscumulant() == 1) {
if (StringUtils.isNotBlank(output.getCumulpoint())) {
- viewDto.setCumulantRealData(getHisData(output.getCumulpoint(), startTime, endTime));
+ viewDto.setCumulantRealData(getHisData(output.getCumulpoint(), startTime, endTime, reqVO.getPrec()));
}
viewDto.setCumulantPreData(mmItemResultService.getData(output.getId() + CommonDict.CUMULANT_SUFFIX, startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
}
@@ -324,16 +330,18 @@
legend.add(out.getResultName());
PreDataSampleViewRespDTO viewDto = new PreDataSampleViewRespDTO();
if (StringUtils.isNotBlank(out.getPointid())) {
- viewDto.setRealData(getHisData(out.getPointid(), startTime, endTime));
+ viewDto.setRealData(getHisData(out.getPointid(), startTime, endTime, reqVO.getPrec()));
}
viewDto.setPreDataN(mmItemResultService.getData(out.getId(), startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
//处理预测累计
if (out.getIscumulant() == 1) {
if (StringUtils.isNotBlank(out.getCumulpoint())) {
- viewDto.setCumulantRealData(getHisData(out.getCumulpoint(), startTime, endTime));
+ viewDto.setCumulantRealData(getHisData(out.getCumulpoint(), startTime, endTime, reqVO.getPrec()));
}
viewDto.setCumulantPreData(mmItemResultService.getData(out.getId() + CommonDict.CUMULANT_SUFFIX, startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
}
+ // 调整预测值
+ viewDto.setAdjData(stAdjustResultService.getData(out.getId(),predictItem.getLastTime(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
viewMap.put(out.getResultName(), viewDto);
}
@@ -344,6 +352,7 @@
result.setViewMap(viewMap);
return result;
}
+
@Override
public PreDataSingleChartRespVO getPreDataSingleChart(PreDataSingleChartReqVO reqVO) {
@@ -398,6 +407,8 @@
dataView.setRealData(new ArrayList<>());
}
dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat, 3));
+ // 调整预测值
+ dataView.setAdjData(stAdjustResultService.getData(outPut.getId(),predictTime,timeFormat));
dataView.setLineType(lineType.getCode());
switch (lineType) {
case TN:
@@ -410,6 +421,19 @@
default:
break;
}
+
+ //处理预测累计
+ if (outPut.getIscumulant() != null && outPut.getIscumulant() == 1) {
+ /*if (StringUtils.isNotBlank(outPut.getCumulpoint())) {
+ dataView.setCumulantRealData(getHisData(outPut.getCumulpoint(), startTime, endTime));
+ }*/
+ List<Object[]> cumulantPreList = mmItemResultService.getData(outPut.getId() + CommonDict.CUMULANT_SUFFIX, startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+ dataView.setCumulantPreData(cumulantPreList);
+ if (!CollectionUtils.isEmpty(cumulantPreList)) {
+ dataView.setCumulantPreLast(new BigDecimal(cumulantPreList.get(cumulantPreList.size() - 1)[1].toString()).setScale(2, BigDecimal.ROUND_HALF_UP));
+ }
+ }
+
if (!CollectionUtils.isEmpty(dataView.getRealData())) {
Object[] rdo = dataView.getRealData().get(dataView.getRealData().size() - 1);
dataView.setCurrValue(new BigDecimal(rdo[1].toString()));
@@ -427,7 +451,8 @@
String alarmObj = chartParams.get(CommonConstant.ALARM_OBJ);
if (StringUtils.isNotBlank(alarmObj)) {
- List<AlarmMessageRespDTO> alarmList = ConvertUtils.sourceToTarget(mmPredictAlarmMessageService.getList(alarmObj, predictTime), AlarmMessageRespDTO.class);
+ String alarmTitle = chartParams.get(CommonConstant.ALARM_TITLE);
+ List<AlarmMessageRespDTO> alarmList = ConvertUtils.sourceToTarget(mmPredictAlarmMessageService.getList(alarmObj, predictTime, alarmTitle), AlarmMessageRespDTO.class);
dataView.setAlarmList(alarmList);
if (CollectionUtils.isEmpty(alarmList)) {
dataView.setAlarmMessage("暂无预警信息");
@@ -536,9 +561,10 @@
* @param pointId
* @param startTime
* @param endTime
+ * @param prec
* @return
*/
- private List<Object[]> getHisData(String pointId, Date startTime, Date endTime) {
+ private List<Object[]> getHisData(String pointId, Date startTime, Date endTime, Integer prec) {
List<Object[]> result = new ArrayList<>();
if (StringUtils.isBlank(pointId)) {
return result;
@@ -552,10 +578,17 @@
if (CollectionUtils.isEmpty(valueDTOS)) {
return result;
}
+ int defaultPrec = 3;
valueDTOS.forEach(item -> {
Object[] values = new Object[2];
values[0] = DateUtils.format(item.getT(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
- values[1] = new BigDecimal(item.getV()).setScale(2, BigDecimal.ROUND_HALF_UP);
+ if (prec != null && prec < 0) {
+ values[1] = item.getV();
+ } else if (prec != null && prec > 0) {
+ values[1] = new BigDecimal(item.getV()).setScale(prec, BigDecimal.ROUND_HALF_UP);
+ } else {
+ values[1] = new BigDecimal(item.getV()).setScale(defaultPrec, BigDecimal.ROUND_HALF_UP);
+ }
result.add(values);
});
return result;
@@ -584,7 +617,7 @@
valueDTOS.forEach(item -> {
Object[] values = new Object[2];
values[0] = DateUtils.format(item.getT(), timeFormat);
- values[1] = new BigDecimal(item.getV()).setScale(2, BigDecimal.ROUND_HALF_UP);
+ values[1] = new BigDecimal(item.getV()).setScale(3, BigDecimal.ROUND_HALF_UP);
result.add(values);
});
return result;
@@ -711,9 +744,15 @@
result.put(key, BigDecimal.ZERO);
}
MmItemOutputEntity outPut = mmItemOutputService.getByItemid(predictItem.getId(), itemNo[1], itemNo[2]);
-
+ String outputId = outPut.getId();
+ // 判断是否有第五个参数，如果有第5个参数为1，则取累计值
+ if (itemNo.length >= 5){
+ if (StringUtils.isNotBlank(itemNo[4]) && "1".equals(itemNo[4])){
+ outputId = outPut.getId() + CommonDict.CUMULANT_SUFFIX;
+ }
+ }
Date predictTime = predictItem.getLastTime();
- List<Object[]> curData = mmItemResultJsonService.getData(outPut.getId(), predictTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+ List<Object[]> curData = mmItemResultJsonService.getData(outputId, predictTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
if(CollectionUtils.isEmpty(curData)) {
result.put(key, BigDecimal.ZERO);
} else {
@@ -805,25 +844,50 @@
}
@Override
- public List<StAdjustConfigDetDTO> getAdjustConfigListByModelId(String modelId) {
- List<StAdjustConfigDetEntity> list = stAdjustConfigService.getDetByModelId(modelId);
- return ConvertUtils.sourceToTarget(list, StAdjustConfigDetDTO.class);
+ public Boolean updateAlarmConfig(String alarmObj,String upperLimit,String lowerLimit) {
+ MmPredictAlarmConfigSaveReqVO reqVO = new MmPredictAlarmConfigSaveReqVO();
+ reqVO.setAlarmObj(alarmObj);
+ reqVO.setUpperLimit(BigDecimal.valueOf(Double.parseDouble(upperLimit)));
+ reqVO.setLowerLimit(BigDecimal.valueOf(Double.parseDouble(lowerLimit)));
+ mmPredictAlarmConfigService.updateByAlarmObj(reqVO);
+ return true;
}
- /**
- * 计算功率因数 p²/（根号：p²+Q²）
- **/
- public Double calculateCos(Double PValue,Double QValue) {
- // 绝对值
- PValue = Math.abs(PValue);
- QValue = Math.abs(QValue);
- //PValue [0,0.001] 直接判断为关闭返回0
- if (PValue >= 0 && PValue <= 0.001) {
- return 0.0;
- }else {
- BigDecimal result = new BigDecimal(PValue).divide(BigDecimal.valueOf(Math.sqrt(Math.pow(PValue, 2) + Math.pow(QValue, 2))), 2, BigDecimal.ROUND_HALF_UP);
- return result.doubleValue();
- }
+ @Override
+ public Boolean updateChartParam(ChartDTO chartDTO) {
+ ChartDTO oldChartDTO = chartService.getChartByChartCode(chartDTO.getChartCode());
+ List<ChartParamDTO> chartParams = chartDTO.getChartParams();
+ chartParams.forEach(item -> {
+ item.setChartId(oldChartDTO.getId());
+ });
+ chartParamService.updateByChartIdAndParamCode(chartParams);
+ return true;
+ }
+
+ @Override
+ public MmItemOutputDTO getItemOutputByItemid(String itemid, String resultstr, String resultIndex) {
+ return ConvertUtils.sourceToTarget(mmItemOutputService.getByItemid(itemid,resultstr,resultIndex),MmItemOutputDTO.class);
+ }
+
+ @Override
+ public List<Object[]> getItemResult(PreItemResultReqVO reqVO) {
+
+ return mmItemResultService.getData(reqVO.getOutputid(),reqVO.getStartTime(),reqVO.getEndTime(),reqVO.getTimeFormat());
+ }
+
+ @Override
+ public PredictItemVO getPredictItemByItemNo(String itemNo) {
+ return ConvertUtils.sourceToTarget(mmPredictItemService.getItemByItemNo(itemNo),PredictItemVO.class);
+ }
+
+ @Override
+ public List<Object[]> getItemResultLastPoint(PreItemResultReqVO reqVO) {
+ return mmItemResultLastPointService.getData(reqVO.getOutputid(),reqVO.getStartTime(),reqVO.getEndTime(),reqVO.getTimeFormat());
+ }
+
+ @Override
+ public Boolean useSuggest(StAlarmAndSuggestReqVO reqVO) {
+ return stScheduleSuggestService.useSuggest(reqVO);
}
private Date[] calResultTime(ItemVO predictItem, Date startTimeReq, Date endTimeReq, int lengthLeft, int lengthRight) {
--
Gitblit v1.9.3