From feb65b7559ab10260b84546e9b49c160f27105bf Mon Sep 17 00:00:00 2001
From: bin <bin@test.com>
Date: Fri, 15 Jan 2021 03:30:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0SOS=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../guizhou/controller/IotController.java        |  3 +++
 src/main/resources/application.properties        | 16 ++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ssjl/zhaobiao/guizhou/controller/IotController.java b/src/main/java/com/ssjl/zhaobiao/guizhou/controller/IotController.java
index 04df23e..c809d2d 100644
--- a/src/main/java/com/ssjl/zhaobiao/guizhou/controller/IotController.java
+++ b/src/main/java/com/ssjl/zhaobiao/guizhou/controller/IotController.java
@@ -195,6 +195,7 @@ public class IotController {
         byte[] nid = { 0x36, 0x14};
         cdma.setNID(nid);
         GZDeviceStatus deviceStatus = new GZDeviceStatus();
+        deviceStatus.setSOS(gps.getIdType() == 1);
 //        deviceStatus.setOpenFirst(true);
         GpsDeviceStatus gpsDeviceStatus = gpsDeviceStatusMapper.selectByImei(gps.getImei());
         IOTDeviceStatus iotDeviceStatus = IOTDeviceStatus.build(gpsDeviceStatus.getDeviceStatus());
@@ -247,6 +248,7 @@ public class IotController {
         power.setCharge(false);
         power.setPower(iotDeviceStatus.getBattery());
         GZDeviceStatus deviceStatus = new GZDeviceStatus();
+        deviceStatus.setSOS(lbs.getIdType() == 1);
         LocalDateTime time = LocalDateTime.now();
         GZLocationExtend extend = new GZLocationExtend();
         GZLocation location;
@@ -306,6 +308,7 @@ public class IotController {
         power.setCharge(false);
         power.setPower(batty);
         GZDeviceStatus deviceStatus = new GZDeviceStatus();
+        deviceStatus.setSOS(wifi.getIdType() == 1);
         LocalDateTime time = LocalDateTime.now();
         GZLocationExtend extend = new GZLocationExtend();
         List<GZLocationWIFIItem> itemList = new ArrayList<>();
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 01c07d9..6a0e00d 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -40,15 +40,15 @@ netty.port=8888
 # \u8D35\u5DDE\u7535\u4FE1\u53C2\u6570
 guizhou.protocol=T01.4
 
-#guizhou.factory=telpo
-#guizhou.device.model=TPS401
-#guizhou.device.version=ACB_1001
-#guizhou.device.testList= [{ "imei": "862622050253671","phone": "" },{ "imei": "862622050253358","phone": "" },{ "imei": "800115470000678","phone": "" }]
+guizhou.factory=telpo
+guizhou.device.model=TPS401
+guizhou.device.version=ACB_1001
+guizhou.device.testList= [{ "imei": "862622050253671","phone": "" },{ "imei": "862622050253358","phone": "" },{ "imei": "800115470000678","phone": "" }]
 
-guizhou.factory=zhizhong
-guizhou.device.model=RZL600
-guizhou.device.version=RZL_2021
-guizhou.device.testList= [{ "imei": "862622050654340","phone": "" },{ "imei": "862622050317740","phone": "" }]
+#guizhou.factory=zhizhong
+#guizhou.device.model=RZL600
+#guizhou.device.version=RZL_2021
+#guizhou.device.testList= [{ "imei": "862622050654340","phone": "" },{ "imei": "862622050317740","phone": "" }]
 
 #guizhou.factory=zhanneng
 #guizhou.device.model=TPE390