From 9e65d8a1f23ffd623a08af2cf5cf7885c9ed9c81 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 20 六月 2025 11:42:07 +0800
Subject: [PATCH] 预警分析管理-主属性和配置属性

---
 src/main/java/com/whyc/pojo/db_param/AlmSummaryParam.java   |   45 ++++++++++++++++++++++
 src/main/java/com/whyc/mapper/AlmSummaryParamMapper.java    |    6 +++
 src/main/java/com/whyc/service/AlmAnalysisParamService.java |    8 +++
 src/main/java/com/whyc/service/AlmSummaryParamService.java  |   22 +++++++++++
 4 files changed, 80 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/whyc/mapper/AlmSummaryParamMapper.java b/src/main/java/com/whyc/mapper/AlmSummaryParamMapper.java
new file mode 100644
index 0000000..c953254
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/AlmSummaryParamMapper.java
@@ -0,0 +1,6 @@
+package com.whyc.mapper;
+
+import com.whyc.pojo.db_param.AlmSummaryParam;
+
+public interface AlmSummaryParamMapper extends CustomMapper<AlmSummaryParam>{
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/pojo/db_param/AlmSummaryParam.java b/src/main/java/com/whyc/pojo/db_param/AlmSummaryParam.java
new file mode 100644
index 0000000..d823cde
--- /dev/null
+++ b/src/main/java/com/whyc/pojo/db_param/AlmSummaryParam.java
@@ -0,0 +1,45 @@
+package com.whyc.pojo.db_param;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 棰勮鍒嗘瀽绠$悊瀛楁鎬昏〃
+ * </p>
+ *
+ * @author lxw
+ * @since 2025-06-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName(schema = "db_param",value ="tb_alm_summary_param")
+@ApiModel(value="AlmSummaryParam瀵硅薄", description="棰勮鍒嗘瀽绠$悊瀛楁鎬昏〃")
+public class AlmSummaryParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "鑷涓婚敭")
+    @TableId(value = "num", type = IdType.AUTO)
+    private Long num;
+
+    @ApiModelProperty(value = "瀛楁绫诲瀷[1:鐩存祦锛�2锛氶�氫俊锛�3閰嶇綉  4:鐢垫睜 5:璁惧]")
+    private Integer fieldType;
+
+    @ApiModelProperty(value = "瀛楁灞炴��")
+    private String fieldName;
+
+    @ApiModelProperty(value = "涓枃鍚嶇О")
+    private String fieldNameZh;
+
+
+}
diff --git a/src/main/java/com/whyc/service/AlmAnalysisParamService.java b/src/main/java/com/whyc/service/AlmAnalysisParamService.java
index 8c952cd..b0606c8 100644
--- a/src/main/java/com/whyc/service/AlmAnalysisParamService.java
+++ b/src/main/java/com/whyc/service/AlmAnalysisParamService.java
@@ -9,6 +9,7 @@
 import com.whyc.pojo.db_data_history.BattRealdataId;
 import com.whyc.pojo.db_data_history.PwrdevHistorydataId;
 import com.whyc.pojo.db_param.AlmAnalysisParam;
+import com.whyc.pojo.db_param.AlmSummaryParam;
 import com.whyc.pojo.db_param.AppParam;
 import com.whyc.util.ActionUtil;
 import com.whyc.util.DateUtil;
@@ -36,6 +37,9 @@
     @Autowired
     private SubTablePageInfoService subTablePageInfoService;
 
+    @Autowired
+    private AlmSummaryParamService summaryParamService;
+
     //鑾峰彇鍛婅almId瀵瑰簲鐨勫垎鏋愰厤缃睘鎬у��
     public AlmAnalysisParam getAnalysisParam(Integer almId) {
         QueryWrapper wrapper=new QueryWrapper();
@@ -61,6 +65,8 @@
         Date cyscleDate=ActionUtil.getDateAdd(ThreadLocalUtil.parse(startTime,1),cycleTime*(-1));
         //鑾峰彇cyscleDate鍒扮幇鍦ㄦ墍鏈夌殑鍘嗗彶瀹炴椂鏁版嵁
         List<List<Date>> monthTimeList = DateUtil.getMonthTime(cyscleDate,new Date());
+        //鎬荤殑灞炴�ч厤缃�
+        List<AlmSummaryParam> summaryList=summaryParamService.getInfo();
         //鑾峰彇鍛婅almId瀵瑰簲鐨勫垎鏋愰厤缃睘鎬у��
         AlmAnalysisParam almAnalysisParam=getAnalysisParam(almId);
         if(almAnalysisParam==null||almAnalysisParam.getMainFieldType()==null){
@@ -82,7 +88,7 @@
                     map.put("pwr",pwrHislist);
                 }
             }
-            return new Response().setIII(1,true, map,almAnalysisParam,"棰勮鍒嗘瀽绠$悊-鐢垫簮涓诲睘鎬у拰鍒嗘瀽灞炴��");
+            return new Response().setIII(1,true, map,summaryList,"棰勮鍒嗘瀽绠$悊-鐢垫簮涓诲睘鎬у拰鍒嗘瀽灞炴��");
         }
     }
     //鍒嗙粍鏌ョ湅闇�瑕佹煡璇㈢數婧�/鐢垫睜瀹炴椂琛ㄧ殑鍝簺鏁版嵁
diff --git a/src/main/java/com/whyc/service/AlmSummaryParamService.java b/src/main/java/com/whyc/service/AlmSummaryParamService.java
new file mode 100644
index 0000000..83d2b9b
--- /dev/null
+++ b/src/main/java/com/whyc/service/AlmSummaryParamService.java
@@ -0,0 +1,22 @@
+package com.whyc.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.whyc.mapper.AlmAnalysisParamMapper;
+import com.whyc.mapper.AlmSummaryParamMapper;
+import com.whyc.pojo.db_param.AlmSummaryParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class AlmSummaryParamService {
+    @Autowired(required = false)
+    private AlmSummaryParamMapper mapper;
+    //鎬荤殑灞炴�ч厤缃�
+    public List<AlmSummaryParam> getInfo() {
+        QueryWrapper wrapper=new QueryWrapper();
+        wrapper.orderByAsc("num");
+        return mapper.selectList(wrapper);
+    }
+}
\ No newline at end of file

--
Gitblit v1.9.1