From 1062204e84bb67fa54985c8e751174ccd717b0ac Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期二, 15 四月 2025 10:43:32 +0800 Subject: [PATCH] 管控变电站修改上下限 --- ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java | 122 +++++++++++++++++++++++++++++++++------- 1 files changed, 100 insertions(+), 22 deletions(-) diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java index 6aaace5..9f96eea 100644 --- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java +++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java @@ -3,9 +3,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iailab.framework.common.util.date.DateUtils; import com.iailab.framework.common.util.object.ConvertUtils; -import com.iailab.module.ansteel.api.dao.PowerRunStateDao; +import com.iailab.module.ansteel.api.dao.*; import com.iailab.module.ansteel.api.dto.*; -import com.iailab.module.ansteel.api.service.DataApi; +import com.iailab.module.ansteel.api.entity.PowerCapacitorStatusEntity; +import com.iailab.module.ansteel.api.entity.PowerControlDetEntity; +import com.iailab.module.ansteel.api.entity.PowerControlMainEntity; +import com.iailab.module.ansteel.api.entity.PowerNetFactorEntity; +import com.iailab.module.ansteel.api.service.DataService; import com.iailab.module.ansteel.common.constant.CommonConstant; import com.iailab.module.data.api.plan.PlanItemApi; import com.iailab.module.data.api.plan.dto.ApiPlanDataDTO; @@ -27,7 +31,7 @@ @Slf4j @Service -public class DataServiceImpl implements DataApi { +public class DataServiceImpl implements DataService { @Autowired private DataPointApi dataPointApi; @@ -40,6 +44,24 @@ @Autowired private PowerRunStateDao powerRunStateDao; + + @Autowired + private MainProcessIndexDayDao mainProcessIndexDayDao; + + @Autowired + private MainProcessIndexTeamDao mainProcessIndexTeamDao; + + @Autowired + private PowerNetFactorDao powerNetFactorDao; + + @Autowired + private PowerCapacitorStatusDao powerCapacitorStatusDao; + + @Autowired + private PowerControlMainDao powerControlMainDao; + + @Autowired + private PowerControlDetDao powerControlDetDao; @Override public List<PowerRunStateDTO> getPowerRunState() { @@ -77,6 +99,42 @@ }).collect(Collectors.toList()); } return list; + } + + @Override + public List<MainProcessIndexDTO> getIndexList(Map<String, Object> params) { + List<MainProcessIndexDTO> list = new ArrayList<>(); + if("day".equals(params.get("type"))) { + list = ConvertUtils.sourceToTarget(mainProcessIndexDayDao.selectList(new QueryWrapper<>()), MainProcessIndexDTO.class); + }else if("team".equals(params.get("type"))){ + list = ConvertUtils.sourceToTarget(mainProcessIndexTeamDao.selectList(new QueryWrapper<>()), MainProcessIndexDTO.class); + } + if (!CollectionUtils.isEmpty(list)) { + list.stream().map(item -> { + StringBuffer sb = new StringBuffer(); + sb.append(item.getHisAvg()); + sb.append(","); + sb.append(item.getTheory()); + sb.append(","); + sb.append(item.getActual()); + sb.append(","); + sb.append(item.getRealData()); + String[] arr = sb.toString().split(","); + Map<String, Object> adjValue = dataPointApi.queryPointsRealValue(Arrays.asList(arr)); + item.setHisAvg(ObjectUtils.isEmpty(adjValue.get(arr[0])) ? "0" : new BigDecimal(adjValue.get(arr[0]).toString()).setScale(2, BigDecimal.ROUND_HALF_UP).toString()); + item.setTheory(ObjectUtils.isEmpty(adjValue.get(arr[1])) ? "0" : new BigDecimal(adjValue.get(arr[1]).toString()).setScale(2, BigDecimal.ROUND_HALF_UP).toString()); + item.setActual(ObjectUtils.isEmpty(adjValue.get(arr[2])) ? "0" : new BigDecimal(adjValue.get(arr[2]).toString()).setScale(2, BigDecimal.ROUND_HALF_UP).toString()); + item.setRealData(ObjectUtils.isEmpty(adjValue.get(arr[3])) ? "0" : new BigDecimal(adjValue.get(arr[3]).toString()).setScale(2, BigDecimal.ROUND_HALF_UP).toString()); + + return item; + }).collect(Collectors.toList()); + } + return list; + } + + @Override + public Boolean useSuggest(StAlarmAndSuggestReqVO ReqVO) { + return mcsApi.useSuggest(ReqVO); } @Override @@ -142,13 +200,6 @@ }); preDataView.setTrendsDataL(newList); } - MmItemOutputDTO outputDTO = mcsApi.getItemOutputByItemid(predictItem.getId(), resultStr, resultIndex); - - PreItemResultReqVO preItemResultReqVO = new PreItemResultReqVO(); - preItemResultReqVO.setOutputid(outputDTO.getId()); - preItemResultReqVO.setStartTime(startTime); - preItemResultReqVO.setEndTime(endTime); - preItemResultReqVO.setTimeFormat(timeFormat); preDataView.setPreData(resultOld.getDataView().getPreDataL()); @@ -185,6 +236,7 @@ result[2] = endTime; return result; } + /** * 查询原始计划、修正计划数据 */ @@ -199,30 +251,33 @@ list.forEach(item -> { tMap.put(item.getParamCode(), item.getParamValue()); }); - String planCode = tMap.get(CommonConstant.PLAN_CODE); - if (planCode == null) { - return null; - } - Date startTime = DateUtils.parse(reqVO.getStartTime(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND); - Date endTime = DateUtils.parse(reqVO.getEndTime(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND); - Date predictTime = DateUtils.parse(reqVO.getPredictTime(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND); + PreDataSingleChartReqVO queryDto = new PreDataSingleChartReqVO(); + queryDto.setChartCode(reqVO.getChartCode()); + PreDataSingleChartRespVO chartData = mcsApi.getPreDataSingleChart(queryDto); + + Date predictTime = chartData.getPredictTime(); + Date startTime = chartData.getStartTime(); + Date endTime = chartData.getEndTime(); + // 原始计划数据 - LinkedHashMap<String, List<String[]>> planData = getRealPlanData(planCode, startTime, endTime, predictTime); + LinkedHashMap<String, List<String[]>> planData = getRealPlanData(reqVO.getPlanCodes(), startTime, endTime, predictTime); // 修正计划数据 LinkedHashMap<String, List<String[]>> predData = new LinkedHashMap<>(); - predData.put(reqVO.getChartCode(), getPrePlanData(reqVO.getChartCode(), predictTime, endTime)); + for (int i = 0; i < reqVO.getPlanCodes().size(); i++) { + predData.put(reqVO.getPlanCodes().get(i), getPrePlanData(reqVO.getPlanPreds().get(i), predictTime, endTime)); + } result.put("planData", planData); result.put("predData", predData); return result; } //原始计划 - public LinkedHashMap<String, List<String[]>> getRealPlanData(String planCode, Date startTime, Date endTime, Date predictTime) { + public LinkedHashMap<String, List<String[]>> getRealPlanData(List<String> planCodes, Date startTime, Date endTime, Date predictTime) { LinkedHashMap<String, List<String[]>> result = new LinkedHashMap<>(); ApiDataQueryDTO apiDataQueryDTO = new ApiDataQueryDTO(); - apiDataQueryDTO.setItemNo(planCode); + apiDataQueryDTO.setItemNos(planCodes); apiDataQueryDTO.setStart(startTime); apiDataQueryDTO.setEnd(endTime); LinkedHashMap<String, List<ApiPlanDataDTO>> planData = planItemApi.queryPlanItemRecordValue(apiDataQueryDTO); @@ -251,7 +306,7 @@ PreDataSingleChartReqVO queryDto = new PreDataSingleChartReqVO(); queryDto.setChartCode(charCode); queryDto.setStartTime(startTime); - queryDto.setEndTime(startTime); + queryDto.setEndTime(endTime); PreDataSingleChartRespVO chartData = mcsApi.getPreDataSingleChart(queryDto); if (CollectionUtils.isEmpty(chartData.getDataView().getPreDataN())) { return result; @@ -286,4 +341,27 @@ } return endTime; } + + @Override + public List<PowerNetFactorDTO> getPowerNetFactorList() { + return ConvertUtils.sourceToTarget(powerNetFactorDao.selectList(new QueryWrapper<PowerNetFactorEntity>().orderByAsc("sort")), PowerNetFactorDTO.class); + } + + @Override + public List<PowerCapacitorStatusDTO> getPowerCapacitorStatusList() { + return ConvertUtils.sourceToTarget(powerCapacitorStatusDao.selectList(new QueryWrapper<PowerCapacitorStatusEntity>().orderByAsc("sort")), PowerCapacitorStatusDTO.class); + } + + @Override + public List<PowerControlMainDTO> getPowerControlMainList() { + return ConvertUtils.sourceToTarget(powerControlMainDao.selectList(new QueryWrapper<PowerControlMainEntity>().orderByAsc("sort")), PowerControlMainDTO.class); + } + + @Override + public List<PowerControlDetDTO> getPowerControlDetList(Map<String, Object> params) { + QueryWrapper<PowerControlDetEntity> wrapper = new QueryWrapper<>(); + wrapper.eq("control_id", params.get("control_id")); + wrapper.orderByAsc("sort"); + return ConvertUtils.sourceToTarget(powerControlDetDao.selectList(wrapper), PowerControlDetDTO.class); + } } \ No newline at end of file -- Gitblit v1.9.3