From b7ec87e1ffc8faeed4de127d0076d3d99b8e8faf Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期六, 15 六月 2024 14:08:56 +0800
Subject: [PATCH] 电池实时告警
---
src/main/java/com/whyc/service/BattAlarmService.java | 34 +++++++++++++++-
src/main/java/com/whyc/mapper/BattAlarmMapper.java | 8 ++++
src/main/java/com/whyc/pojo/BattAlarm.java | 4 ++
src/main/java/com/whyc/service/RtEnvirmentService.java | 1
src/main/resources/mapper/BattAlarmMapper.xml | 25 ++++++++++++
pom.xml | 6 +++
src/main/java/com/whyc/controller/BattAlarmController.java | 41 ++++++++++++++++++++
7 files changed, 115 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6630199..b477d5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,12 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
+ <!--pageHelper鍒嗛〉-->
+ <dependency>
+ <groupId>com.github.pagehelper</groupId>
+ <artifactId>pagehelper-spring-boot-starter</artifactId>
+ <version>1.2.5</version>
+ </dependency>
<!--mybatis 鍙妋ybatis-plus-->
<dependency>
<groupId>com.baomidou</groupId>
diff --git a/src/main/java/com/whyc/controller/BattAlarmController.java b/src/main/java/com/whyc/controller/BattAlarmController.java
new file mode 100644
index 0000000..13f17ba
--- /dev/null
+++ b/src/main/java/com/whyc/controller/BattAlarmController.java
@@ -0,0 +1,41 @@
+package com.whyc.controller;
+
+import com.whyc.dto.Response;
+import com.whyc.service.BattAlarmService;
+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;
+
+
+@RestController
+@Api(tags = "鐢垫睜瀹炴椂鍛婅")
+@RequestMapping("battalarm")
+public class BattAlarmController {
+ @Autowired
+ private BattAlarmService service;
+
+ @ApiOperation("鏌ヨ鐢垫睜鍛婅")
+ @GetMapping("getBattAlarm")
+ public Response getBattAlarm(@RequestParam(required = false) int almLevel,@RequestParam String startTime,@RequestParam String endTime
+ ,@RequestParam int pageNum,@RequestParam int pageSize){
+ Response res=service.getBattAlarm(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;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/BattAlarmMapper.java b/src/main/java/com/whyc/mapper/BattAlarmMapper.java
index 838fb8a..12d81ad 100644
--- a/src/main/java/com/whyc/mapper/BattAlarmMapper.java
+++ b/src/main/java/com/whyc/mapper/BattAlarmMapper.java
@@ -1,7 +1,15 @@
package com.whyc.mapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.pojo.BattAlarm;
+
+import java.util.Date;
+import java.util.List;
public interface BattAlarmMapper extends CustomMapper<BattAlarm>{
+ //鏌ヨ鐢垫睜鍛婅
+ List<BattAlarm> getBattAlarm(int almLevel, Date startTime, Date endTime);
+ //鍦ㄧ敤鐢垫睜缁勫疄鏃舵帹閫佸憡璀︿俊鎭�
+ List<BattAlarm> getResBattAlm(int binfId);
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/pojo/BattAlarm.java b/src/main/java/com/whyc/pojo/BattAlarm.java
index 277eee6..614fa83 100644
--- a/src/main/java/com/whyc/pojo/BattAlarm.java
+++ b/src/main/java/com/whyc/pojo/BattAlarm.java
@@ -45,4 +45,8 @@
@TableField("alm_value")
@ApiModelProperty("鍛婅鍊�")
private Float almValue;
+
+ @TableField(exist = false)
+ @ApiModelProperty("鐢垫睜缁勫悕绉�")
+ private String binfName;
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/BattAlarmService.java b/src/main/java/com/whyc/service/BattAlarmService.java
index 2f9e1d7..55276a7 100644
--- a/src/main/java/com/whyc/service/BattAlarmService.java
+++ b/src/main/java/com/whyc/service/BattAlarmService.java
@@ -1,13 +1,20 @@
package com.whyc.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.BattAlarmMapper;
import com.whyc.pojo.BattAlarm;
import com.whyc.pojo.RtData;
+import com.whyc.util.ActionUtil;
+import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
+import java.util.Date;
import java.util.List;
@Service
@@ -20,9 +27,30 @@
鍦ㄧ敤鐢垫睜缁勫疄鏃舵帹閫佸憡璀︿俊鎭�
**/
public Response getResBattAlm(int binfId) {
- QueryWrapper wrapper=new QueryWrapper();
- wrapper.eq("binf_id",binfId);
- List<BattAlarm> list=mapper.selectList(wrapper);
+ List<BattAlarm> list=mapper.getResBattAlm(binfId);
return new Response().setII(1,list!=null,list,"鍦ㄧ敤鐢垫睜缁勫疄鏃舵帹閫佸憡璀︿俊鎭�");
}
+ //鏌ヨ鐢垫睜鍛婅
+ public Response getBattAlarm(int almLevel, String startTime, String endTime ,int pageNum, int pageSize) {
+ PageHelper.startPage(pageNum,pageSize);
+ List<BattAlarm> list=mapper.getBattAlarm(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((BattAlarm) 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((BattAlarm) ActionUtil.objeNull,wrapper);
+ return new Response().set(1,flag>0);
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/RtEnvirmentService.java b/src/main/java/com/whyc/service/RtEnvirmentService.java
index ae49f2f..dc00594 100644
--- a/src/main/java/com/whyc/service/RtEnvirmentService.java
+++ b/src/main/java/com/whyc/service/RtEnvirmentService.java
@@ -8,7 +8,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import javax.management.Query;
@Service
public class RtEnvirmentService {
diff --git a/src/main/resources/mapper/BattAlarmMapper.xml b/src/main/resources/mapper/BattAlarmMapper.xml
new file mode 100644
index 0000000..d13d281
--- /dev/null
+++ b/src/main/resources/mapper/BattAlarmMapper.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.BattAlarmMapper">
+
+ <select id="getBattAlarm" resultType="com.whyc.pojo.BattAlarm">
+ select batt_alarm.*,batt_inf.binf_name from db_alarm.batt_alarm,db_batt.batt_inf
+ <where>
+ batt_alarm.binf_id=batt_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
+ </where>
+ </select>
+ <select id="getResBattAlm" resultType="com.whyc.pojo.BattAlarm">
+ select batt_alarm.*,batt_inf.binf_name from db_alarm.batt_alarm,db_batt.batt_inf
+ <where>
+ batt_alarm.binf_id=batt_inf.binf_id
+ and batt_alarm.binf_id>=#{binfId}
+ order by batt_alarm.alm_start_time asc
+ </where>
+ </select>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.1