From 60fa13f76afe72a6f48416de2904d58164859382 Mon Sep 17 00:00:00 2001 From: houzhongjian <houzhongyi@126.com> Date: 星期五, 17 一月 2025 13:51:55 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 190 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 183 insertions(+), 7 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 ea66d6a..cdc43e1 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 @@ -12,14 +12,21 @@ import com.iailab.module.data.common.ApiDataQueryDTO; import com.iailab.module.model.api.mcs.McsApi; import com.iailab.module.model.api.mcs.dto.*; +import com.iailab.module.model.common.enums.DataTypeEnum; import com.iailab.module.model.enums.CommonConstant; import com.iailab.module.model.common.enums.PreLineTypeEnum; +import com.iailab.module.model.influxdb.pojo.InfluxModelResultByOutPutIdsPOJO; +import com.iailab.module.model.influxdb.service.InfluxDBService; +import com.iailab.module.model.influxdb.vo.InfluxModelResultVO; import com.iailab.module.model.mcs.pre.entity.DmModuleEntity; import com.iailab.module.model.mcs.pre.entity.MmItemOutputEntity; 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.MmPredictAlarmMessageSaveReqVO; +import com.iailab.module.model.mcs.pre.vo.MmPredictItemRespVO; import com.iailab.module.model.mcs.sche.entity.StScheduleSuggestEntity; +import com.iailab.module.model.mcs.sche.service.StScheduleRecordService; import com.iailab.module.model.mcs.sche.service.StScheduleSchemeService; import com.iailab.module.model.mcs.sche.service.StScheduleSuggestService; import com.iailab.module.model.mcs.sche.vo.StScheduleSuggestSaveReqVO; @@ -34,8 +41,11 @@ import org.springframework.web.bind.annotation.RestController; import java.math.BigDecimal; +import java.text.DecimalFormat; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; +import java.util.stream.Stream; /** * @author PanZhibao @@ -87,7 +97,13 @@ private StScheduleSchemeService stScheduleSchemeService; @Autowired + private StScheduleRecordService stScheduleRecordService; + + @Autowired private ChartParamService chartParamService; + + @Autowired + private InfluxDBService influxDBService; private int HOUR_MINS = 60; @@ -139,7 +155,13 @@ } Date predictTime = reqVO.getPredictTime(); if (predictTime == null) { - MmItemOutputEntity output = mmItemOutputService.getOutPutById(reqVO.getOutIds().get(0)); + MmItemOutputEntity output = null; + for (String outId : outIds) { + output = mmItemOutputService.getOutPutById(outId); + if (output != null) { + break; + } + } ItemVO predictItem = mmPredictItemService.getItemByIdFromCache(output.getItemid()); if (predictItem.getLastTime() != null) { predictTime = predictItem.getLastTime(); @@ -346,7 +368,8 @@ } else { dataView.setRealData(new ArrayList<>()); } - // dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat)); + dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat)); + dataView.setLineType(lineType.getCode()); switch (lineType) { case TN: dataView.setPreDataN(mmItemResultService.getData(outPut.getId(), startTime, endTime, timeFormat)); @@ -358,14 +381,20 @@ default: break; } + if (!CollectionUtils.isEmpty(dataView.getRealData())) { + Object[] rdo = dataView.getRealData().get(dataView.getRealData().size() - 1); + dataView.setCurrValue(new BigDecimal(rdo[1].toString())); + } - if (!CollectionUtils.isEmpty(dataView.getPreDataN())) { - List<Double> curList = dataView.getPreDataN().stream().map(t -> { + if (!CollectionUtils.isEmpty(dataView.getCurData())) { + List<Double> curList = dataView.getCurData().stream().map(t -> { return new Double(t[1].toString()); }).collect(Collectors.toList()); dataView.setPreMax(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).max().getAsDouble()).setScale(2, BigDecimal.ROUND_HALF_UP)); dataView.setPreMin(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).min().getAsDouble()).setScale(2, BigDecimal.ROUND_HALF_UP)); dataView.setPreLast(new BigDecimal(curList.get(curList.size() - 1))); + dataView.setPreCumulant(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).sum()) + .divide(new BigDecimal(HOUR_MINS), 2, BigDecimal.ROUND_HALF_UP)); } String alarmObj = chartParams.get(CommonConstant.ALARM_OBJ); @@ -587,27 +616,174 @@ return stScheduleSchemeService.getAlarmAndSuggestPage(reqVO); } + @Override + public Map<String, Map<String, Double>> getPreDoubleData(PreDoubleDataReqVO reqVO) { + List<MmPredictItemRespVO> doubleItemOutPuts = mmPredictItemService.getDoubleOutPutsByItemNos(reqVO.getItemNos()); + + //<itemNo,<resultStr,double>> + Map<String, Map<String, Double>> result = new HashMap<>(reqVO.getItemNos().size()); + + for (MmPredictItemRespVO mmPredictItemRespVO : doubleItemOutPuts) { + List<String> outPutIds = mmPredictItemRespVO.getOutPuts().stream().map(MmItemOutputRespVO::getId).collect(Collectors.toList()); + InfluxModelResultByOutPutIdsPOJO pojo = new InfluxModelResultByOutPutIdsPOJO(); + pojo.setOutPutIds(outPutIds); + pojo.setType(DataTypeEnum.FLOAT.getCode()); + Map<String, List<InfluxModelResultVO>> outPutIdDoubles = influxDBService.queryModelResultsByOutPutIds(pojo, mmPredictItemRespVO.getLastTime(), mmPredictItemRespVO.getLastTime()); + Map<String, Double> outPutIdDouble = new HashMap<>(outPutIds.size()); + for (MmItemOutputRespVO outPut : mmPredictItemRespVO.getOutPuts()) { + String outPutId = outPut.getId(); + if (outPutIdDoubles.containsKey(outPutId)) { + List<InfluxModelResultVO> influxModelResultVOS = outPutIdDoubles.get(outPutId); + if (!CollectionUtils.isEmpty(influxModelResultVOS)) { + outPutIdDouble.put(outPut.getResultstr(),Double.valueOf(influxModelResultVOS.get(0).getValue().toString())); + } + } + } + result.put(mmPredictItemRespVO.getItemno(),outPutIdDouble); + } + return result; + } + + public Map<String, BigDecimal> getPredictLastValue(PredictLastValueReqVO reqVO) { + Map<String, BigDecimal> result = new HashMap<>(reqVO.getItemNos().size()); + if (CollectionUtils.isEmpty(reqVO.getItemNos())) { + return result; + } + List<String[]> itemNos = reqVO.getItemNos(); + for (String[] itemNo : itemNos) { + String key = itemNo[0] + "_" + itemNo[1] + "_" + itemNo[2]; + ItemVO predictItem = mmPredictItemService.getItemByItemNo(itemNo[0]); + if (predictItem == null || predictItem.getLastTime() == null) { + result.put(key, BigDecimal.ZERO); + } + MmItemOutputEntity outPut = mmItemOutputService.getByItemid(predictItem.getId(), itemNo[1], itemNo[2]); + + Date predictTime = predictItem.getLastTime(); + List<Object[]> curData = mmItemResultJsonService.getData(outPut.getId(), predictTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND); + if(CollectionUtils.isEmpty(curData)) { + result.put(key, BigDecimal.ZERO); + } else { + result.put(key, new BigDecimal(curData.get(curData.size() - 1)[1].toString())); + } + } + return result; + } + + @Override + public Map<String,List<Object[]>> getElectricPredictData(String itemCode) { + ItemVO predictItem = mmPredictItemService.getItemByItemNo(itemCode); + if (null == predictItem) { + return new HashMap<>(); + } + List<Integer> resultIndexs = new ArrayList<>(); + resultIndexs.add(0); + resultIndexs.add(1); + resultIndexs.add(2); + List<MmItemOutputEntity> outPuts = mmItemOutputService.getByItemid(predictItem.getId(),"predictValues",resultIndexs); + if (CollectionUtils.isEmpty(outPuts)) { + return new HashMap<>(); + } + InfluxModelResultByOutPutIdsPOJO pojo = new InfluxModelResultByOutPutIdsPOJO(); + pojo.setOutPutIds(outPuts.stream().map(MmItemOutputEntity::getId).collect(Collectors.toList())); + pojo.setType(DataTypeEnum.FLOAT.getCode()); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(predictItem.getLastTime()); + calendar.add(Calendar.DAY_OF_YEAR, 7); + Map<String, List<InfluxModelResultVO>> outPutDatas = influxDBService.queryModelResultsByOutPutIds(pojo, predictItem.getLastTime(), calendar.getTime()); + Map<String,List<Object[]>> result = new HashMap<>(outPuts.size()); + for (MmItemOutputEntity outPut : outPuts) { + String outPutId = outPut.getId(); + if (outPutDatas.containsKey(outPutId)) { + List<InfluxModelResultVO> influxModelResultVOS = outPutDatas.get(outPutId); + result.put(null == outPut.getResultIndex() ? outPut.getResultstr() : outPut.getResultstr()+"_"+outPut.getResultIndex(),influxModelResultVOS.stream().map(e -> { + Object[] values = new Object[2]; + values[0] = DateUtils.format(Date.from(e.getTimestamp()), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND); + values[1] = Double.valueOf(e.getValue().toString()); + return values; + }).collect(Collectors.toList())); + } + } + return result; + } + + @Override + public String getLastScheduleData(String scheduleCode) { + if (StringUtils.isBlank(scheduleCode)) { + return null; + } + return stScheduleRecordService.getLastScheduleResult(scheduleCode); + } + + @Override + public List<Map<String, Object>> getRealTimeStatus(List<Map<String, Object>> machines) { + List<String> pointNos = new ArrayList<>(16); + for (Map<String, Object> machine : machines) { + List<String> list = (List<String>) machine.get("pointNos"); + pointNos.addAll(list); + } + Map<String, Object> pointValues = dataPointApi.queryPointsRealValue(pointNos); + List<Map<String, Object>> results = new ArrayList<>(); + for (Map<String, Object> machine : machines) { + List<String> pointNoList = (List<String>) machine.get("pointNos"); + if (!pointValues.containsKey(pointNoList.get(0)) || !pointValues.containsKey(pointNoList.get(1))) { + machine.put("status",false); + machine.put("num",0); + results.add(machine); + continue; + } + Double PValue = Double.valueOf(pointValues.get(pointNoList.get(0)).toString()); + Double QValue = Double.valueOf(pointValues.get(pointNoList.get(1)).toString()); + Double cos = calculateCos(PValue, QValue); + if (cos.equals(0.0)) { + machine.put("status",false); + machine.put("num",0); + }else { + machine.put("status",true); + machine.put("num",cos); + } + results.add(machine); + } + return results; + } + + /** + * 计算功率因数 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(); + } + } + private Date[] calResultTime(ItemVO predictItem, Date startTimeReq, Date endTimeReq, int lengthLeft, int lengthRight) { Date[] result = new Date[3]; Date predictTime = predictItem.getLastTime(); + Integer granularity = predictItem.getGranularity(); Date startTime = startTimeReq; if (startTime == null) { Calendar calendar = Calendar.getInstance(); calendar.setTime(predictItem.getLastTime()); - calendar.add(Calendar.MINUTE, -1 * lengthLeft); + calendar.add(Calendar.SECOND, -1 * lengthLeft * granularity); startTime = calendar.getTime(); } Date endTime = endTimeReq; if (endTime == null) { Calendar calendar = Calendar.getInstance(); calendar.setTime(predictItem.getLastTime()); - calendar.add(Calendar.MINUTE, lengthRight); + calendar.add(Calendar.SECOND, lengthRight * granularity); endTime = calendar.getTime(); } if (endTime.getTime() <= startTime.getTime()) { Calendar calendar = Calendar.getInstance(); calendar.setTime(startTime); - calendar.add(Calendar.MINUTE, lengthRight); + calendar.add(Calendar.SECOND, lengthRight * granularity); endTime = calendar.getTime(); } result[0] = predictTime; -- Gitblit v1.9.3