From c7e295d1dfdfeb8b092e757b68b374912705ef15 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期四, 29 五月 2025 09:14:45 +0800
Subject: [PATCH] 算法识别告警更新
---
src/main/java/com/whyc/pojo/db_fire_robot/RobotAlarm.java | 2
src/main/java/com/whyc/controller/IdentifyAlarmController.java | 24 ++++++++++++
src/main/java/com/whyc/controller/IdentifyAlarmHisController.java | 27 +++++++++++++
src/main/java/com/whyc/pojo/db_fire_robot/Environment.java | 2
src/main/java/com/whyc/pojo/db_fire_robot/IdentifyAlarm.java | 2
src/main/java/com/whyc/pojo/db_fire_robot/RobotStatus.java | 2
src/main/java/com/whyc/service/IdentifyAlarmService.java | 36 ++++++++++++++++++
src/main/java/com/whyc/pojo/db_fire_robot/IdentifyAlarmHis.java | 2
src/main/java/com/whyc/pojo/db_fire_robot/EnvironmentThreshold.java | 2
9 files changed, 93 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/controller/IdentifyAlarmController.java b/src/main/java/com/whyc/controller/IdentifyAlarmController.java
new file mode 100644
index 0000000..9cc11c6
--- /dev/null
+++ b/src/main/java/com/whyc/controller/IdentifyAlarmController.java
@@ -0,0 +1,24 @@
+package com.whyc.controller;
+
+import com.whyc.dto.Response;
+import com.whyc.service.IdentifyAlarmService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.lang.reflect.InvocationTargetException;
+
+@RestController
+@RequestMapping("identifyAlarm")
+@Api("绠楁硶璇嗗埆鎶ヨ")
+public class IdentifyAlarmController {
+
+ @Autowired
+ private IdentifyAlarmService identifyAlarmService;
+
+ @PostMapping("confirm")
+ public Response confirm(@RequestParam int id) throws InvocationTargetException, IllegalAccessException {
+ return identifyAlarmService.confirm(id);
+ }
+
+}
diff --git a/src/main/java/com/whyc/controller/IdentifyAlarmHisController.java b/src/main/java/com/whyc/controller/IdentifyAlarmHisController.java
new file mode 100644
index 0000000..6a400de
--- /dev/null
+++ b/src/main/java/com/whyc/controller/IdentifyAlarmHisController.java
@@ -0,0 +1,27 @@
+package com.whyc.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.whyc.dto.Response;
+import com.whyc.pojo.db_fire_robot.IdentifyAlarmHis;
+import com.whyc.service.IdentifyAlarmHisService;
+import com.whyc.service.IdentifyAlarmService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.lang.reflect.InvocationTargetException;
+
+@RestController
+@RequestMapping("identifyAlarmHis")
+@Api("绠楁硶璇嗗埆鎶ヨ")
+public class IdentifyAlarmHisController {
+
+ @Autowired
+ private IdentifyAlarmHisService service;
+
+ @GetMapping("getPage")
+ public Response<PageInfo<IdentifyAlarmHis>> getPage(@RequestParam int pageNum, @RequestParam int pageSize){
+ return service.getPage(pageNum, pageSize);
+ }
+
+}
diff --git a/src/main/java/com/whyc/pojo/db_fire_robot/Environment.java b/src/main/java/com/whyc/pojo/db_fire_robot/Environment.java
index a5a23dc..f042c1a 100644
--- a/src/main/java/com/whyc/pojo/db_fire_robot/Environment.java
+++ b/src/main/java/com/whyc/pojo/db_fire_robot/Environment.java
@@ -25,7 +25,7 @@
public class Environment {
@TableId(value = "id",type = IdType.AUTO)
- private int id;
+ private Long id;
@ApiModelProperty(value = "娓╁害")
private float temperature;
@ApiModelProperty(value = "婀垮害")
diff --git a/src/main/java/com/whyc/pojo/db_fire_robot/EnvironmentThreshold.java b/src/main/java/com/whyc/pojo/db_fire_robot/EnvironmentThreshold.java
index da877e9..43fa21c 100644
--- a/src/main/java/com/whyc/pojo/db_fire_robot/EnvironmentThreshold.java
+++ b/src/main/java/com/whyc/pojo/db_fire_robot/EnvironmentThreshold.java
@@ -25,7 +25,7 @@
public class EnvironmentThreshold {
@TableId(value = "id",type = IdType.AUTO)
- private int id;
+ private Long id;
@ApiModelProperty(value = "娓╁害")
private float temperature;
@ApiModelProperty(value = "婀垮害")
diff --git a/src/main/java/com/whyc/pojo/db_fire_robot/IdentifyAlarm.java b/src/main/java/com/whyc/pojo/db_fire_robot/IdentifyAlarm.java
index 43c2757..22c0b8c 100644
--- a/src/main/java/com/whyc/pojo/db_fire_robot/IdentifyAlarm.java
+++ b/src/main/java/com/whyc/pojo/db_fire_robot/IdentifyAlarm.java
@@ -34,7 +34,7 @@
public class IdentifyAlarm {
@TableId(value = "id",type = IdType.AUTO)
- private int id;
+ private Long id;
@ApiModelProperty(value = "閲囬泦鏃堕棿")
private Date gatherTime;
@ApiModelProperty(value = "浣嶇疆")
diff --git a/src/main/java/com/whyc/pojo/db_fire_robot/IdentifyAlarmHis.java b/src/main/java/com/whyc/pojo/db_fire_robot/IdentifyAlarmHis.java
index 0fec936..f0f78be 100644
--- a/src/main/java/com/whyc/pojo/db_fire_robot/IdentifyAlarmHis.java
+++ b/src/main/java/com/whyc/pojo/db_fire_robot/IdentifyAlarmHis.java
@@ -34,7 +34,7 @@
public class IdentifyAlarmHis {
@TableId(value = "id",type = IdType.AUTO)
- private int id;
+ private Long id;
@ApiModelProperty(value = "閲囬泦鏃堕棿")
private Date gatherTime;
@ApiModelProperty(value = "浣嶇疆")
diff --git a/src/main/java/com/whyc/pojo/db_fire_robot/RobotAlarm.java b/src/main/java/com/whyc/pojo/db_fire_robot/RobotAlarm.java
index 2ff69dc..eb85012 100644
--- a/src/main/java/com/whyc/pojo/db_fire_robot/RobotAlarm.java
+++ b/src/main/java/com/whyc/pojo/db_fire_robot/RobotAlarm.java
@@ -30,7 +30,7 @@
public class RobotAlarm {
@TableId(value = "id",type = IdType.AUTO)
- private int id;
+ private Long id;
@ApiModelProperty(value = "鎺ㄩ�佹椂闂�")
private Date pushTime;
@ApiModelProperty(value = "鍗曠墖鏈鸿繛鎺ョ姸鎬�")
diff --git a/src/main/java/com/whyc/pojo/db_fire_robot/RobotStatus.java b/src/main/java/com/whyc/pojo/db_fire_robot/RobotStatus.java
index cdd4ac1..3f29f53 100644
--- a/src/main/java/com/whyc/pojo/db_fire_robot/RobotStatus.java
+++ b/src/main/java/com/whyc/pojo/db_fire_robot/RobotStatus.java
@@ -25,7 +25,7 @@
public class RobotStatus {
@TableId(value = "id",type = IdType.AUTO)
- private int id;
+ private Long id;
@ApiModelProperty(value = "褰撳墠宸℃妯″紡锛� 1-閬ユ帶銆�2-鎵嬪姩銆�3-鑷姩 4 鑷姩杩斿洖 5 鎸囧畾鐐� 6 娓╂箍搴﹁〃璁�")
private int mode;
diff --git a/src/main/java/com/whyc/service/IdentifyAlarmService.java b/src/main/java/com/whyc/service/IdentifyAlarmService.java
index c84121f..f2761c9 100644
--- a/src/main/java/com/whyc/service/IdentifyAlarmService.java
+++ b/src/main/java/com/whyc/service/IdentifyAlarmService.java
@@ -1,11 +1,24 @@
package com.whyc.service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.whyc.dto.Response;
+import com.whyc.hik.Commom.CommonUtil;
import com.whyc.mapper.EnvironmentMapper;
import com.whyc.mapper.IdentifyAlarmMapper;
import com.whyc.pojo.db_fire_robot.IdentifyAlarm;
+import com.whyc.pojo.db_fire_robot.IdentifyAlarmHis;
+import com.whyc.util.ActionUtil;
+import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Date;
+import java.util.List;
@Service
public class IdentifyAlarmService {
@@ -13,7 +26,30 @@
@Resource
private IdentifyAlarmMapper mapper;
+ @Autowired
+ private IdentifyAlarmHisService hisService;
+
public void add(IdentifyAlarm alarm) {
mapper.insert(alarm);
}
+
+ public Response getList() {
+ List<IdentifyAlarm> list = mapper.selectList((Wrapper<IdentifyAlarm>) ActionUtil.objeNull);
+ return new Response<>().set(1, list);
+ }
+
+ @Transactional
+ public Response confirm(int id) throws InvocationTargetException, IllegalAccessException {
+ IdentifyAlarm alarm = mapper.selectById(id);
+ //鍔犲叆鍒板憡璀﹀巻鍙茶〃
+ IdentifyAlarmHis his = new IdentifyAlarmHis();
+ BeanUtils.copyProperties(his,alarm);
+ his.setId(null);
+ his.setConfirmTime(new Date());
+ hisService.add(his);
+ //鍒犻櫎鍛婅璁板綍
+ mapper.deleteById(id);
+ return new Response().setII(1,"纭瀹屾垚");
+ }
+
}
--
Gitblit v1.9.1