From d8475b8670b6b4cbcd1bc9e57d30a6f433d206ab Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期一, 23 六月 2025 23:33:54 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem
---
src/main/java/com/whyc/service/AlmAnalysisParamService.java | 50 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/whyc/service/AlmAnalysisParamService.java b/src/main/java/com/whyc/service/AlmAnalysisParamService.java
index 060006f..a4b6175 100644
--- a/src/main/java/com/whyc/service/AlmAnalysisParamService.java
+++ b/src/main/java/com/whyc/service/AlmAnalysisParamService.java
@@ -1,6 +1,7 @@
package com.whyc.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.whyc.constant.AnalysisEnum;
import com.whyc.dto.AnalysisAlm.AnalysisChangeRes;
import com.whyc.dto.AnalysisAlm.ResAnalysis;
import com.whyc.dto.Real.RealDateDTO;
@@ -47,6 +48,13 @@
wrapper.eq("alm_id",almId);
wrapper.last("limit 1");
AlmAnalysisParam param= mapper.selectOne(wrapper);
+ if(param!=null){
+ param.setMainFieldTypeName(AnalysisEnum.getValue(param.getMainFieldType()));
+ param.setMinorField1TypeName(AnalysisEnum.getValue(param.getMinorField1Type()));
+ param.setMinorField2TypeName(AnalysisEnum.getValue(param.getMinorField2Type()));
+ param.setMinorField3TypeName(AnalysisEnum.getValue(param.getMinorField3Type()));
+ param.setMinorField4TypeName(AnalysisEnum.getValue(param.getMinorField4Type()));
+ }
return param;
}
@@ -67,10 +75,14 @@
if(almAnalysisParam==null||almAnalysisParam.getMainFieldType()==null){
return new Response().set(1,false,"鏃犲搴斿垎鏋愬睘鎬�");
}else{
+
//鍒嗙粍鏌ョ湅闇�瑕佹煡璇㈢數婧�/鐢垫睜瀹炴椂琛ㄧ殑鍝簺鏁版嵁
- Map<String, Map<String,Integer>> groupmap=groupPwrAndBatt(almAnalysisParam);
- Map<String,Integer> battMap=groupmap.get("batt");
- Map<String,Integer> pwrMap=groupmap.get("pwr");
+ Map<String, Map<String,Object>> groupmap=groupPwrAndBatt(almAnalysisParam);
+ Map<String,Object> battMap=groupmap.get("batt");
+ Map<String,Object> pwrMap=groupmap.get("pwr");
+ Map<String,Object> mainMap=groupmap.get("main");
+ mainMap.put("pwr",pwrMap.size());
+ mainMap.put("batt",battMap.size());
if(battgroupId!=null){
if(battMap!=null&&battMap.size()>0){
List battHislist=getBattRealData(battgroupId,monthTimeList,battMap);
@@ -83,21 +95,24 @@
map.put("pwr",pwrHislist);
}
}
- return new Response().setII(1,true, map,"棰勮鍒嗘瀽绠＄悊-鐢垫簮涓诲睘鎬у拰鍒嗘瀽灞炴��");
+ return new Response().setIIII(1,true, map,mainMap,almAnalysisParam,"棰勮鍒嗘瀽绠＄悊-鐢垫簮涓诲睘鎬у拰鍒嗘瀽灞炴��");
}
}
//鍒嗙粍鏌ョ湅闇�瑕佹煡璇㈢數婧�/鐢垫睜瀹炴椂琛ㄧ殑鍝簺鏁版嵁
- private Map<String, Map<String,Integer>> groupPwrAndBatt(AlmAnalysisParam almAnalysisParam) {
- Map<String, Map<String,Integer>> map = new HashMap<>();
- Map<String,Integer> battMap=new HashMap<>();
- Map<String,Integer> pwrMap=new HashMap<>();
+ private Map<String, Map<String,Object>> groupPwrAndBatt(AlmAnalysisParam almAnalysisParam) {
+ Map<String, Map<String,Object>> map = new HashMap<>();
+ Map<String,Object> battMap=new HashMap<>();
+ Map<String,Object> pwrMap=new HashMap<>();
+ Map<String,Object> mainMap=new HashMap<>();
if(almAnalysisParam.getMainFieldType()==1||almAnalysisParam.getMainFieldType()==2||almAnalysisParam.getMainFieldType()==3){
if(almAnalysisParam.getMainField()!=null||almAnalysisParam.getMainField().length()>0){
pwrMap.put(almAnalysisParam.getMainField(),almAnalysisParam.getMainFieldType());
+ mainMap.put("main","pwr");
}
}else{
if(almAnalysisParam.getMainField()!=null||almAnalysisParam.getMainField().length()>0){
battMap.put(almAnalysisParam.getMainField(),almAnalysisParam.getMainFieldType());
+ mainMap.put("main","batt");
}
}
if(almAnalysisParam.getMinorField1Type()==1||almAnalysisParam.getMinorField1Type()==2||almAnalysisParam.getMinorField1Type()==3){
@@ -138,10 +153,11 @@
}
map.put("pwr",pwrMap);
map.put("batt",battMap);
+ map.put("main",mainMap);
return map;
}
//杩炴帴姹犺幏鍙栫數婧愬巻鍙插疄鏃舵暟鎹�
- public List getPwrRealData(Integer powerId,List<List<Date>> monthTimeList,Map<String,Integer> pwrMap) throws InterruptedException {
+ public List getPwrRealData(Integer powerId,List<List<Date>> monthTimeList,Map<String,Object> pwrMap) throws InterruptedException {
List<ResAnalysis> dataList = new LinkedList<>();
ThreadPoolExecutor pool = ThreadPoolExecutorFactory.getPoolExecutor();
CountDownLatch latch = new CountDownLatch(monthTimeList.size());
@@ -171,7 +187,7 @@
}
//鐢垫睜鍛婅鐐瑰嚮鍏蜂綋鍛婅淇℃伅鏌ョ湅浠庡憡璀﹀紑濮嬫椂闂村埌鐜板湪鐨勫巻鍙插疄鏃舵暟鎹�
- public List getBattRealData(Integer battgroupId, List<List<Date>> monthTimeList,Map<String,Integer> battMap) throws ParseException, InterruptedException {
+ public List getBattRealData(Integer battgroupId, List<List<Date>> monthTimeList,Map<String,Object> battMap) throws ParseException, InterruptedException {
List<ResAnalysis> dataList = new LinkedList<>();
ThreadPoolExecutor pool = ThreadPoolExecutorFactory.getPoolExecutor();
CountDownLatch latch = new CountDownLatch(monthTimeList.size());
@@ -218,9 +234,12 @@
//灏嗗睘鎬ф嫹璐濊嚦almAnalysisParam涓�
copyProperties(almAnalysisParam,res);
//鍒嗙粍鏌ョ湅闇�瑕佹煡璇㈢數婧�/鐢垫睜瀹炴椂琛ㄧ殑鍝簺鏁版嵁
- Map<String, Map<String,Integer>> groupmap=groupPwrAndBatt(almAnalysisParam);
- Map<String,Integer> battMap=groupmap.get("batt");
- Map<String,Integer> pwrMap=groupmap.get("pwr");
+ Map<String, Map<String,Object>> groupmap=groupPwrAndBatt(almAnalysisParam);
+ Map<String,Object> battMap=groupmap.get("batt");
+ Map<String,Object> pwrMap=groupmap.get("pwr");
+ Map<String,Object> mainMap=groupmap.get("main");
+ mainMap.put("pwr",pwrMap.size());
+ mainMap.put("batt",battMap.size());
if(res.getBattgroupId()!=null){
if(battMap!=null&&battMap.size()>0){
List battHislist=getBattRealData(res.getBattgroupId(),monthTimeList,battMap);
@@ -233,7 +252,7 @@
map.put("pwr",pwrHislist);
}
}
- return new Response().setII(1,true, map,"棰勮鍒嗘瀽绠＄悊-鍒囨崲鏃堕棿闂撮殧鍜屽壇灞炴��");
+ return new Response().setIIII(1,true, map,mainMap,almAnalysisParam,"棰勮鍒嗘瀽绠＄悊-鍒囨崲鏃堕棿闂撮殧鍜屽壇灞炴��");
}
//灏嗗睘鎬ф嫹璐濊嚦almAnalysisParam涓�
private void copyProperties(AlmAnalysisParam almAnalysisParam, AnalysisChangeRes res) {
@@ -252,6 +271,9 @@
public Response getAlmSummaryParam() {
//鎬荤殑灞炴�ч厤缃�
List<AlmSummaryParam> summaryList=summaryParamService.getInfo();
+ summaryList.forEach(item->{
+ item.setFieldTypeName(AnalysisEnum.getValue(item.getFieldType()));
+ });
return new Response().setII(1,true,summaryList,"棰勮鍒嗘瀽绠＄悊-鏌ヨ鎵�鏈夌殑灞炴�у搴斿叧绯�");
}
}
\ No newline at end of file
--
Gitblit v1.9.1