From 42247a05252424c4649766fe36faf27340d8899f Mon Sep 17 00:00:00 2001 From: bin Date: Thu, 14 Jan 2021 22:25:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=95=E8=83=BD=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guizhou/handle/GZMessageContentFactory.java | 4 ++-- .../guizhou/handle/GZResponseHandle.java | 4 +++- .../guizhou/handle/GZServiceFactory.java | 4 ++-- .../guizhou/quartz/job/GZSyncSetting.java | 2 +- .../ssjl/zhaobiao/guizhou/utils/GZHttpUtil.java | 3 ++- src/main/resources/application.properties | 16 ++++++++-------- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/ssjl/zhaobiao/guizhou/handle/GZMessageContentFactory.java b/src/main/java/com/ssjl/zhaobiao/guizhou/handle/GZMessageContentFactory.java index bf1b57c..2cd43c2 100644 --- a/src/main/java/com/ssjl/zhaobiao/guizhou/handle/GZMessageContentFactory.java +++ b/src/main/java/com/ssjl/zhaobiao/guizhou/handle/GZMessageContentFactory.java @@ -8,11 +8,11 @@ public class GZMessageContentFactory { public static IMessageContent build(byte type, byte[] content){ IMessageContent item = null; - if(type == 0x00){ + if(type == (byte)0x00){ item = new GZPlatformDeviceConfig(); item.create(content); } - else if(type == 0x01){ + else if(type == (byte)0x01){ item = new GZPlatformCmd(); item.create(content); } diff --git a/src/main/java/com/ssjl/zhaobiao/guizhou/handle/GZResponseHandle.java b/src/main/java/com/ssjl/zhaobiao/guizhou/handle/GZResponseHandle.java index 0c7064a..fd0be76 100644 --- a/src/main/java/com/ssjl/zhaobiao/guizhou/handle/GZResponseHandle.java +++ b/src/main/java/com/ssjl/zhaobiao/guizhou/handle/GZResponseHandle.java @@ -21,7 +21,9 @@ public class GZResponseHandle { GZHttpUtil gzHttpUtil; public Object process(String sourceImei, byte[] res) throws IOException { - if(res[1] == 0xFF){ + System.out.println(res[1]); + System.out.println((byte)0xFF); + if(res[1] == (byte)0xFF){ // 常规应答 return null; diff --git a/src/main/java/com/ssjl/zhaobiao/guizhou/handle/GZServiceFactory.java b/src/main/java/com/ssjl/zhaobiao/guizhou/handle/GZServiceFactory.java index 6aff31c..9e928c4 100644 --- a/src/main/java/com/ssjl/zhaobiao/guizhou/handle/GZServiceFactory.java +++ b/src/main/java/com/ssjl/zhaobiao/guizhou/handle/GZServiceFactory.java @@ -14,10 +14,10 @@ public class GZServiceFactory { IGZPlatformSettingService settingService; public IGZPlatformService getService(byte tag){ - if(tag == 0x00) { + if(tag == (byte)0x00) { return settingService; } - else if(tag == 0x01){ + else if(tag == (byte)0x01){ return cmdService; } return null; diff --git a/src/main/java/com/ssjl/zhaobiao/guizhou/quartz/job/GZSyncSetting.java b/src/main/java/com/ssjl/zhaobiao/guizhou/quartz/job/GZSyncSetting.java index 572c20e..304865a 100644 --- a/src/main/java/com/ssjl/zhaobiao/guizhou/quartz/job/GZSyncSetting.java +++ b/src/main/java/com/ssjl/zhaobiao/guizhou/quartz/job/GZSyncSetting.java @@ -38,7 +38,7 @@ public class GZSyncSetting extends QuartzJobBean { GZAskSetting askSetting = new GZAskSetting(); try { byte[] res = httpUtil.send(device.getImei(), device.getPhone(), askSetting); -// System.out.println(ByteUtil.bytesToHexString(res)); + System.out.println(ByteUtil.bytesToHexString(res)); res = (byte[]) responseHandle.process(device.getImei(), res); // System.out.println(ByteUtil.bytesToHexString(res)); } catch (IOException e) { diff --git a/src/main/java/com/ssjl/zhaobiao/guizhou/utils/GZHttpUtil.java b/src/main/java/com/ssjl/zhaobiao/guizhou/utils/GZHttpUtil.java index 37844bc..866a912 100644 --- a/src/main/java/com/ssjl/zhaobiao/guizhou/utils/GZHttpUtil.java +++ b/src/main/java/com/ssjl/zhaobiao/guizhou/utils/GZHttpUtil.java @@ -27,6 +27,7 @@ public class GZHttpUtil { byte[] res = httpUtil.postBytes(url, b, headers); return res; } catch (IOException e) { + log.info("timeout目标地址：" + url); e.printStackTrace(); throw e; } @@ -48,7 +49,7 @@ public class GZHttpUtil { byte[] res = httpUtil.postBytes(url, b, headers); return res; } catch (IOException e) { - log.info("目标地址：" + url); + log.info("timeout目标地址：" + url); e.printStackTrace(); throw e; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 96dc910..aa1281f 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -39,21 +39,21 @@ netty.port=8888 4g.api.token = 123Te1p0Te1p0321 # \u8D35\u5DDE\u7535\u4FE1\u53C2\u6570 guizhou.protocol=T01.4 -guizhou.factory=telpo -guizhou.device.model=TPS401 -guizhou.device.version=ACB_1001 -#guizhou.factory=zhizhong -#guizhou.device.model=RZL600 -#guizhou.device.version=RZL_2021 +#guizhou.factory=telpo +#guizhou.device.model=TPS401 +#guizhou.device.version=ACB_1001 +guizhou.factory=zhizhong +guizhou.device.model=RZL600 +guizhou.device.version=RZL_2021 #guizhou.factory=zhanneng #guizhou.device.model=TPE390 #guizhou.device.version=TPE_0056 guizhou.http.url=http://120.24.195.54:24183 #\u5929\u6CE2 #guizhou.device.testList= [{ "imei": "862622050253671","phone": "" },{ "imei": "862622050253358","phone": "" },{ "imei": "800115470000678","phone": "" }] -guizhou.device.testList= [{ "imei": "862622050253671","phone": "" }] +#guizhou.device.testList= [{ "imei": "862622050253671","phone": "" }] #\u667A\u4E2D -#guizhou.device.testList= [{ "imei": "862622050654340","phone": "" },{ "imei": "862622050317740","phone": "" }] +guizhou.device.testList= [{ "imei": "862622050654340","phone": "" },{ "imei": "862622050317740","phone": "" }] #\u5C55\u80FD #guizhou.device.testList= [{ "imei": "862622050927027","phone": "" },{ "imei": "862622050925104","phone": "" }]