From 1f3902d6ecd37fea086ffcf1a1bf4d4ed112b45e Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 05 Jun 2021 16:32:27 +0800
Subject: [PATCH] 公安版本初版
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 3 +--
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java | 6 +++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java
index 5cfb103..09be430 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java
@@ -42,9 +42,9 @@
@Override
public void run(String... args) throws Exception {
- Server server=new Server(8088);
- //TcpServer tcpServer = new TcpServer(8099);
- WebSocketServer webSocketServer= new WebSocketServer(9034);
+// Server server=new Server(8088);
+// //TcpServer tcpServer = new TcpServer(8099);
+// WebSocketServer webSocketServer= new WebSocketServer(9034);
// UdpServer udpServer = new UdpServer(9534);
// Server serverTwo = new Server(9534);
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
index 7d4d0fe..a5531c6 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
@@ -217,7 +217,7 @@
e.threeId,
e.deptId,
e.manufacturers,
- e.street as place,
+ a.place as place,
e.channelNumber,
u.name as baname,
u.id as baid,
@@ -228,7 +228,6 @@
LEFT JOIN jfpthPublicSecurity.blade_user u ON u.id = a.securityId
where 1=1
<include refid="alarmCondition"></include>
- and a.waringType IN("紧急求救")
ORDER BY
a.jtype ASC,
a.alarmTime DESC
--
Gitblit v1.9.3