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 | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/hxzk/controller/WarningController.java b/src/main/java/com/hxzk/controller/WarningController.java
index b4b9151..b94b5b6 100644
--- a/src/main/java/com/hxzk/controller/WarningController.java
+++ b/src/main/java/com/hxzk/controller/WarningController.java
@@ -108,12 +108,31 @@
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);
--
Gitblit v1.9.3