From a4e25fc0cd113518980305af3c061892b1b24b14 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 23 六月 2025 17:07:05 +0800
Subject: [PATCH] 预警分析管理
---
src/main/java/com/whyc/service/BatttestdataInfService.java | 1
src/main/java/com/whyc/controller/BattCompareController.java | 48 ++++++++++++++++
src/main/java/com/whyc/pojo/db_param/AlmSummaryParam.java | 5 +
src/main/java/com/whyc/constant/AnalysisEnum.java | 49 ++++++++++++++++
src/main/resources/mapper/BattInfMapper.xml | 6 ++
src/main/java/com/whyc/pojo/db_param/AlmAnalysisParam.java | 16 +++++
src/main/java/com/whyc/service/AlmAnalysisParamService.java | 12 ++++
7 files changed, 136 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/constant/AnalysisEnum.java b/src/main/java/com/whyc/constant/AnalysisEnum.java
new file mode 100644
index 0000000..a215fa0
--- /dev/null
+++ b/src/main/java/com/whyc/constant/AnalysisEnum.java
@@ -0,0 +1,49 @@
+package com.whyc.constant;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum AnalysisEnum {
+ ALARM_1(1,"鐩存祦鐢垫簮"),
+ ALARM_2(2,"閫氫俊鐢垫簮"),
+ ALARM_3(3,"閰嶇綉鐢垫簮"),
+ ALARM_4(4,"钃勭數姹犵粍"),
+ ALARM_5(5,"璁惧"),
+ ALARM_6(6,"ups鐢垫簮"),
+ ;
+
+ private Integer stateId;
+ private String stateName;
+
+ AnalysisEnum(Integer stateId, String stateName) {
+ this.stateId = stateId;
+ this.stateName = stateName;
+ }
+
+ public Integer getStateId() {
+ return stateId;
+ }
+
+ public String getStateName() {
+ return stateName;
+ }
+
+ public static String getValue(Integer stateId) {
+ if(stateId==null){
+ return "";
+ }
+ for (AnalysisEnum ele : values()) {
+ if(ele.getStateId().equals(stateId)) {
+ return ele.getStateName();
+ }
+ }
+ return null;
+ }
+ public static Map<Integer,String> getOpInfo() {
+ Map<Integer,String> map=new HashMap<>();
+ for (AnalysisEnum logOpEnum : AnalysisEnum.values()) {
+ map.put(logOpEnum.getStateId(),logOpEnum.getStateName());
+ }
+ return map;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/controller/BattCompareController.java b/src/main/java/com/whyc/controller/BattCompareController.java
new file mode 100644
index 0000000..f8ea218
--- /dev/null
+++ b/src/main/java/com/whyc/controller/BattCompareController.java
@@ -0,0 +1,48 @@
+package com.whyc.controller;
+
+import com.whyc.dto.Response;
+import com.whyc.dto.Statistic.BattCompareStic;
+import com.whyc.pojo.db_user.User;
+import com.whyc.service.BatttestdataInfService;
+import com.whyc.util.ActionUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@Api(tags = "钃勭數姹犲姣斿垎鏋愮鐞�")
+@RequestMapping("compare")
+public class BattCompareController {
+
+ @Autowired
+ private BatttestdataInfService battTinfService;
+
+
+ @ApiOperation(value = "钃勭數姹犵粍瀵规瘮鍒嗘瀽鐣岄潰锛堝悓涓�鍝佺墝鍚屼竴鏃堕棿锛�(1.2.15)")
+ @PostMapping("getBattCompare15Statistic")
+ public Response getBattCompare15Statistic(@RequestBody BattCompareStic stic){
+ User uinf= ActionUtil.getUser();
+ stic.setUid(uinf.getId());
+ return battTinfService.getBattCompare15Statistic(stic);
+ }
+
+ @ApiOperation(value = "钃勭數姹犵粍瀵规瘮鍒嗘瀽鐣岄潰锛堜笉鍚屽搧鐗屽悓涓�鏃堕棿锛�(1.2.16)")
+ @PostMapping("getBattCompare16Statistic")
+ public Response getBattCompare16Statistic(@RequestBody BattCompareStic stic){
+ User uinf= ActionUtil.getUser();
+ stic.setUid(uinf.getId());
+ return battTinfService.getBattCompare16Statistic(stic);
+ }
+
+ @ApiOperation(value = "钃勭數姹犵粍瀵规瘮鍒嗘瀽鐣岄潰锛堝悓涓�鍝佺墝涓嶅悓鏃堕棿锛�(1.2.17)")
+ @PostMapping("getBattCompare17Statistic")
+ public Response getBattCompare17Statistic(@RequestBody BattCompareStic stic){
+ User uinf= ActionUtil.getUser();
+ stic.setUid(uinf.getId());
+ return battTinfService.getBattCompare17Statistic(stic);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/pojo/db_param/AlmAnalysisParam.java b/src/main/java/com/whyc/pojo/db_param/AlmAnalysisParam.java
index 06a3fd0..d9c42d4 100644
--- a/src/main/java/com/whyc/pojo/db_param/AlmAnalysisParam.java
+++ b/src/main/java/com/whyc/pojo/db_param/AlmAnalysisParam.java
@@ -1,6 +1,7 @@
package com.whyc.pojo.db_param;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -41,11 +42,17 @@
@ApiModelProperty(value = "涓诲瓧娈电被鍨媅1:鐩存祦锛�2锛氶�氫俊锛�3閰嶇綉 4:鐢垫睜 5:璁惧]")
private Integer mainFieldType;
+ @TableField(exist = false)
+ private String mainFieldTypeName;
+
@ApiModelProperty(value = "娆¤瀛楁1鍙傝�冮厤缃�")
private String minorField1;
@ApiModelProperty(value = "瀛楁1绫诲瀷[1:鐩存祦锛�2锛氶�氫俊锛�3閰嶇綉 4:鐢垫睜 5:璁惧]")
private Integer minorField1Type;
+
+ @TableField(exist = false)
+ private String minorField1TypeName;
@ApiModelProperty(value = "娆¤瀛楁2鍙傝�冮厤缃�")
private String minorField2;
@@ -53,17 +60,26 @@
@ApiModelProperty(value = "瀛楁2绫诲瀷[1:鐩存祦锛�2锛氶�氫俊锛�3閰嶇綉 4:鐢垫睜 5:璁惧]")
private Integer minorField2Type;
+ @TableField(exist = false)
+ private String minorField2TypeName;
+
@ApiModelProperty(value = "娆¤瀛楁3鍙傝�冮厤缃�")
private String minorField3;
@ApiModelProperty(value = "瀛楁3绫诲瀷[1:鐩存祦锛�2锛氶�氫俊锛�3閰嶇綉 4:鐢垫睜 5:璁惧]")
private Integer minorField3Type;
+ @TableField(exist = false)
+ private String minorField3TypeName;
+
@ApiModelProperty(value = "娆¤瀛楁4鍙傝�冮厤缃�")
private String minorField4;
@ApiModelProperty(value = "瀛楁4绫诲瀷[1:鐩存祦锛�2锛氶�氫俊锛�3閰嶇綉 4:鐢垫睜 5:璁惧]")
private Integer minorField4Type;
+ @TableField(exist = false)
+ private String minorField4TypeName;
+
}
diff --git a/src/main/java/com/whyc/pojo/db_param/AlmSummaryParam.java b/src/main/java/com/whyc/pojo/db_param/AlmSummaryParam.java
index d823cde..cc7064c 100644
--- a/src/main/java/com/whyc/pojo/db_param/AlmSummaryParam.java
+++ b/src/main/java/com/whyc/pojo/db_param/AlmSummaryParam.java
@@ -1,6 +1,7 @@
package com.whyc.pojo.db_param;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -35,6 +36,10 @@
@ApiModelProperty(value = "瀛楁绫诲瀷[1:鐩存祦锛�2锛氶�氫俊锛�3閰嶇綉 4:鐢垫睜 5:璁惧]")
private Integer fieldType;
+ @ApiModelProperty(value = "瀛楁绫诲瀷[1:鐩存祦锛�2锛氶�氫俊锛�3閰嶇綉 4:鐢垫睜 5:璁惧]")
+ @TableField(exist = false)
+ private String fieldTypeName;
+
@ApiModelProperty(value = "瀛楁灞炴��")
private String fieldName;
diff --git a/src/main/java/com/whyc/service/AlmAnalysisParamService.java b/src/main/java/com/whyc/service/AlmAnalysisParamService.java
index 16ec4e3..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,6 +75,7 @@
if(almAnalysisParam==null||almAnalysisParam.getMainFieldType()==null){
return new Response().set(1,false,"鏃犲搴斿垎鏋愬睘鎬�");
}else{
+
//鍒嗙粍鏌ョ湅闇�瑕佹煡璇㈢數婧�/鐢垫睜瀹炴椂琛ㄧ殑鍝簺鏁版嵁
Map<String, Map<String,Object>> groupmap=groupPwrAndBatt(almAnalysisParam);
Map<String,Object> battMap=groupmap.get("batt");
@@ -262,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
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index f763f91..b462679 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -278,7 +278,6 @@
if(param.getParamNamePsx().equals("batt_mon_damage_val")){
damageValue=param.getParamValue();
}
-
}
}
//1鏌ヨ绗﹀悎鏉′欢鐨勭數姹犵粍
diff --git a/src/main/resources/mapper/BattInfMapper.xml b/src/main/resources/mapper/BattInfMapper.xml
index 3ddd7c3..71b8776 100644
--- a/src/main/resources/mapper/BattInfMapper.xml
+++ b/src/main/resources/mapper/BattInfMapper.xml
@@ -231,6 +231,12 @@
<if test="stic.product!=null">
and tb_batt_inf.product=#{stic.product}
</if>
+ <if test="stic.inuseStartTime!=null">
+ and tb_batt_inf.inuse_time>=#{stic.inuseStartTime}
+ </if>
+ <if test="stic.inuseEndTime!=null">
+ and tb_batt_inf.inuse_time<=#{stic.inuseEndTimee}
+ </if>
<if test="stic.uid>100">
and tb_batt_inf.station_id in(
select distinct station_id from db_user.tb_baojigroup_power,db_user.tb_baojigroup_usr
--
Gitblit v1.9.1