From 71b6b716361c52af290493d365a328fc1a3467e2 Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Thu, 28 Jan 2021 11:15:06 +0800
Subject: [PATCH] 1.统计接口 2.健康码
---
src/main/java/org/springblade/modules/nettyServer/ServerHandler.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/nettyServer/ServerHandler.java b/src/main/java/org/springblade/modules/nettyServer/ServerHandler.java
index af535c3..8713a97 100644
--- a/src/main/java/org/springblade/modules/nettyServer/ServerHandler.java
+++ b/src/main/java/org/springblade/modules/nettyServer/ServerHandler.java
@@ -144,7 +144,7 @@
alarm.setAlarmTime(df.format(day));
alarm.setPlace((String) list.get(0).get("streeName"));//事发地址
alarm.setDeviceNumber((String) list.get(0).get("deviceNumber"));//设备编号
- alarm.setAddvcd((String) list.get(0).get("addvcd"));//行政区编码
+ alarm.setDistrict((String) list.get(0).get("addvcd"));//行政区编码
alarm.setJd((String) list.get(0).get("jd"));//经度
alarm.setWd((String) list.get(0).get("wd"));//纬度
alarm.setJtype("0");
@@ -183,13 +183,13 @@
case "LD":
{
// if (Pattern.matches(content, reg_LD))
+ String deviceNumber = content.substring(10, 22);
String keyword = content.substring(23, 27);
System.out.println(keyword);
switch(keyword)
{
case "IMEI":
{
- System.out.println("IMEI------------------");
Date d = new Date();
SimpleDateFormat sbf = new SimpleDateFormat("MMddHHmm");
outData.add("LC8C0470" + sbf.format(d) + "#@" + "LEOK#@");
@@ -212,6 +212,10 @@
}
case "TEST":
{
+ Date d = new Date();
+ SimpleDateFormat sbf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String format = sbf.format(d);
+ serverHandler.equipmentService.updateChannel(format,deviceNumber);
outData.add("LEOK#@");
outData.add("LEON#@");
break;
--
Gitblit v1.9.3