From 2e9d51ac8b7835f2b002eb686f23304da4c3559e Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 12 十二月 2024 10:00:29 +0800
Subject: [PATCH] 告警
---
src/main/java/com/whyc/mapper/PowerAlarmMapper.java | 15 +++
src/main/resources/mapper/PowerAlarmMapper.xml | 25 ++++++
src/main/java/com/whyc/service/PowerAlarmHistoryService.java | 13 +++
src/main/java/com/whyc/service/BattAlarmHisService.java | 2
src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarm.java | 4 +
src/main/java/com/whyc/controller/PowerAlarmController.java | 55 +++++++++++++
src/main/resources/mapper/BattAlarmMapper.xml | 14 +-
src/main/java/com/whyc/controller/BattAlarmController.java | 6
src/main/java/com/whyc/service/PowerAlarmService.java | 53 +++++++++++++
9 files changed, 176 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BattAlarmController.java b/src/main/java/com/whyc/controller/BattAlarmController.java
index 9741443..af0a474 100644
--- a/src/main/java/com/whyc/controller/BattAlarmController.java
+++ b/src/main/java/com/whyc/controller/BattAlarmController.java
@@ -46,10 +46,10 @@
}
@ApiOperation("鏌ヨ鐢垫睜缁勫巻鍙叉椂闂村憡璀�")
- @GetMapping("getHisAlatm")
- public Response getHisAlatm(@RequestParam int binfId,@RequestParam String startTime,@RequestParam String endTime
+ @GetMapping("getHisAlarm")
+ public Response getHisAlarm(@RequestParam int binfId,@RequestParam String startTime,@RequestParam String endTime
, @RequestParam int pageNum, @RequestParam int pageSize) throws ParseException, InterruptedException {
- Response res=hisService.getHisAlatm(binfId,startTime,endTime,pageNum,pageSize);
+ Response res=hisService.getHisAlarm(binfId,startTime,endTime,pageNum,pageSize);
return res;
}
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/controller/PowerAlarmController.java b/src/main/java/com/whyc/controller/PowerAlarmController.java
new file mode 100644
index 0000000..ca0f9fb
--- /dev/null
+++ b/src/main/java/com/whyc/controller/PowerAlarmController.java
@@ -0,0 +1,55 @@
+package com.whyc.controller;
+
+import com.whyc.dto.Response;
+import com.whyc.service.PowerAlarmHistoryService;
+import com.whyc.service.PowerAlarmService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.text.ParseException;
+
+@RestController
+@Api(tags = "鐢垫簮瀹炴椂鍛婅")
+@RequestMapping("poweralarm")
+public class PowerAlarmController {
+
+ @Autowired
+ private PowerAlarmService service;
+
+ @Autowired
+ private PowerAlarmHistoryService hisService;
+
+ @ApiOperation("鏌ヨ鐢垫簮鍛婅")
+ @GetMapping("getPowerAlarm")
+ public Response getPowerAlarm(@RequestParam(required = false) int almLevel, @RequestParam String startTime, @RequestParam String endTime
+ , @RequestParam int pageNum, @RequestParam int pageSize){
+ Response res=service.getPowerAlarm(almLevel,startTime,endTime,pageNum,pageSize);
+ return res;
+ }
+
+ @ApiOperation("纭鍛婅")
+ @GetMapping("confirmAlarm")
+ public Response confirmAlarm(@RequestParam int num){
+ Response res=service.confirmAlarm(num);
+ return res;
+ }
+ @ApiOperation("鍙栨秷鍛婅")
+ @GetMapping("cancleAlarm")
+ public Response cancleAlarm(@RequestParam int num){
+ Response res=service.cancleAlarm(num);
+ return res;
+ }
+
+ @ApiOperation("鏌ヨ鐢垫簮鍘嗗彶鏃堕棿鍛婅")
+ @GetMapping("getHisAlarm")
+ public Response getHisAlarm(@RequestParam int pinfId,@RequestParam String startTime,@RequestParam String endTime
+ , @RequestParam int pageNum, @RequestParam int pageSize) throws ParseException, InterruptedException {
+ Response res=hisService.getHisAlarm(pinfId,startTime,endTime,pageNum,pageSize);
+ return res;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/PowerAlarmMapper.java b/src/main/java/com/whyc/mapper/PowerAlarmMapper.java
new file mode 100644
index 0000000..325be49
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/PowerAlarmMapper.java
@@ -0,0 +1,15 @@
+package com.whyc.mapper;
+
+import com.whyc.pojo.db_alarm.BattAlarm;
+import com.whyc.pojo.db_power_alarm.PowerAlarm;
+
+import java.util.Date;
+import java.util.List;
+
+public interface PowerAlarmMapper extends CustomMapper<PowerAlarm>{
+ //鏌ヨ鐢垫簮鍛婅
+ List<PowerAlarm> getPowerAlarm(int almLevel, Date parse, Date parse1);
+
+ //鍦ㄧ敤鐢垫簮瀹炴椂鎺ㄩ�佸憡璀︿俊鎭�
+ List<PowerAlarm> getResPowerAlm(int pinfId);
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarm.java b/src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarm.java
index 13ffbcf..417980d 100644
--- a/src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarm.java
+++ b/src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarm.java
@@ -59,4 +59,8 @@
@TableField("alm_level")
@ApiModelProperty("鍛婅绛夌骇[1-绱ф�� 2-閲嶅ぇ -3-涓�鑸琞")
private Integer almLevel;
+
+ @TableField(exist = false)
+ @ApiModelProperty("鐢垫簮鍚嶇О")
+ private String powerName;
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/BattAlarmHisService.java b/src/main/java/com/whyc/service/BattAlarmHisService.java
index 7e2f5a3..e222f0c 100644
--- a/src/main/java/com/whyc/service/BattAlarmHisService.java
+++ b/src/main/java/com/whyc/service/BattAlarmHisService.java
@@ -16,7 +16,7 @@
private SubTablePageInfoUtil util;
//鏌ヨ鐢垫睜缁勫巻鍙叉椂闂村憡璀�
- public Response getHisAlatm(int binfId, String startTime, String endTime,int pageNum,int pageSize)throws ParseException, InterruptedException {
+ public Response getHisAlarm(int binfId, String startTime, String endTime,int pageNum,int pageSize)throws ParseException, InterruptedException {
BattAlarmHistory his=new BattAlarmHistory();
his.setBinfId(binfId);
PageInfo pageInfo=util.getPageInfoByMonthTable(pageNum,pageSize, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1)
diff --git a/src/main/java/com/whyc/service/PowerAlarmHistoryService.java b/src/main/java/com/whyc/service/PowerAlarmHistoryService.java
new file mode 100644
index 0000000..881429b
--- /dev/null
+++ b/src/main/java/com/whyc/service/PowerAlarmHistoryService.java
@@ -0,0 +1,13 @@
+package com.whyc.service;
+
+import com.whyc.dto.Response;
+import org.springframework.stereotype.Service;
+
+@Service
+public class PowerAlarmHistoryService {
+
+ //鏌ヨ鐢垫簮鍘嗗彶鏃堕棿鍛婅
+ public Response getHisAlarm(int pinfId, String startTime, String endTime, int pageNum, int pageSize) {
+ return new Response().set(1);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/PowerAlarmService.java b/src/main/java/com/whyc/service/PowerAlarmService.java
new file mode 100644
index 0000000..0c43814
--- /dev/null
+++ b/src/main/java/com/whyc/service/PowerAlarmService.java
@@ -0,0 +1,53 @@
+package com.whyc.service;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.whyc.dto.Response;
+import com.whyc.mapper.PowerAlarmMapper;
+import com.whyc.pojo.db_alarm.BattAlarm;
+import com.whyc.pojo.db_power_alarm.PowerAlarm;
+import com.whyc.util.ActionUtil;
+import com.whyc.util.ThreadLocalUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PowerAlarmService {
+
+ @Autowired(required = false)
+ private PowerAlarmMapper mapper;
+
+ /*
+ 鍦ㄧ敤鐢垫簮瀹炴椂鎺ㄩ�佸憡璀︿俊鎭�
+ **/
+ public Response getResPowerAlm(int pinfId) {
+ List<PowerAlarm> list=mapper.getResPowerAlm(pinfId);
+ return new Response().setII(1,list!=null,list,"鍦ㄧ敤鐢垫簮瀹炴椂鎺ㄩ�佸憡璀︿俊鎭�");
+ }
+ //鏌ヨ鐢垫簮鍛婅
+ public Response getPowerAlarm(int almLevel, String startTime, String endTime ,int pageNum, int pageSize) {
+ PageHelper.startPage(pageNum,pageSize);
+ List<PowerAlarm> list=mapper.getPowerAlarm(almLevel, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1));
+ PageInfo pageInfo=new PageInfo(list);
+ return new Response().setII(1,list!=null,pageInfo,"鏌ヨ鐢垫簮鍛婅");
+ }
+ //纭鍛婅
+ public Response confirmAlarm(int num) {
+ UpdateWrapper wrapper=new UpdateWrapper();
+ wrapper.eq("num",num);
+ wrapper.set("alm_confirm",1);
+ int flag=mapper.update((PowerAlarm) ActionUtil.objeNull,wrapper);
+ return new Response().set(1,flag>0);
+ }
+ //鍙栨秷鍛婅
+ public Response cancleAlarm(int num) {
+ UpdateWrapper wrapper=new UpdateWrapper();
+ wrapper.eq("num",num);
+ wrapper.set("alm_confirm",0);
+ int flag=mapper.update((PowerAlarm) ActionUtil.objeNull,wrapper);
+ return new Response().set(1,flag>0);
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/mapper/BattAlarmMapper.xml b/src/main/resources/mapper/BattAlarmMapper.xml
index dc5b0ca..42130bd 100644
--- a/src/main/resources/mapper/BattAlarmMapper.xml
+++ b/src/main/resources/mapper/BattAlarmMapper.xml
@@ -3,23 +3,23 @@
<mapper namespace="com.whyc.mapper.BattAlarmMapper">
<select id="getBattAlarm" resultType="com.whyc.pojo.db_alarm.BattAlarm">
- select batt_alarm.*,batt_inf.binf_name from db_alarm.batt_alarm,db_batt.batt_inf
+ select batt_alarm.*,batt_inf.binf_name from db_alarm.batt_alarm,db_batt.power_inf
<where>
- batt_alarm.binf_id=batt_inf.binf_id
+ batt_alarm.binf_id=power_inf.binf_id
and batt_alarm.alm_start_time>=#{startTime}
and batt_alarm.alm_start_time<=#{endTime}
<if test="almLevel!=null">
and batt_alarm.alm_level=#{almLevel}
</if>
- order by batt_alarm.alm_start_time asc
+ order by batt_alarm.alm_start_time desc
</where>
</select>
<select id="getResBattAlm" resultType="com.whyc.pojo.db_alarm.BattAlarm">
select batt_alarm.*,power_inf.binf_name from db_alarm.batt_alarm,db_batt.power_inf
<where>
batt_alarm.binf_id=power_inf.binf_id
- and batt_alarm.binf_id>=#{binfId}
- order by batt_alarm.alm_start_time asc
+ and batt_alarm.binf_id=#{binfId}
+ order by batt_alarm.alm_start_time desc
</where>
</select>
<select id="getAlm2" resultType="com.whyc.pojo.db_alarm.BattAlarm">
@@ -27,8 +27,8 @@
from db_alarm.tb_battalarm_data
<where>
BattGroupId=#{battGroupId}
- and alm_signal_id in(13)
- and alm_severity=1
+ and alm_type=1
+ and alm_level=1
</where>
</select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/PowerAlarmMapper.xml b/src/main/resources/mapper/PowerAlarmMapper.xml
new file mode 100644
index 0000000..01fc0c8
--- /dev/null
+++ b/src/main/resources/mapper/PowerAlarmMapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.whyc.mapper.PowerAlarmMapper">
+
+ <select id="getPowerAlarm" resultType="com.whyc.pojo.db_power_alarm.PowerAlarm">
+ select power_alarm.*,batt_inf.power_name from db_power_alarm.power_alarm,db_batt.power_inf
+ <where>
+ power_alarm.power_id=power_inf.power_id
+ and power_alarm.alm_start_time>=#{startTime}
+ and power_alarm.alm_start_time<=#{endTime}
+ <if test="almLevel!=null">
+ and power_alarm.alm_level=#{almLevel}
+ </if>
+ order by power_alarm.alm_start_time desc
+ </where>
+ </select>
+ <select id="getResPowerAlm" resultType="com.whyc.pojo.db_power_alarm.PowerAlarm">
+ select power_alarm.*,power_inf.power_name from db_power_alarm.power_alarm,db_batt.power_inf
+ <where>
+ power_alarm.power_id=power_inf.power_id
+ and power_alarm.power_id=#{pinfId}
+ order by power_alarm.alm_start_time desc
+ </where>
+ </select>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.1