From 70223b3ef4df02622869425fed4ba9b290e1aa74 Mon Sep 17 00:00:00 2001
From: fei.wang <wf18701153496@163.com>
Date: 星期二, 16 四月 2024 14:07:59 +0800
Subject: [PATCH] V定制1.0 1：对讲功能 2：计算经纬度控制器systemcontrollen
---
src/main/java/com/hxzk/controller/WarningController.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/hxzk/controller/WarningController.java b/src/main/java/com/hxzk/controller/WarningController.java
index b8445e5..b94b5b6 100644
--- a/src/main/java/com/hxzk/controller/WarningController.java
+++ b/src/main/java/com/hxzk/controller/WarningController.java
@@ -5,6 +5,7 @@
import com.hxzk.pojo.TbSystemOperationLog;
import com.hxzk.pojo.TbTag;
import com.hxzk.pojo.TbWarning;
+import com.hxzk.service.SystemLogService;
import com.hxzk.service.TagService;
import com.hxzk.service.WarningService;
import com.hxzk.udp.Udp_Out;
@@ -29,6 +30,9 @@
public class WarningController {
@Autowired
WarningService warningService;
+
+ @Autowired
+ SystemLogService systemLogService;
//鏌ヨ鎵�鏈夋爣绛捐澶囦俊鎭�
@GetMapping("findwarning")
result<List<com.hxzk.deo.TbWarning>> findwarning(Integer page, Integer limit){
@@ -81,13 +85,18 @@
warning.setBaoliu4(GetTime.getTime());
warning.setStatus("宸插鐞�");
String[] ids1 = ids.split(",");
+ String[] ids2 = warning.getType().split(",");
+ String[] ids3 = warning.getObjectid().split(",");
for (int i =0; i < ids1.length;i++){
+ warning.setType(ids2[i]);
+ warning.setObjectid(ids3[i]);
warningService.ChuliWarning(warning,ids1[i]);
TbWarning warning1 = warningService.findtagidWarning(ids1[i]);
TbSystemOperationLog systemOperationLog = new TbSystemOperationLog();
systemOperationLog.setName(UserController.username);
systemOperationLog.setTime(gettime());
- systemOperationLog.setContent("鍦ㄥ悗鍙板鐞嗕簡涓�鏉″憡璀︽暟鎹紝璇ユ暟鎹澶嘔D鏄細"+warning.getObjectid()+"锛岀被鍨嬫槸锛�"+warning.getType());
+ systemOperationLog.setContent("鍦ㄥ悗鍙板鐞嗕簡涓�鏉″憡璀︽暟鎹紝璇ユ暟鎹澶嘔D鏄細"+ids3[i]+"锛岀被鍨嬫槸锛�"+ids2[i]);
+ systemLogService.insertSystem(systemOperationLog);
String xieyi = "BSTOCS1,DELLWARN," +warning1.getObjectid()+","+warning1.getType()+",END";
Udp_Out.udp_to_cs(xieyi);
}
@@ -97,14 +106,36 @@
//棣栭〉澶у睆鍗曠嫭澶勭悊鍛婅
@PostMapping("DaPingDellWarning")
public void deletegaojing(TbWarning warning,String username) throws IOException {
+ TbWarning warning1 = warningService.findIdXiangXi(warning.getId());
warning.setBaoliu4(GetTime.getTime());
+ warning.setBaoliu6(warning.getBaoliu5());
warning.setBaoliu3(username);
+ warning.setObjectid(warning1.getObjectid());
warning.setStatus("宸插鐞�");
String xieyi = "BSTOCS1,DELLWARN," +warning.getId()+","+warning.getType()+",END";
TbSystemOperationLog systemOperationLog = new TbSystemOperationLog();
- systemOperationLog.setName(UserController.username);
+ systemOperationLog.setName(username);
systemOperationLog.setTime(gettime());
systemOperationLog.setContent("鍦ㄥぇ灞忓鐞嗕簡涓�鏉″憡璀︽暟鎹紝璇ユ暟鎹澶嘔D鏄細"+warning.getObjectid()+"锛岀被鍨嬫槸锛�"+warning.getType());
+ systemLogService.insertSystem(systemOperationLog);
+ Udp_Out.udp_to_cs(xieyi);
+ warningService.DaPingChuliWarning(warning);
+ }
+
+ //棣栭〉澶у睆鍗曠嫭澶勭悊鍛婅
+ @PostMapping("DaPingDellWarning1")
+ public void deletegaojing1(TbWarning warning,String username) throws IOException {
+ warning.setBaoliu6(warning.getBaoliu5());
+ warning.setBaoliu4(GetTime.getTime());
+ warning.setBaoliu3(username);
+ warning.setObjectid(String.valueOf(warning.getId()));
+ warning.setStatus("宸插鐞�");
+ String xieyi = "BSTOCS1,DELLWARN," +warning.getId()+","+warning.getType()+",END";
+ TbSystemOperationLog systemOperationLog = new TbSystemOperationLog();
+ systemOperationLog.setName(username);
+ systemOperationLog.setTime(gettime());
+ systemOperationLog.setContent("鍦ㄥぇ灞忓鐞嗕簡涓�鏉″憡璀︽暟鎹紝璇ユ暟鎹澶嘔D鏄細"+warning.getObjectid()+"锛岀被鍨嬫槸锛�"+warning.getType());
+ systemLogService.insertSystem(systemOperationLog);
Udp_Out.udp_to_cs(xieyi);
warningService.DaPingChuliWarning(warning);
}
@@ -115,6 +146,7 @@
systemOperationLog.setName(UserController.username);
systemOperationLog.setTime(gettime());
systemOperationLog.setContent("鍦ㄥ悗鍙板鐞嗕簡涓�鏉″憡璀︽暟鎹紝璇ユ暟鎹澶嘔D鏄細"+warning.getObjectid()+"锛岀被鍨嬫槸锛�"+warning.getType());
+ systemLogService.insertSystem(systemOperationLog);
Udp_Out.udp_to_cs(xieyi);
}
//鍏ㄩ儴澶勭悊鍛婅
@@ -133,6 +165,7 @@
systemOperationLog.setName(UserController.username);
systemOperationLog.setTime(gettime());
systemOperationLog.setContent("鎴愬姛鎶�"+warning.getType()+"娑堟伅鍏ㄩ儴澶勭悊");
+ systemLogService.insertSystem(systemOperationLog);
Udp_Out.udp_to_cs(xieyi);
response.sendRedirect("/hxzkuwb/HouTai/GaoJingHuiZong/GaoJingHuiZong.jsp");
}
--
Gitblit v1.9.3