From e241acb82959328535d8f903902863bd420df139 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期一, 04 九月 2023 10:28:32 +0800
Subject: [PATCH] 增加zldz协议
---
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/util/CRC8.java | 186 ++
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/builder/ReMessageBuilder.java | 130 +
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/message/Message.java | 52
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder8817.java | 54
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/mq/ReceiverServer.java | 90 +
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/task/ReSendGrainTask.java | 99 +
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/mq/PublisherControl.java | 42
igds-protocol-zldz/pom.xml | 49
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/message/Metadata.java | 18
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/message/ReMessageBody.java | 18
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1123.java | 65
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/task/CommandReSendService.java | 145 +
igds-web/src/main/resources/application-pro1000.yml | 80
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1115.java | 79
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisGrain.java | 819 +++++++++
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/inout/BHZNWeightServiceImpl.java | 2
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1126.java | 100 +
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/task/ReSendCommonTask.java | 95 +
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/server/MsgConsumer.java | 46
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1116_1.java | 97 +
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/BaseRemoteImpl.java | 46
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisTH.java | 120 +
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/RemoteCommonImpl.java | 426 +++++
pom.xml | 4
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/RemoteGrainServiceImpl.java | 129 +
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/task/CommandTask.java | 31
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/util/CRC16.java | 135 +
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/message/ReMessage.java | 74
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder8829.java | 73
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/message/MessageBody.java | 13
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/AnalysisService.java | 82
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder8815.java | 41
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/OnLineCommandBuilder.java | 40
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/server/BhznGrainV1SessionListener.java | 7
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1128.java | 74
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1116_0.java | 83
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisConf.java | 381 ++++
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1122.java | 46
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1125.java | 73
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/server/HeartbeatProviderImpl.java | 45
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/server/SessionListener.java | 40
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/util/ServerUtils.java | 68
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java | 13
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/RemoteGrainV1ServiceImpl.java | 24
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/ServerRunner.java | 53
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/mq/RedisSubConfig.java | 75
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder.java | 144 +
igds-web/src/main/resources/application-pro5322.yml | 80
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/server/ZldzServerEngine.java | 113 +
igds-web/pom.xml | 63
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisService.java | 211 ++
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/package-info.java | 6
52 files changed, 5,022 insertions(+), 57 deletions(-)
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java
index bb0cf5a..4e73906 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java
+++ b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java
@@ -1,6 +1,7 @@
package com.ld.igds.protocol.bhzn;
import com.ld.igds.data.ConfigData;
+import com.ld.igds.protocol.bhzn.grainv1.server.BhznGrainV1ServerEngine;
import com.ld.igds.protocol.bhzn.grainv2.server.BhznGrainV2ServerEngine;
import com.ld.igds.protocol.bhzn.verb.server.BhznVerbServerEngine;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,19 +21,21 @@
@Autowired
private ConfigData configData;
@Autowired
- private BhznGrainV2ServerEngine bhznGrainServerEngine;
+ private BhznGrainV2ServerEngine bhznGrainServerEngine2;
+ @Autowired
+ private BhznGrainV1ServerEngine bhznGrainServerEngine1;
@Autowired
private BhznVerbServerEngine bhznVerbServerEngine;
@Override
public void run(String... strings) throws Exception {
if (configData.getActive().indexOf("pro") >= 0) {
- bhznGrainServerEngine.start(BhznGrainV2ServerEngine.PORT);
- bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
+ bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
+ // bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
}
if (configData.getActive().indexOf("dev") >= 0) {
- bhznGrainServerEngine.start(BhznGrainV2ServerEngine.PORT);
- bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
+ bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
+ //bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
}
}
}
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/RemoteGrainV1ServiceImpl.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/RemoteGrainV1ServiceImpl.java
index 16be4b2..1000c64 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/RemoteGrainV1ServiceImpl.java
+++ b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/RemoteGrainV1ServiceImpl.java
@@ -37,8 +37,28 @@
public GrainResponse checkGrain(CheckGrainRequest request) {
try {
// 鐢熸垚绮儏淇℃伅
- String hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), request.getDepotId());
-
+ String hexStr = "";
+ if("5323".equals(request.getCompanyId())){
+ if("0P01".equals(request.getDepotId())){
+ hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), "1");
+ }else if("0P02".equals(request.getDepotId())){
+ hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), "1");
+ }else if("0P03".equals(request.getDepotId())){
+ hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), "2");
+ }else if("0P04".equals(request.getDepotId())){
+ hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), "2");
+ }else if("0P05".equals(request.getDepotId())){
+ hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), "3");
+ }else if("0P06".equals(request.getDepotId())){
+ hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), "4");
+ }else if("0P07".equals(request.getDepotId())){
+ hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), "4");
+ }else if("0P08".equals(request.getDepotId())){
+ hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), "4");
+ }
+ }else{
+ hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), request.getDepotId());
+ }
// //閫氳浣跨敤鐨勬槸涓绘満閫氳
// DeviceSer mainSer = coreSerService.getCacheSer(ContextUtil.getDefaultCompanyId(), BhznGrainV1ServerUtils.DEFAULT_MAC_ID);
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/AnalysisService.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/AnalysisService.java
index 41a7547..7772715 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/AnalysisService.java
+++ b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/AnalysisService.java
@@ -5,13 +5,11 @@
import com.ld.igds.common.dto.THDto;
import com.ld.igds.constant.BizType;
import com.ld.igds.constant.Constant;
+import com.ld.igds.constant.DepotType;
import com.ld.igds.grain.GrainUtil;
import com.ld.igds.grain.dto.GrainItemInfo;
import com.ld.igds.io.notify.NotifyGrainInvoker;
-import com.ld.igds.models.DepotConf;
-import com.ld.igds.models.DeviceSer;
-import com.ld.igds.models.DicSysConf;
-import com.ld.igds.models.Grain;
+import com.ld.igds.models.*;
import com.ld.igds.order.ExeOrderService;
import com.ld.igds.order.data.ExeRequest;
import com.ld.igds.protocol.bhzn.grainv1.msg.builder.CommandBuild;
@@ -75,7 +73,7 @@
//DO NOTHING
log.info("涓绘満------->>骞冲彴锛氭敞鍐屼俊鎭姤鏂�={}", message);
- DeviceSer ser = coreSerService.getCacheSerBySn(ContextUtil.getDefaultCompanyId(),message.getAddr());
+ DeviceSer ser = coreSerService.getCacheSerBySn("5323",message.getAddr());
if(ser!= null ){
ser.setIp(message.getIp());
ser.setPort(message.getPort());
@@ -113,7 +111,7 @@
//鏍规嵁鍒嗘満鍦板潃鑾峰彇鍒嗘満淇℃伅
- DeviceSer ser = coreSerService.getCacheSer(ContextUtil.getDefaultCompanyId(), message.getAddr());
+ DeviceSer ser = coreSerService.getCacheSer("5323", message.getAddr());
if (ser == null) {
replayGrain(message);
log.error("涓绘満-------->>骞冲彴锛岃В鏋愮伯鎯呭け璐ワ紝鏈幏鍙栧埌绯荤粺绮儏涓绘満閰嶇疆锛�" + message.getAddr());
@@ -145,15 +143,30 @@
log.error("鍒嗘満------>>>骞冲彴锛�" + info);
return;
}
-
+ Depot depot = commonService.getDepotById(depotConf.getCompanyId(),depotConf.getDepotId());
+ if (null == depot) {
+ String info = "绮儏瑙ｆ瀽澶辫触:鍒嗘満=" + ser.getName() + "娌℃湁鑾峰彇鍒扮伯鎯呭弬鏁伴厤缃粨搴撱��";
+ log.error("鍒嗘満------>>>骞冲彴锛�" + info);
+ return;
+ }
// 绮儏鐨勬壒娆″彿閲嶆柊鏍规嵁棰戠巼璋冩暣
String batchId = ContextUtil.getBatchIdByFireq(depotConf.getGrainFreq());
// 鍒ゆ柇鏁版嵁鏈夋病鏈夋敹鍙栧畬鏁�
String[] attCable = depotConf.getCableRule().split("-");
- int cableZ = Integer.valueOf(attCable[0]);
- int cableY = Integer.valueOf(attCable[1]);
- int cableX = Integer.valueOf(attCable[2]);
+ int cableZ = 1;
+ int cableY = 1;
+ int cableX = 1;
+
+ if(DepotType.TYPE_01.equals(depot.getDepotType())){
+ cableZ = Integer.valueOf(attCable[0]);
+ cableY = Integer.valueOf(attCable[1]);
+ cableX = Integer.valueOf(attCable[2]);
+ }else{
+ cableZ = Integer.valueOf(depotConf.getCableCir());
+ cableY = Integer.valueOf(attCable[0]);
+ cableX = 1;
+ }
int sumPoint = cableZ * cableY * cableX;
//鑾峰彇褰撳墠绮儏娓╁害鎶ユ枃
@@ -215,10 +228,26 @@
private void analysisGrain2(DeviceSer ser, IoMessage message, ExeRequest exeRequest, DepotConf depotConf, DicSysConf sysConf, String batchId, String grainStr) {
// 鑾峰彇瀹屾暣鐨勭伯鎯呭寘淇℃伅
+ Depot depot = commonService.getDepotById(depotConf.getCompanyId(),depotConf.getDepotId());
+ if (null == depot) {
+ String info = "绮儏瑙ｆ瀽澶辫触:鍒嗘満=" + ser.getName() + "娌℃湁鑾峰彇鍒扮伯鎯呭弬鏁伴厤缃粨搴撱��";
+ log.error("鍒嗘満------>>>骞冲彴锛�" + info);
+ return;
+ }
String[] attCable = depotConf.getCableRule().split("-");
- int cableZ = Integer.valueOf(attCable[0]);
- int cableY = Integer.valueOf(attCable[1]);
- int cableX = Integer.valueOf(attCable[2]);
+ int cableZ = 1;
+ int cableY = 1;
+ int cableX = 1;
+
+ if(DepotType.TYPE_01.equals(depot.getDepotType())){
+ cableZ = Integer.valueOf(attCable[0]);
+ cableY = Integer.valueOf(attCable[1]);
+ cableX = Integer.valueOf(attCable[2]);
+ }else{
+ cableZ = Integer.valueOf(depotConf.getCableCir());
+ cableY = Integer.valueOf(attCable[0]);
+ cableX = 1;
+ }
// 鏍规嵁灞傝鍒楄幏鍙栨寚瀹氶暱搴�
int start = 4 * (depotConf.getCableStart() - ser.getCableStart())
@@ -275,7 +304,12 @@
private void addPoint1(List<Double> temps,
DepotConf depotConf, DeviceSer ser, ExeRequest exeRequest,
THDto thDto, DicSysConf sysConf, String batchId) {
-
+ Depot depot = commonService.getDepotById(depotConf.getCompanyId(),depotConf.getDepotId());
+ if (null == depot) {
+ String info = "绮儏瑙ｆ瀽澶辫触:鍒嗘満=" + ser.getName() + "娌℃湁鑾峰彇鍒扮伯鎯呭弬鏁伴厤缃粨搴撱��";
+ log.error("鍒嗘満------>>>骞冲彴锛�" + info);
+ return;
+ }
//鏍规嵁鐢电紗璧峰鏂逛綅鍜屽竷绾挎柟鍚戯紝瀵圭伯鎯呮暟鎹繘琛岃皟鏁�
if (null != depotConf.getStartOrientation()) {
temps = reversalGrainPoint(temps, depotConf);
@@ -288,14 +322,26 @@
}
String[] attCable = depotConf.getCableRule().split("-");
- int cableZ = Integer.valueOf(attCable[0]);
- int cableY = Integer.valueOf(attCable[1]);
- int cableX = Integer.valueOf(attCable[2]);
+ int cableZ = 1;
+ int cableY = 1;
+ int cableX = 1;
+
+ if(DepotType.TYPE_01.equals(depot.getDepotType())){
+ cableZ = Integer.valueOf(attCable[0]);
+ cableY = Integer.valueOf(attCable[1]);
+ cableX = Integer.valueOf(attCable[2]);
+ }else{
+ cableZ = Integer.valueOf(depotConf.getCableCir());
+ cableY = Integer.valueOf(attCable[0]);
+ cableX = 1;
+ }
+
Grain grain = new Grain();
grain.setDepotId(depotConf.getDepotId());
grain.setCompanyId(depotConf.getCompanyId());
grain.setCable(depotConf.getCableRule());
+ grain.setCableCir(depotConf.getCableCir());
grain.setBatchId(batchId);
grain.setTempIn(Constant.ERROR_TEMP);
grain.setHumidityIn(Constant.ERROR_TEMP);
@@ -430,7 +476,7 @@
private void analysisTh(IoMessage message) {
try {
THDto th = new THDto();
- th.setCompanyId(ContextUtil.getDefaultCompanyId());
+ th.setCompanyId("5323");
String data = message.getContent();
String houseNo = data.substring(0, 2);
String t = data.substring(4, 8);
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/server/BhznGrainV1SessionListener.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/server/BhznGrainV1SessionListener.java
index dfba6d2..452fc16 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/server/BhznGrainV1SessionListener.java
+++ b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/server/BhznGrainV1SessionListener.java
@@ -1,9 +1,11 @@
package com.ld.igds.protocol.bhzn.grainv1.server;
+import com.ld.igds.common.CoreCommonService;
import com.ld.igds.common.CoreSerService;
import com.ld.igds.constant.Constant;
import com.ld.igds.models.DeviceSer;
import com.ld.igds.util.ContextUtil;
+import com.ld.igds.view.service.DeviceSerService;
import com.ld.io.api.IoSession;
import com.ld.io.api.IoSessionListener;
import lombok.extern.slf4j.Slf4j;
@@ -19,7 +21,6 @@
@Autowired
private CoreSerService coreSerService;
-
/**
* 璁惧鍒涘缓鍦ㄧ嚎锛岄渶瑕佹敞鎰忓綋鍓嶄娇鐢ㄤ富鏈烘ā寮忥紝涓绘満涓婄嚎榛樿鎵�鏈夌浉鍚孲N閰嶇疆鐨勫垎鏈哄叏閮ㄤ笂绾�
*
@@ -37,10 +38,8 @@
session.setBusinessKey(BhznGrainV1ServerUtils.getServerKey(session.getAddress(), session.getPort()));
//椤圭洰閲囩敤鏃犵嚎涓绘満妯″紡锛岀洿鎺ヨ幏鍙栭粯璁よ澶�
- DeviceSer deviceSer = coreSerService.getCacheSer(ContextUtil.getDefaultCompanyId(), BhznGrainV1ServerUtils.DEFAULT_MAC_ID);
-
+ DeviceSer deviceSer = coreSerService.getCacheSerBySn("5323", BhznGrainV1ServerUtils.DEFAULT_MAC_ID);
if (null == deviceSer) return;
-
coreSerService.onlineBySn(session.getAddress(), session.getPort(), deviceSer.getSn(), Constant.YN_Y);
//鏇存柊缂撳瓨
coreSerService.refreshCache(deviceSer.getCompanyId());
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/inout/BHZNWeightServiceImpl.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/inout/BHZNWeightServiceImpl.java
index a8d4b86..bc8108e 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/inout/BHZNWeightServiceImpl.java
+++ b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/inout/BHZNWeightServiceImpl.java
@@ -131,7 +131,7 @@
try{
log.info("BHZN鎺у埗LED寮�濮�");
BHZNClientEngine test = new BHZNClientEngine(
- "12.10.0.187", 58258);
+ "192.168.0.210", 58258);
test.start();
Thread.sleep(3000L);
diff --git a/igds-protocol-zldz/pom.xml b/igds-protocol-zldz/pom.xml
new file mode 100644
index 0000000..1087ef5
--- /dev/null
+++ b/igds-protocol-zldz/pom.xml
@@ -0,0 +1,49 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.ld.igds</groupId>
+ <artifactId>igds-protocol-zldz</artifactId>
+ <version>4.0.0-RELEASE</version>
+ <packaging>jar</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <java.version>1.8</java.version>
+ <igds.version>4.0.0-RELEASE</igds.version>
+ </properties>
+
+ <dependencies>
+
+ <!-- 寮曞叆涔夊姟鏍稿績鍖� -->
+ <dependency>
+ <groupId>com.ld.igds</groupId>
+ <artifactId>igds-core</artifactId>
+ <version>${igds.version}</version>
+ </dependency>
+
+ <!-- 寮曞叆IO鍖� -->
+ <dependency>
+ <groupId>com.ld.base.io</groupId>
+ <artifactId>base-io-netty</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ <compilerArguments>
+ <extdirs>src\main\webapp\WEB-INF\lib</extdirs>
+ </compilerArguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/ServerRunner.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/ServerRunner.java
new file mode 100644
index 0000000..5b1223b
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/ServerRunner.java
@@ -0,0 +1,53 @@
+package com.ld.igds.protocol.zldz;
+
+import com.ld.igds.data.ConfigData;
+import com.ld.igds.protocol.zldz.server.ZldzServerEngine;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+/**
+ * 鍙互鏍规嵁閰嶇疆鏂囦欢鐏垫椿璋冩暣
+ * 閰嶇疆闅忕郴缁熻嚜鍔ㄥ惎鍔ㄦ湇鍔� -- 鎵ц椤哄簭20-29
+ */
+@Component(ServerRunner.BEAN_ID)
+@Order(value = 22)
+public class ServerRunner implements CommandLineRunner {
+
+ public static final String BEAN_ID = "zldz.serverRunner";
+
+ @Autowired
+ private ConfigData configData;
+
+ @Override
+ public void run(String... strings) throws Exception {
+ //
+ if ("fzzy".equals(configData.getActive())) {
+ ZldzServerEngine.start(9201);
+ return;
+ }
+
+ //椋庢鑷磋繙榛樿閮ㄧ讲鏈嶅姟褰撳墠搴旂敤浣跨敤9000绔彛
+ if (configData.getActive().equals("dev")) {
+ ZldzServerEngine.start(9201);
+ return;
+ }
+
+ //椋庢鑷磋繙榛樿閮ㄧ讲鏈嶅姟褰撳墠搴旂敤浣跨敤9000绔彛
+ if (configData.getActive().indexOf("pro") >= 0) {
+ //FZZY骞冲彴
+ ZldzServerEngine.start(9201);
+ //鍏朵粬骞冲彴
+// ZldzServerEngine.start(ZldzServerEngine.PORT);
+ return;
+ }
+
+ //璇锋敞鎰忥紝姝ｆ潵鐢靛瓙鏈簨鏈嶅姟鍣ㄩ儴缃茬敤鐨勭鍙ｆ槸锛�8000
+ if (configData.getActive().equals("zldz")) {
+ ZldzServerEngine.start(ZldzServerEngine.PORT);
+ return;
+ }
+
+ }
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisConf.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisConf.java
new file mode 100644
index 0000000..53c153c
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisConf.java
@@ -0,0 +1,381 @@
+package com.ld.igds.protocol.zldz.analysis;
+
+import com.ld.igds.common.CoreSerService;
+import com.ld.igds.constant.BizType;
+import com.ld.igds.constant.Constant;
+import com.ld.igds.constant.RedisConst;
+import com.ld.igds.grain.dto.GrainSerCableData;
+import com.ld.igds.io.notify.NotifyWebInvoker;
+import com.ld.igds.io.constant.OrderRespEnum;
+import com.ld.igds.io.request.GrainSerConfRequest;
+import com.ld.igds.models.DeviceSer;
+import com.ld.igds.protocol.zldz.analysis.message.ReMessage;
+import com.ld.igds.protocol.zldz.command.BaseRemoteImpl;
+import com.ld.igds.protocol.zldz.command.builder.CommandBuilder8829;
+import com.ld.igds.protocol.zldz.command.message.Message;
+import com.ld.igds.protocol.zldz.task.CommandReSendService;
+import com.ld.igds.protocol.zldz.util.ServerUtils;
+import com.ld.igds.util.BytesUtil;
+import com.ld.igds.util.RedisUtil;
+import com.ld.igds.view.manager.TempManager;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author vince
+ */
+@Slf4j
+@Component(AnalysisConf.BEAN_ID)
+public class AnalysisConf extends BaseRemoteImpl {
+
+ public static final String BEAN_ID = "zldz.analysisConf";
+
+ @Autowired
+ private NotifyWebInvoker notifyWebInvoker;
+
+ @Autowired
+ private CoreSerService serService;
+
+ @Autowired
+ private RedisUtil redisUtil;
+ @Autowired
+ private TempManager thManager;
+
+ @Autowired
+ private CommandReSendService commandReSendService;
+
+ /**
+ * 瑙ｆ瀽鍒嗘満閰嶇疆淇℃伅
+ *
+ * @param message
+ * @param ser
+ */
+ public void analysis8816(ReMessage message, DeviceSer ser) {
+
+ log.debug("鍒嗘満---->>>骞冲彴锛氭秷鎭被鍨�=8816----{}-{}.{}", ser.getCompanyId(),
+ ser.getIp(), ser.getPort());
+
+ // 娓呴櫎缂撳瓨
+ commandReSendService.cleanKey(message.getCompanyId(), message.getIp(),
+ message.getPort(), ServerUtils.MSG_TYPE_8816);
+
+ // 娓呮鍒濆鍖栫櫥闄嗙殑瑙ｆ瀽
+ commandReSendService.cleanKey(ServerUtils.DEFAULT_COMPANY,
+ message.getIp(), message.getPort(), ServerUtils.MSG_TYPE_8816);
+
+ ser.setStatus(Constant.YN_Y);
+
+ String content = message.getBody().getContent();
+
+ // 璇诲啓鏍囧織
+ int start = 0, len = 1;
+ String temp = content.substring(start * 2, start * 2 + len * 2);
+ int readTag = BytesUtil.hexToInt(temp);
+
+ // 璁惧ID锛屽叏灞�鍞竴
+ start = 1;
+ len = 2;
+ temp = content.substring(start * 2, start * 2 + len * 2);
+
+ // 缃戠粶ID
+ start = 3;
+ len = 1;
+ temp = content.substring(start * 2, start * 2 + len * 2);
+
+ // 淇￠亾
+ start = 4;
+ len = 1;
+ temp = content.substring(start * 2, start * 2 + len * 2);
+
+ // 閫熺巼
+ start = 5;
+ len = 1;
+ temp = content.substring(start * 2, start * 2 + len * 2);
+
+ // 灞傛暟
+ start = 6;
+ len = 1;
+ temp = content.substring(start * 2, start * 2 + len * 2);
+ ser.setCableZ(BytesUtil.hexToInt(temp));
+
+ // 琛屾暟
+ start = 7;
+ len = 1;
+ temp = content.substring(start * 2, start * 2 + len * 2);
+ ser.setCableY(BytesUtil.hexToInt(temp));
+
+ // 鍒楁暟
+ start = 8;
+ len = 1;
+ temp = content.substring(start * 2, start * 2 + len * 2);
+ ser.setCableX(BytesUtil.hexToInt(temp));
+
+ // 鐢电紗鍒跺紡
+ start = 9;
+ len = 1;
+ temp = content.substring(start * 2, start * 2 + len * 2);
+ ser.setCableFormat("0" + BytesUtil.hexToInt(temp));
+
+ // 鐢电紗绫诲瀷
+ start = 10;
+ len = 1;
+ temp = content.substring(start * 2, start * 2 + len * 2);
+ ser.setCableType("0" + BytesUtil.hexToInt(temp));
+
+ // 渚涚數妯″紡
+ start = 11;
+ len = 1;
+ temp = content.substring(start * 2, start * 2 + len * 2);
+ ser.setPowerModel("0" + BytesUtil.hexToInt(temp));
+
+ String msg = ser.getName() + " 杩滅▼鑾峰彇閰嶇疆鎴愬姛锛岃鍒锋柊鏁版嵁鏌ョ湅锛�";
+
+ // 缁勭粐缂栫爜
+ start = 12;
+ temp = content.substring(start * 2);
+ if (readTag == 1) {// 琛ㄧず鍐欑殑鎴愬姛杩斿洖
+ ser.setOrgId(ser.getCompanyId());
+ msg = ser.getName() + " 杩滅▼鍐欏叆鎴愬姛锛岃鍒锋柊鏁版嵁鏌ョ湅锛�";
+ } else {
+ ser.setOrgId(BytesUtil.hexToInt(BytesUtil.tran_LH(temp)) + "");
+ }
+
+ if (null == ser.getSn()) {
+ ser.setSn(ser.getId());
+ }
+ ser.setIp(message.getIp());
+ ser.setPort(message.getPort());
+
+ // 寮�濮嬪垪榛樿=1
+ if (ser.getCableStart() == 0) {
+ ser.setCableStart(1);
+ }
+
+ log.info("鍒嗘満---->>>骞冲彴锛氬垎鏈洪厤缃В鏋愬畬鎴�----{}-{}-{}-{}锛屾洿鏂板埌鏈嶆湇鍔″櫒",
+ ser.getCompanyId(), ser.getIp(), ser.getPort(), ser.getName());
+ serService.updateSerById(ser);
+
+ // 鏇存柊浼氳瘽淇℃伅
+ super.updateSession(ser.getIp(), ser.getPort(), ser.getCompanyId());
+
+ notifyWebInvoker.notifyWeb(ser.getCompanyId(),
+ OrderRespEnum.MSG_SUCCESS, BizType.SYS, msg);
+
+ //鍒嗘満涓婄嚎杩涜涓�娆℃俯婀垮害閲囬泦
+ thManager.checkThBySer(ser.getCompanyId(), ser.getId());
+ }
+
+ /**
+ * 鐢电紗鍒濆鍖栨垚鍔�
+ *
+ * @param reMessage
+ * @param ser
+ */
+ public void analysis8822(ReMessage reMessage, DeviceSer ser) {
+ log.debug("-----------analysis8822------------{}-{}.{}",
+ ser.getCompanyId(), ser.getIp(), ser.getPort());
+
+ // 娓呴櫎缂撳瓨
+ commandReSendService.cleanKey(reMessage.getCompanyId(),
+ reMessage.getIp(), reMessage.getPort(),
+ ServerUtils.MSG_TYPE_8822);
+
+ String msg = ser.getName() + " 鍒濆鍖栫數缂嗗畬鎴愶紒锛�";
+ notifyWebInvoker.notifyWeb(ser.getCompanyId(),
+ OrderRespEnum.MSG_SUCCESS, BizType.SYS, msg);
+ }
+
+ /**
+ * 鐢电紗淇敼杩斿洖锛�
+ *
+ * @param reMessage
+ * @param ser
+ */
+ public void analysis8826(ReMessage reMessage, DeviceSer ser) {
+ log.debug("-----------analysis8826------------{}-{}.{}",
+ ser.getCompanyId(), ser.getIp(), ser.getPort());
+
+ // 娓呴櫎缂撳瓨
+ commandReSendService.cleanKey(reMessage.getCompanyId(),
+ reMessage.getIp(), reMessage.getPort(),
+ ServerUtils.MSG_TYPE_8826);
+
+ String msg = ser.getName() + " 鐢电紗淇敼鎿嶄綔瀹屾垚";
+
+ notifyWebInvoker.notifyWeb(ser.getCompanyId(),
+ OrderRespEnum.MSG_SUCCESS, BizType.SYS, msg);
+ }
+
+ /**
+ * 閫氶亾鐢电紗鑾峰彇杩斿洖锛屽垎鏈鸿繑鍥炴敹鍒板懡浠や俊鎭紝瀹為檯杩斿洖鍊煎湪8829涓鏄�
+ *
+ * @param reMessage
+ * @param ser
+ */
+ public void analysis8825(ReMessage reMessage, DeviceSer ser) {
+
+ log.debug("-----------analysis8825------------{}-{}.{}",
+ ser.getCompanyId(), ser.getIp(), ser.getPort());
+
+ // 娓呴櫎缂撳瓨
+ commandReSendService.cleanKey(reMessage.getCompanyId(),
+ reMessage.getIp(), reMessage.getPort(),
+ ServerUtils.MSG_TYPE_8825);
+
+ String msg = ser.getName() + " 璇诲彇閫氶亾鐢电紗寮�濮嬭繑鍥�";
+
+ notifyWebInvoker.notifyWeb(ser.getCompanyId(),
+ OrderRespEnum.MSG_SUCCESS, BizType.SYS, msg);
+
+ }
+
+ /**
+ * 缁堢鍙戦�侀�氶亾鐢电紗鏁版嵁缁欏悗鍙帮紝鍒嗘満涓诲姩鎺ㄩ��
+ *
+ * @param reMessage
+ * @param ser
+ */
+ @SuppressWarnings("unchecked")
+ public void analysis1129(ReMessage reMessage, DeviceSer ser) {
+
+ // 寮�濮嬭В鏋�
+ String content = reMessage.getBody().getContent();
+
+ // 閫氶亾鍙�
+ int start = 0, len = 1;
+ String temp = content.substring(start * 2, start * 2 + len * 2);
+ int passCode = BytesUtil.hexToInt(temp);
+
+ // 鐐瑰簭鍙凤紝鎸夌収杩斿洖椤哄簭濉啓浠�1寮�濮�
+ start = 1;
+ len = 1;
+ temp = content.substring(start * 2, start * 2 + len * 2);
+ int iotNum = BytesUtil.hexToInt(temp);
+
+ // 鎬诲寘鏁�
+ start = 2;
+ len = 1;
+ temp = content.substring(start * 2, start * 2 + len * 2);
+ int sumPacket = BytesUtil.hexToInt(temp);
+
+ // 褰撳墠鍖�
+ start = 3;
+ len = 1;
+ temp = content.substring(start * 2, start * 2 + len * 2);
+ int curPacket = BytesUtil.hexToInt(temp);
+
+ // -----------鍚庣閫氱煡缁堢鏀跺埌淇℃伅----------------------//
+ GrainSerConfRequest request = new GrainSerConfRequest();
+ request.setSerId(ser.getId());
+ request.setBizType(BizType.SYS.getCode());
+ request.setIp(ser.getIp());
+ request.setPort(ser.getPort());
+ request.setCompanyId(ser.getCompanyId());
+ request.setValue1(curPacket);
+
+ Message message = CommandBuilder8829.getInstance()
+ .buildMessage(request);
+ log.info("骞冲彴------>>>鍒嗘満锛�" + request.getSerName() + "鍚庡彴鏀跺埌鐢电紗鏁版嵁搴旂瓟="
+ + message.toString());
+ // 鍙戦�佸懡浠�
+ send(request.getIp(), request.getPort(), message.getByteMsg());
+
+ // -----------鍚庣閫氱煡缁堢鏀跺埌淇℃伅 EDN----------------------//
+
+ log.info("鍒嗘満------>>>骞冲彴锛氳繑鍥炵數缂嗕俊鎭紝鍒嗘満={}锛屽綋鍓嶅寘锛歿}锛屼俊鎭�={}", ser.getName(),
+ curPacket, content);
+
+ // 璇︾粏淇℃伅锛屾瘡闀垮害5涓轰竴缁勬暟鎹�
+ start = 4;
+ temp = content.substring(start * 2);
+
+ String redisKey = RedisConst.buildKey(ser.getCompanyId(),
+ RedisConst.KEY_TEMP_PREFIX, "CABLE_DATA_" + ser.getId() + "_"
+ + passCode);
+
+ List<GrainSerCableData> dataList = null;
+ if (curPacket != 1) {
+ dataList = (List<GrainSerCableData>) redisUtil.get(redisKey);
+ }
+ if (null == dataList)
+ dataList = new ArrayList<>();
+
+ GrainSerCableData data;
+
+ String str1 = temp.substring(0, 160);// 娓╁害鐐� 40涓�
+ String str2 = temp.substring(160, 400);// 1涓牴鍙凤紝1涓偣鍙凤紝1涓厤缃紝鍔熻兘40缁�
+ String temp1, temp2;
+ for (int i = 0; i < 40; i++) {
+ data = new GrainSerCableData();
+ data.setPassCode(passCode);
+ data.setIotNum(i + 1);
+ data.setReceiveDate(new Date());
+ //data.setPointIndex(dataList.size() + i + 1);
+
+ // 娓╁害
+ temp1 = str1.substring(i * 4, i * 4 + 4);
+ data.setTemp(BytesUtil.hexToInt(BytesUtil.tran_LH(temp1)) / 10.0);
+
+ //鏍瑰彿
+ temp2 = str2.substring(i * 6, i * 6 + 6);
+ data.setRootIndex(BytesUtil.hexToInt(temp2.substring(0, 2)));
+
+ //鐐瑰彿
+ data.setPointIndex(BytesUtil.hexToInt(temp2.substring(2, 4)));
+
+ //閰嶇疆
+ data.setConf(temp2.substring(4, 6));
+
+ dataList.add(data);
+ }
+
+ // 瀛樻斁绶╁瓨
+ redisUtil.set(redisKey, dataList, 5 * 60);
+
+ notifyWebInvoker.notifyWeb(ser.getCompanyId(),
+ OrderRespEnum.MSG_SUCCESS, BizType.SYS, "绯荤粺鏀跺埌鐢电紗閰嶇疆淇℃伅锛岃鎵嬪姩鍒锋柊锛屽垎鏈�="
+ + ser.getName() + ",閫氶亾=" + passCode + ",鎬诲寘="
+ + sumPacket + ",褰撳墠鍖�=" + curPacket);
+ }
+
+ /**
+ * 鐢电紗姹囨�诲簲绛�
+ *
+ * @param reMessage
+ * @param ser
+ */
+ public void analysis8823(ReMessage reMessage, DeviceSer ser) {
+ // 寮�濮嬭В鏋�
+ String content = reMessage.getBody().getContent();
+
+ // 鍔ㄦ�佹嫾鎺ュ璞�
+ List<GrainSerCableData> dataList = new ArrayList<GrainSerCableData>();
+ String tempStr;
+ GrainSerCableData cableData;
+ for (int i = 0; i < content.length() / 4; i++) {
+ tempStr = content.substring(i * 4, i * 4 + 4);
+ cableData = new GrainSerCableData();
+ cableData.setPassCode(i + 1);
+ cableData.setReceiveDate(new Date());
+ cableData.setIotNum(BytesUtil.hexToInt(tempStr.substring(0, 2)));
+ cableData.setIotErrNum(BytesUtil.hexToInt(tempStr.substring(2, 4)));
+
+ dataList.add(cableData);
+ }
+
+ String redisKey = RedisConst.buildKey(ser.getCompanyId(),
+ RedisConst.KEY_TEMP_PREFIX, "CABLE_DATA_" + ser.getId());
+
+ // 瀛樻斁绶╁瓨
+ redisUtil.set(redisKey, dataList, 5 * 60);
+
+ notifyWebInvoker.notifyWeb(ser.getCompanyId(),
+ OrderRespEnum.MSG_SUCCESS, BizType.SYS,
+ "绯荤粺鏀跺埌鐢电紗姹囨�讳俊鎭紝璇锋墜鍔ㄦ洿鏂版煡鐪嬶紝杩斿洖淇℃伅锛氬垎鏈�=" + ser.getName());
+ }
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisGrain.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisGrain.java
new file mode 100644
index 0000000..5d1339d
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisGrain.java
@@ -0,0 +1,819 @@
+package com.ld.igds.protocol.zldz.analysis;
+
+import com.ld.igds.common.CoreCommonService;
+import com.ld.igds.common.dto.THDto;
+import com.ld.igds.constant.BizType;
+import com.ld.igds.constant.Constant;
+import com.ld.igds.constant.DepotType;
+import com.ld.igds.grain.GrainUtil;
+import com.ld.igds.grain.dto.GrainItemInfo;
+import com.ld.igds.io.notify.NotifyGrainInvoker;
+import com.ld.igds.io.constant.OrderRespEnum;
+import com.ld.igds.io.request.BaseRequest;
+import com.ld.igds.models.DepotConf;
+import com.ld.igds.models.DeviceSer;
+import com.ld.igds.models.DicSysConf;
+import com.ld.igds.models.Grain;
+import com.ld.igds.order.ExeOrderService;
+import com.ld.igds.order.data.ExeRequest;
+import com.ld.igds.protocol.zldz.analysis.message.ReMessage;
+import com.ld.igds.protocol.zldz.command.RemoteGrainServiceImpl;
+import com.ld.igds.protocol.zldz.task.CommandReSendService;
+import com.ld.igds.protocol.zldz.util.ServerUtils;
+import com.ld.igds.th.CoreThService;
+import com.ld.igds.util.BytesUtil;
+import com.ld.igds.util.ContextUtil;
+import com.ld.igds.warn.WarnUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 绮儏瑙ｆ瀽
+ *
+ * @author Andy
+ */
+@Slf4j
+@Component(AnalysisGrain.BEAN_ID)
+public class AnalysisGrain {
+
+ public static final String BEAN_ID = "zldz.analysisGrain";
+
+ @Autowired
+ private CoreCommonService commonService;
+ @Autowired
+ private CoreThService thService;
+ @Autowired
+ private ExeOrderService exeOrderService;
+ @Autowired
+ private GrainUtil grainUtil;
+ @Autowired
+ private NotifyGrainInvoker notifyGrainInvoker;
+ @Autowired
+ private RemoteGrainServiceImpl remoteGrainService;
+ @Autowired
+ private CommandReSendService commandReSendService;
+ @Autowired
+ private WarnUtils warnUtils;
+
+ public static Map<String, Map<String, String>> contextMap = new HashMap<>();
+
+ public static double ERROR_CHECK_TAG = -100.0;
+
+ public static double FAULT_CHECK_TAG = 85.0;
+
+ public static double ERROR_CHECK_TAG2 = 50;
+
+ public static double MAX_TEMP = -50.0;
+ public static double MIN_TEMP = 50.0;
+
+ /**
+ * 鍚庡彴鍙戦�佽姹傚悗锛岀粓绔殑鍝嶅簲
+ *
+ * @param reMessage
+ * @param ser
+ */
+ public void analysis8815(ReMessage reMessage, DeviceSer ser) {
+ BaseRequest request = new BaseRequest();
+ request.setSerId(ser.getId());
+ request.setCompanyId(ser.getCompanyId());
+ request.setIp(reMessage.getIp());
+ request.setPort(reMessage.getPort());
+ request.setSerName(ser.getName());
+
+ remoteGrainService.reply8815(request);
+ }
+
+ /**
+ * 鎺ユ敹鍒扮伯鎯呯殑鍥炲
+ *
+ * @param reMessage
+ * @param ser
+ */
+ public void reply8817(ReMessage reMessage, DeviceSer ser) {
+ String bodyMsg = reMessage.getBody().getContent();
+
+ log.info("鍒嗘満------>>>骞冲彴锛氭敹鍒扮殑绮儏淇℃伅-{}-{}-{}", ser.getCompanyId(),
+ ser.getName(), reMessage.getStrMsg());
+ // Step1鏍规嵁闇�瑕佺畝鍖栭渶瑕佺殑淇℃伅
+ String ua = bodyMsg.substring(0 * 2, 1 * 2);
+ log.debug("鑾峰彇鍒扮殑鐢靛帇淇℃伅锛岀郴缁熶笉淇濈暀={}", ua);
+
+ // 鎬诲寘鏁�
+ // int sumPacket = BytesUtil.hexToInt(bodyMsg.substring(1 * 2, 1 * 2 + 1
+ // * 2));
+ // 褰撳墠鍖�
+ String hexCurPacket = bodyMsg.substring(2 * 2, 2 * 2 + 1 * 2);
+ // int curPacket = BytesUtil.hexToInt(hexCurPacket);
+
+ BaseRequest request = new BaseRequest();
+ request.setSerId(ser.getId());
+ request.setCompanyId(ser.getCompanyId());
+ request.setIp(reMessage.getIp());
+ request.setPort(reMessage.getPort());
+ request.setSerName(ser.getName());
+
+ remoteGrainService.reply8817(request, hexCurPacket);
+ }
+
+ @Transactional
+ public void analysis8817(ReMessage msg, DeviceSer ser) {
+ // 鎺ュ埌淇℃伅鍥炲--涓绘満
+ reply8817(msg, ser);
+
+ // 棣栧厛鑾峰彇鍒扮郴缁熷弬鏁帮紝鍒ゆ柇鏄惁闇�瑕佹壒娆¤嚜鍔ㄤ紭鍖�
+ DicSysConf sysConf = commonService.getCacheSysConf(ser.getCompanyId());
+
+ List<ExeRequest> list = exeOrderService.getInProgressOrderBySerId(BizType.GRAIN.getCode(), ser.getId());
+
+ if (null == list || list.isEmpty()) {
+ String info = "绮儏瑙ｆ瀽澶辫触:鍒嗘満=" + ser.getName() + "娌℃湁鑾峰彇鍒版墍灞炰粨搴撲俊鎭��";
+ log.error("鍒嗘満------>>>骞冲彴锛�" + info);
+ notifyGrainInvoker.notifyWeb(ser.getCompanyId(),
+ OrderRespEnum.MSG_ERROR, BizType.GRAIN, info);
+ return;
+ }
+ ExeRequest exeRequest = list.get(0);
+ log.info("鑾峰彇绮儏鍛戒护淇℃伅={}", exeRequest);
+ DepotConf depotConf = commonService.getCacheDepotConf(
+ exeRequest.getCompanyId(), exeRequest.getDepotId());
+ if (null == depotConf) {
+ String info = "绮儏瑙ｆ瀽澶辫触:鍒嗘満=" + ser.getName() + "娌℃湁鑾峰彇鍒扮伯鎯呭弬鏁伴厤缃俊鎭��";
+ log.error("鍒嗘満------>>>骞冲彴锛�" + info);
+ notifyGrainInvoker.notifyWeb(ser.getCompanyId(),
+ OrderRespEnum.MSG_ERROR, BizType.GRAIN, info);
+ return;
+ }
+
+ analysisStep(depotConf, msg, ser, exeRequest, sysConf);
+ }
+
+
+ /**
+ * 寮�濮嬭В鏋�
+ *
+ * @param ser
+ * @param msg
+ * @throws Exception
+ */
+ private void analysisStep(DepotConf depotConf, ReMessage msg,
+ DeviceSer ser, ExeRequest exeRequest, DicSysConf sysConf) {
+ // 绮儏鐨勬壒娆″彿閲嶆柊鏍规嵁棰戠巼璋冩暣
+ msg.setBatchId(ContextUtil.getBatchIdByFireq(depotConf.getGrainFreq()));
+
+ String bodyMsg = msg.getBody().getContent();
+
+ log.debug("{}-{}=鏀跺埌鐨勭伯鎯呬俊鎭�={}", ser.getCompanyId(), ser.getName(),
+ msg.getStrMsg());
+
+ // Step1鏍规嵁闇�瑕佺畝鍖栭渶瑕佺殑淇℃伅
+ String ua = bodyMsg.substring(0 * 2, 1 * 2);
+ log.debug("鑾峰彇鍒扮殑鐢靛帇淇℃伅锛岀郴缁熶笉淇濈暀={}", ua);
+
+ // 鎬诲寘鏁�
+ int sumPacket = BytesUtil.hexToInt(bodyMsg.substring(1 * 2,
+ 1 * 2 + 1 * 2));
+ // 褰撳墠鍖�
+ String hexCurPacket = bodyMsg.substring(2 * 2, 2 * 2 + 1 * 2);
+ int curPacket = BytesUtil.hexToInt(hexCurPacket);
+
+ log.debug("鍒嗘満={},鍖呮�绘暟={},褰撳墠鍖�={}", ser.getName(), sumPacket, curPacket);
+
+ // 绮娓╁害淇℃伅
+ String grainStr = bodyMsg.substring(3 * 2);
+
+ String contextKey = this.buildContextKey(msg, depotConf.getDepotId());
+ String curKey = this.buildCurKey(msg, curPacket);
+
+ Map<String, String> curMap = contextMap.get(contextKey);
+ if (null == curMap) {
+ curMap = new HashMap<>();
+ contextMap.put(contextKey, curMap);
+ }
+ contextMap.get(contextKey).put(curKey, grainStr);
+
+ // 鏁版嵁鍑嗗濂斤紝寮�濮嬫墽琛岃В鏋�
+ if (curPacket == sumPacket) {
+ analysisStep0(depotConf, msg, ser, exeRequest, contextKey,
+ sumPacket, sysConf);
+
+ log.info("鍒嗘満------>>>骞冲彴锛氬懡浠ょ被鍨�=8817--绮儏鍏ㄩ儴鏀跺埌锛屽紑濮嬭В鏋�-{}-{}",
+ ser.getCompanyId(), ser.getName());
+ // 娓呴櫎鍛戒护
+ commandReSendService.cleanKey(msg.getCompanyId(), msg.getIp(),
+ msg.getPort(), ServerUtils.MSG_TYPE_8817);
+ }
+ }
+
+ private void analysisStep0(DepotConf depotConf, ReMessage msg,
+ DeviceSer ser, ExeRequest exeRequest, String contextKey,
+ int sumPacket, DicSysConf sysConf) {
+
+ Map<String, String> curMap = contextMap.get(contextKey);
+
+ List<DepotConf> depotConfs = null;
+
+ // 涓�鍒嗘満澶氫粨锛屾妸璧峰鍒楁斁鍒版渶澶ц繘琛岄噰闆�
+ if (Constant.YN_Y.equals(sysConf.getGrainMoreTag())) {
+ depotConfs = commonService.getCacheDepotConfBySerId2(
+ depotConf.getCompanyId(), ser.getId());
+ }
+
+ if (null == depotConfs) {// 涓�涓垎鏈�1涓粨
+ if (DepotType.TYPE_02.getCode().equals(depotConf.getDepotType())) {
+ analysisStep2(depotConf, msg, ser, exeRequest, curMap, sumPacket, sysConf);
+ } else if (DepotType.TYPE_04.getCode().equals(depotConf.getDepotType())) {
+ analysisStep2(depotConf, msg, ser, exeRequest, curMap, sumPacket, sysConf);
+ } else {
+ analysisStep1(depotConf, msg, ser, exeRequest, curMap, sumPacket, sysConf);
+ }
+
+ return;
+ }
+
+ // 涓�鍒嗗嚑澶氫粨鎯呭喌锛岃�冭檻鍗曚粨閲囬泦鍜屽浠撻噰闆�
+ // 鍗曚粨閲囬泦鏃跺�欐暟鎹粠0杩斿洖
+ if (StringUtils.isEmpty(exeRequest.getDepotIds())) {
+
+ depotConf.setCableEnd(depotConf.getCableEnd() - depotConf.getCableStart() + 1);
+ depotConf.setCableStart(ser.getCableStart());
+
+ if (DepotType.TYPE_02.getCode().equals(depotConf.getDepotType())) {
+ analysisStep2(depotConf, msg, ser, exeRequest, curMap, sumPacket, sysConf);
+ } else if (DepotType.TYPE_04.getCode().equals(depotConf.getDepotType())) {
+ analysisStep2(depotConf, msg, ser, exeRequest, curMap, sumPacket, sysConf);
+ } else {
+ analysisStep1(depotConf, msg, ser, exeRequest, curMap, sumPacket, sysConf);
+ }
+
+ return;
+
+ }
+
+ // 鎵归噺閲囬泦鎵�鏈夊叧鑱斾竴璧烽噰闆嗭紝閬嶅巻鎵ц
+ for (DepotConf depotConfTemp : depotConfs) {
+ if (DepotType.TYPE_02.getCode().equals(depotConfTemp.getDepotType())) {
+ analysisStep2(depotConfTemp, msg, ser, exeRequest, curMap, sumPacket, sysConf);
+ } else if (DepotType.TYPE_04.getCode().equals(depotConfTemp.getDepotType())) {
+ analysisStep2(depotConfTemp, msg, ser, exeRequest, curMap, sumPacket, sysConf);
+ } else {
+ analysisStep1(depotConfTemp, msg, ser, exeRequest, curMap, sumPacket, sysConf);
+ }
+ }
+ }
+
+ /**
+ * 鍦嗙瓛浠撶殑绮儏瑙ｆ瀽
+ *
+ * @param depotConf
+ * @param msg
+ * @param ser
+ * @param exeRequest
+ * @param packetMap
+ * @param sumPackets
+ */
+ private void analysisStep2(DepotConf depotConf, ReMessage msg,
+ DeviceSer ser, ExeRequest exeRequest,
+ Map<String, String> packetMap, int sumPackets, DicSysConf sysConf) {
+ if (StringUtils.isEmpty(depotConf.getCableRule())
+ || StringUtils.isEmpty(depotConf.getCableCir())) {
+ log.error("鍒嗘満------>>>骞冲彴锛氬綋鍓嶄粨搴擄細{}-{}锛屾病鏈夋病鏈夐厤缃竷绾胯鍒欙紝鏃犳硶瑙ｆ瀽绮儏淇℃伅鈥︹��",
+ ser.getCompanyId(), depotConf.getDepotName());
+ return;
+ }
+
+ String[] cableRuleAtt = depotConf.getCableRule().split("-");
+ String[] cableCirAtt = depotConf.getCableCir().split("-");
+
+ if (cableRuleAtt.length != cableCirAtt.length) {
+ log.error("鍒嗘満------>>>骞冲彴锛氬綋鍓嶄粨搴擄細{}-{}锛屽竷绾胯鍒欎笉姝ｇ‘锛屾棤娉曡В鏋愮伯鎯呬俊鎭�︹��", ser.getCompanyId(), depotConf.getDepotName());
+ return;
+ }
+
+
+ //閬垮厤绌烘寚閽�
+ if (null == depotConf.getCableCone()) depotConf.setCableCone(Constant.CABLE_CONE_0);
+
+ // 鑾峰彇鏈�澶х殑灞傞厤缃�--榛樿姣忎竴鍦堥兘涓�鏍�
+ int layMax = Integer.valueOf(cableCirAtt[0]);
+ for (int i = 0; i < cableCirAtt.length; i++) {
+ if (Integer.valueOf(cableCirAtt[i]) >= layMax) layMax = Integer.valueOf(cableCirAtt[i]);
+ }
+
+ // 鑾峰彇瀹屾暣鐨勭伯鎯呭寘淇℃伅
+ String strPoints = "";
+ for (int i = 1; i <= sumPackets; i++) {
+ strPoints += packetMap.get(buildCurKey(msg, i));
+ }
+
+ log.info("------绛掍粨瀹屾暣鐨勭伯鎯呮姤鏂�={}------", strPoints);
+
+ int sumNum = 0, cableZ = 1;// sumNum 鍏卞灏戞牴鐢电紗锛沜ableZ 灞傜殑鏈�澶у�硷紝閿ュ舰浠撹ˉ榻愭渶澶у眰
+ for (int i = 0; i < cableCirAtt.length; i++) {
+ if (Integer.valueOf(cableCirAtt[i]) > cableZ) {
+ cableZ = Integer.valueOf(cableCirAtt[i]);
+ }
+ sumNum += Integer.valueOf(cableRuleAtt[i]);
+ }
+
+ // 鏍规嵁灞傝鍒楄幏鍙栨寚瀹氶暱搴�
+ int start = 4 * (depotConf.getCableStart() - ser.getCableStart()) * cableZ;
+ int len = 4 * cableZ * sumNum;
+
+ strPoints = strPoints.substring(start, start + len);
+ log.info("鍒嗘満------>>>骞冲彴锛氳繑鍥炵伯鎯呭畬鏁翠俊鎭紝鎵�灞炵粍缁�={}锛屽垎鏈�={}", ser.getCompanyId(), ser.getName());
+
+ // 灏嗙伯鎯呰В鏋愭垚鏁扮粍
+ List<Double> temps = new ArrayList<>();
+ double tempValue;
+ String temp;
+ int curLay = 1;//鎵�鍦ㄥ眰浠�1寮�濮�
+ int curRoot = 1;//鎵�鍦ㄦ牴
+ int curCir = 1;//鎵�鍦ㄥ湀
+ int cirLay = 1;//褰撳墠鍦堢殑灞�
+ for (int i = 0; i < strPoints.length() / 4; i++) {
+ temp = strPoints.substring(i * 4, i * 4 + 4);
+ if (temp == null) {
+ temp = "0000";
+ }
+ tempValue = BytesUtil.hexToInt(BytesUtil.tran_LH(temp)) / 10.0;
+
+ //闈炴甯稿��
+ if (tempValue > ERROR_CHECK_TAG2) {
+ tempValue = Constant.ERROR_TEMP;
+ }
+
+ // 鏁呴殰鍊煎鐞�
+ if (tempValue >= FAULT_CHECK_TAG) {
+ tempValue = Constant.FAULT_TEMP;
+ }
+
+ // 澶囩敤鍊�
+ if (tempValue == ERROR_CHECK_TAG) {
+ tempValue = Constant.ERROR_TEMP;
+
+
+ //楠岃瘉鏄笉鏄敟褰粨琛ュ伩鍊�
+ curLay = (i % layMax) + 1;
+ curRoot = (i / layMax) + 1;
+ curCir = getCurCir(curRoot, cableRuleAtt);
+
+ cirLay = Integer.valueOf(cableCirAtt[curCir - 1]);
+
+ //姣斿閰嶇疆浜�5灞備絾鏄綋鍓嶆槸6灞傦紝璇存槑褰撳墠鐐逛负琛ュ伩鐐�
+ if (curLay > cirLay) {
+ tempValue = Constant.ADD_TEMP;
+
+ //鍒ゆ柇鏄笉鏄笂閿ュ舰锛屽皢琛ョ偣杞Щ鍒颁笂鏂�
+ if (Constant.CABLE_CONE_1.equals(depotConf.getCableCone())) {
+ int index = i - curLay - 1;
+ temps.add(index, tempValue);
+ }else {
+ temps.add(tempValue);
+ }
+
+ } else {
+ temps.add(tempValue);
+ }
+
+ } else {
+ temps.add(tempValue);
+ }
+ }
+
+ log.debug("-------CheckGrainRequest--={}", exeRequest.toString());
+ THDto thDto = thService.getCacheTH(exeRequest.getCompanyId(), exeRequest.getTempSerId(), exeRequest.getThConf());
+ if (null != thDto) {
+ log.debug("-------THDto--={}", thDto.toString());
+ }
+
+ // 灏嗛泦鍚堣В鏋愭垚鍧愭爣鏁版嵁
+ addPoint2(temps, msg, depotConf, exeRequest, thDto, sysConf);
+ }
+
+ /**
+ * 鑾峰彇褰撳墠璺熸墍鍦ㄥ湀
+ *
+ * @param curRoot
+ * @param cableRuleAtt
+ * @return
+ */
+ private int getCurCir(int curRoot, String[] cableRuleAtt) {
+
+ int sum = 0;
+ for (int i = 0; i < cableRuleAtt.length; i++) {
+ sum += Integer.valueOf(cableRuleAtt[i]);
+ if (curRoot <= sum) return i + 1;
+ }
+
+ return 1;
+ }
+
+ /**
+ * 骞虫柟浠撶殑瑙ｆ瀽锛岃В鏋愰渶瑕佽�冭檻褰撳墠鏄惁鍚敤鐨勪竴鍒嗘満澶氫粨
+ *
+ * @param depotConf
+ * @param msg
+ * @param ser
+ * @param exeRequest
+ * @param packetMap
+ * @param sumPackets
+ */
+ private void analysisStep1(DepotConf depotConf, ReMessage msg,
+ DeviceSer ser, ExeRequest exeRequest,
+ Map<String, String> packetMap, int sumPackets, DicSysConf sysConf) {
+ // 鑾峰彇瀹屾暣鐨勭伯鎯呭寘淇℃伅
+ String strPoints = "";
+ for (int i = 1; i <= sumPackets; i++) {
+ strPoints += packetMap.get(buildCurKey(msg, i));
+ }
+ String[] attCable = depotConf.getCableRule().split("-");
+ int cableZ = Integer.valueOf(attCable[0]);
+ int cableY = Integer.valueOf(attCable[1]);
+ int cableX = Integer.valueOf(attCable[2]);
+
+ // 鏍规嵁灞傝鍒楄幏鍙栨寚瀹氶暱搴�
+ int start = 4 * (depotConf.getCableStart() - ser.getCableStart())
+ * cableZ * cableY;
+ int len = 4 * cableZ * cableY * cableX;
+
+ log.info("鍒嗘満------>>>骞冲彴锛氳繑鍥炵伯鎯呭畬鏁翠俊鎭紝鎵�灞炵粍缁�={}锛屽垎鏈�={}", ser.getCompanyId(), ser.getName());
+
+ strPoints = strPoints.substring(start, start + len);
+
+ // 灏嗙伯鎯呰В鏋愭垚鏁扮粍
+ List<Double> temps = new ArrayList<>();
+ double tempValue;
+ String temp;
+ for (int i = 0; i < strPoints.length() / 4; i++) {
+ temp = strPoints.substring(i * 4, i * 4 + 4);
+ if (temp == null) {
+ temp = "0000";
+ }
+ tempValue = BytesUtil.hexToInt(BytesUtil.tran_LH(temp)) / 10.0;
+ // 璇存槑瑙ｆ瀽鐨勬暟鎹湁闂
+ if (tempValue == ERROR_CHECK_TAG || tempValue == ERROR_CHECK_TAG2) {
+ tempValue = Constant.ERROR_TEMP;
+ }
+ // 鏁呴殰鍊煎鐞�
+ if (tempValue >= FAULT_CHECK_TAG) {
+ tempValue = Constant.FAULT_TEMP;
+ }
+ temps.add(tempValue);
+ }
+
+ log.debug("-------CheckGrainRequest--={}", exeRequest.toString());
+ THDto thDto = thService.getCacheTH(exeRequest.getCompanyId(),
+ exeRequest.getTempSerId(), exeRequest.getThConf());
+ if (null != thDto) {
+ log.debug("-------THDto--={}", thDto.toString());
+ }
+ // 灏嗛泦鍚堣В鏋愭垚鍧愭爣鏁版嵁
+ addPoint1(temps, msg, depotConf, ser, exeRequest, thDto, sysConf);
+ }
+
+ private String buildCurKey(ReMessage msg, int curPacket) {
+ return msg.getSourceId() + "_" + curPacket;
+ }
+
+ private String buildContextKey(ReMessage msg, String depotId) {
+ return msg.getCompanyId() + "_" + msg.getSourceId() + "_" + depotId;
+ }
+
+ /**
+ * 骞虫埧浠擄紝瑙ｆ瀽绗簩姝ワ紝瑙ｆ瀽鍒板潗鏍囨暟鎹�
+ *
+ * @param temps
+ * @throws Exception
+ */
+ private void addPoint1(List<Double> temps, ReMessage msg,
+ DepotConf depotConf, DeviceSer ser, ExeRequest exeRequest,
+ THDto thDto, DicSysConf sysConf) {
+
+ //鏍规嵁鐢电紗璧峰鏂逛綅鍜屽竷绾挎柟鍚戯紝瀵圭伯鎯呮暟鎹繘琛岃皟鏁�
+ if (null != depotConf.getStartOrientation()) {
+ temps = reversalGrainPoint(temps, depotConf);
+ }
+
+ //鑻ヨ捣鐐圭偣浣嶄负搴曢儴锛屽垯灏嗙伯鎯呮暟鎹繘琛岀炕杞�
+ if (null != depotConf.getStartPoint()
+ && Constant.GRAIN_START_POINT_BELOW.equals(depotConf.getStartPoint())) {
+ temps = grainUtil.reversalUpAndDown(temps, depotConf.getCableRule());
+ }
+
+ String[] attCable = depotConf.getCableRule().split("-");
+ int cableZ = Integer.valueOf(attCable[0]);
+ int cableY = Integer.valueOf(attCable[1]);
+ int cableX = Integer.valueOf(attCable[2]);
+
+ Grain grain = new Grain();
+ grain.setDepotId(depotConf.getDepotId());
+ grain.setCompanyId(depotConf.getCompanyId());
+ grain.setCable(depotConf.getCableRule());
+ grain.setBatchId(msg.getBatchId());
+ grain.setTempIn(Constant.ERROR_TEMP);
+ grain.setHumidityIn(Constant.ERROR_TEMP);
+
+ if (null != thDto) {
+ log.debug("绮儏瑙ｆ瀽涓幏鍙栧埌鐨勬俯婀垮害淇℃伅={}", thDto.toString());
+ grain.setHumidityIn(thDto.getHumidityIn());
+ grain.setTempIn(thDto.getTempIn());
+ }
+ grain.setReceiveDate(msg.getReceiveDate());
+ grain.setRemark("绮俯姝ｅ父");
+
+ // 鑾峰彇缂撳瓨涓殑鍛戒护淇℃伅
+ grain.setCheckUser(exeRequest.getExeUser());
+
+ double max = MAX_TEMP, min = MIN_TEMP, sumT = 0.0, sumNum = cableX
+ * cableY * cableZ;
+
+ // 鏍￠獙鍜屽疄鐜扮粺璁★紝鐢熸垚閲囬泦鐐逛俊鎭�
+ List<GrainItemInfo> listGrainItems = new ArrayList<>();
+ int i = 1;
+ for (Double temp : temps) {
+ if (temp == Constant.ERROR_TEMP || temp == Constant.FAULT_TEMP || temp == Constant.ADD_TEMP) {
+ sumNum--;
+ } else {
+ sumT += temp;
+ if (temp > max) {
+ max = temp;
+ }
+ if (temp < min) {
+ min = temp;
+ }
+ }
+ listGrainItems.add(new GrainItemInfo(i, temp));
+ i++;
+ }
+
+ if (sumNum == 0) {
+ sumNum = 1;
+ grain.setRemark("褰撳墠绮儏閲囬泦寮傚父");
+ }
+ //杩囨护姣旇緝鐢ㄧ殑鏈�澶ф渶灏忓��
+ if(max == MAX_TEMP){
+ max = 0.0;
+ }
+ if(min == MIN_TEMP){
+ min = 0.0;
+ }
+ if (null != depotConf.getTempMax() && max > depotConf.getTempMax()) {
+ grain.setRemark("浠撳簱閰嶇疆楂樻俯璀﹀憡鍊硷細" + depotConf.getTempMax() + "锛屽綋鍓嶆娴嬮珮娓╁�硷細"
+ + max);
+ warnUtils.addGrainWarn(depotConf, grain);
+ }
+
+ grain.setTempAve(sumT / sumNum);
+ grain.setTempMax(max);
+ grain.setTempMin(min);
+ grain.setPoints(StringUtils.join(temps, ","));
+
+ String depotIds = exeRequest.getDepotIds();
+
+ boolean notifyWeb = true;
+ if (null != depotIds && depotIds.indexOf(depotConf.getDepotId()) == -1) {
+ notifyWeb = false;
+ }
+ // 鐢ㄦ埛灏佽濂芥暟鎹嵆鍙�
+ notifyGrainInvoker.analysisSuccess(grain, listGrainItems, depotConf,
+ sysConf, notifyWeb, exeRequest);
+ }
+
+ /**
+ * 鍦嗙瓛浠撹В鏋愭楠�
+ *
+ * @param temps
+ * @param msg
+ * @param depotConf
+ * @param exeRequest
+ * @param thDto
+ */
+ private void addPoint2(List<Double> temps, ReMessage msg,
+ DepotConf depotConf, ExeRequest exeRequest, THDto thDto,
+ DicSysConf sysConf) {
+
+ Grain grain = new Grain();
+ grain.setDepotId(depotConf.getDepotId());
+ grain.setCompanyId(depotConf.getCompanyId());
+ grain.setCable(depotConf.getCableRule());
+ grain.setCableCir(depotConf.getCableCir());
+ grain.setBatchId(msg.getBatchId());
+ grain.setTempIn(Constant.ERROR_TEMP);
+ grain.setHumidityIn(Constant.ERROR_TEMP);
+ if (null != thDto) {
+ log.debug("绮儏瑙ｆ瀽涓幏鍙栧埌鐨勬俯婀垮害淇℃伅={}", thDto.toString());
+ grain.setHumidityIn(thDto.getHumidityIn());
+ grain.setTempIn(thDto.getTempIn());
+ }
+ grain.setReceiveDate(msg.getReceiveDate());
+ grain.setRemark("绮俯姝ｅ父");
+ grain.setCheckUser(exeRequest.getExeUser());
+
+ double max = MAX_TEMP, min = MIN_TEMP, sumT = 0.0;
+
+ int sumNum = temps.size();
+ List<GrainItemInfo> listGrainItems = new ArrayList<>();
+ int i = 1;
+ for (Double temp : temps) {
+ if (temp == Constant.ERROR_TEMP || temp == Constant.FAULT_TEMP || temp == Constant.ADD_TEMP) {
+ sumNum--;
+ } else {
+ sumT += temp;
+ if (temp > max) {
+ max = temp;
+ }
+ if (temp < min) {
+ min = temp;
+ }
+ }
+ listGrainItems.add(new GrainItemInfo(i, temp));
+ i++;
+ }
+
+ if (sumNum == 0) {
+ sumNum = 1;
+ grain.setRemark("褰撳墠绮儏閲囬泦寮傚父");
+ }
+ //杩囨护姣旇緝鐢ㄧ殑鏈�澶ф渶灏忓��
+ if(max == MAX_TEMP){
+ max = 0.0;
+ }
+ if(min == MIN_TEMP){
+ min = 0.0;
+ }
+ if (null != depotConf.getTempMax() && max > depotConf.getTempMax()) {
+ grain.setRemark("浠撳簱閰嶇疆楂樻俯璀﹀憡鍊硷細" + depotConf.getTempMax() + "锛屽綋鍓嶆娴嬮珮娓╁�硷細"
+ + max);
+ warnUtils.addGrainWarn(depotConf, grain);
+ }
+
+ grain.setTempAve(sumT / sumNum);
+ grain.setTempMax(max);
+ grain.setTempMin(min);
+ grain.setPoints(StringUtils.join(temps, ","));
+
+ String depotIds = exeRequest.getDepotIds();
+ boolean notifyWeb = true;
+ if (null != depotIds && depotIds.indexOf(depotConf.getDepotId()) == -1) {
+ notifyWeb = false;
+ }
+
+ // 鐢ㄦ埛灏佽濂芥暟鎹嵆鍙�
+ notifyGrainInvoker.analysisSuccess(grain, listGrainItems, depotConf,
+ sysConf, notifyWeb, exeRequest);
+ }
+
+ private List<Double> reversalGrainPoint(List<Double> temps, DepotConf conf) {
+ if (StringUtils.isEmpty(conf.getStartOrientation())) {
+ //鑻ヨ捣濮嬫柟浣嶄负绌猴紝鍒欓粯璁よ捣濮嬫柟浣嶅拰鏂瑰悜锛岀洿鎺ヨ繑鍥�
+ return temps;
+ }
+ //璧峰鏂逛綅涓哄彸杈规椂
+ if (Constant.GRAIN_START_ORIENTATION_RIGHT.equals(conf.getStartOrientation())) {
+ if (StringUtils.isEmpty(conf.getStartDirection())) {
+ //鍙宠竟璧峰锛岄粯璁ょ旱鍚戝竷绾匡紝鐩存帴杩斿洖
+ return temps;
+ }
+ if (Constant.GRAIN_START_DIRECTION_TRANSVERSE.equals(conf.getStartDirection())) {
+ //鍙宠竟璧峰锛屾í鍚戝竷绾�
+ return grainUtil.reversalRight1(temps, conf.getCableRule());
+ }
+ //鍙宠竟璧峰锛岄粯璁ょ旱鍚戝竷绾匡紝鐩存帴杩斿洖
+ return temps;
+ }
+ //璧峰鏂逛綅涓哄彸涓婃椂
+ if (Constant.GRAIN_START_ORIENTATION_RIGHT_UP.equals(conf.getStartOrientation())) {
+ if (StringUtils.isEmpty(conf.getStartDirection())) {
+ //鍙充笂璧峰锛岄粯璁ょ旱鍚戝竷绾�
+ return grainUtil.reversalRightUp2(temps, conf.getCableRule());
+ }
+ if (Constant.GRAIN_START_DIRECTION_TRANSVERSE.equals(conf.getStartDirection())) {
+ //鍙充笂璧峰锛屾í鍚戝竷绾�
+ return grainUtil.reversalRightUp1(temps, conf.getCableRule());
+ }
+ //鍙充笂璧峰锛岄粯璁ょ旱鍚戝竷绾�
+ return grainUtil.reversalRightUp2(temps, conf.getCableRule());
+ }
+ //璧峰鏂逛綅涓哄乏杈规椂
+ if (Constant.GRAIN_START_ORIENTATION_LEFT.equals(conf.getStartOrientation())) {
+ if (StringUtils.isEmpty(conf.getStartDirection())) {
+ //宸﹁竟璧峰锛岄粯璁ょ旱鍚戝竷绾�
+ return grainUtil.reversalLeft2(temps, conf.getCableRule());
+ }
+ if (Constant.GRAIN_START_DIRECTION_TRANSVERSE.equals(conf.getStartDirection())) {
+ //宸﹁竟璧峰锛屾í鍚戝竷绾�
+ return grainUtil.reversalLeft1(temps, conf.getCableRule());
+ }
+ //宸﹁竟璧峰锛岄粯璁ょ旱鍚戝竷绾�
+ return grainUtil.reversalLeft2(temps, conf.getCableRule());
+ }
+ //璧峰鏂逛綅涓哄乏涓婃椂
+ if (Constant.GRAIN_START_ORIENTATION_LEFT_UP.equals(conf.getStartOrientation())) {
+ if (StringUtils.isEmpty(conf.getStartDirection())) {
+ //宸︿笂璧峰锛岄粯璁ょ旱鍚戝竷绾�
+ return grainUtil.reversalLeftUp2(temps, conf.getCableRule());
+ }
+ if (Constant.GRAIN_START_DIRECTION_TRANSVERSE.equals(conf.getStartDirection())) {
+ //宸︿笂璧峰锛屾í鍚戝竷绾�
+ return grainUtil.reversalLeftUp1(temps, conf.getCableRule());
+ }
+ //宸︿笂璧峰锛岄粯璁ょ旱鍚戝竷绾�
+ return grainUtil.reversalLeftUp2(temps, conf.getCableRule());
+ }
+
+ return temps;
+ }
+
+ /**
+ * 鍙嶈浆鍒� 鐜板疄涓粠宸﹁竟寮�濮嬶紝寮鸿灏嗗彸杈硅В鏋愪负绗竴鍒�
+ *
+ * @return
+ */
+ private List<Double> reversalCable(List<Double> temps, String cable) {
+ String[] attCable = cable.split("-");
+ int cableZ = Integer.valueOf(attCable[0]);
+ int cableY = Integer.valueOf(attCable[1]);
+ int cableX = Integer.valueOf(attCable[2]);
+ List<Double> t = new ArrayList<>();
+ for (int i = 1; i <= temps.size(); i++) {
+ t.add(temps.get((cableX - 1) * cableY * cableZ + ((i - 1) % (cableY * cableZ))));
+ if (i % (cableY * cableZ) == 0) {
+ cableX = cableX - 1;
+ }
+ }
+ return t;
+ }
+
+ /**
+ * 鐢电紗浠庝笅闈㈠紑濮嬫椂锛屽皢绮儏鐢电紗涓婁笅缈昏浆
+ *
+ * @param pointsData 绮儏鏁版嵁
+ * @param cable 灞傝鍒楅厤缃紝濡傦細4-7-11
+ * @return
+ */
+ private String reversalUpAndDown(String pointsData, String cable) {
+ String str = "";
+ if (StringUtils.isEmpty(cable)) {
+ str = pointsData;
+ }
+ String[] attCable = cable.split("-");
+ int cableZ = Integer.valueOf(attCable[0]); //灞�
+
+ String[] points = pointsData.split(",");
+ for (int i = 0; i <= points.length - cableZ; i += cableZ) {
+ for (int j = cableZ - 1; j >= 0; j--) {
+ str += points[i + j];
+ str += ",";
+ }
+ }
+ return str;
+ }
+
+ /**
+ * 鍙嶈浆鍒楀彿楠岃瘉
+ * 2022骞�5鏈�30鏃� 12:11:18
+ * vince
+ *
+ * @param args
+ */
+ public static void main(String[] args) {
+ List<Double> temps = new ArrayList<>();
+ int cableZ = 3;
+ int cableY = 4;
+ int cableX = 6;
+ for (int i = 1; i < (cableX * cableY * cableZ + 1); i++) {
+ temps.add(i + 0.0);
+ }
+
+ List<Double> t = new ArrayList<>();
+ for (int i = 1; i <= temps.size(); i++) {
+ t.add(temps.get((cableX - 1) * cableY * cableZ + ((i - 1) % (cableY * cableZ))));
+ if (i % (cableY * cableZ) == 0) {
+ cableX = cableX - 1;
+ }
+ }
+ for (Double x : t) {
+ System.out.print(x);
+ System.out.print(",");
+ }
+
+
+ System.out.println("--------------------------");
+ int i = 15;
+ int layMax = 10;
+
+ System.out.println(i % layMax);
+
+
+ System.out.println(i / layMax);
+
+ }
+}
\ No newline at end of file
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisService.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisService.java
new file mode 100644
index 0000000..b61c0a6
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisService.java
@@ -0,0 +1,211 @@
+package com.ld.igds.protocol.zldz.analysis;
+
+import com.ld.igds.common.CoreSerService;
+import com.ld.igds.constant.BizType;
+import com.ld.igds.io.constant.OrderRespEnum;
+import com.ld.igds.io.notify.NotifyWebInvoker;
+import com.ld.igds.models.DeviceSer;
+import com.ld.igds.order.ExeOrderService;
+import com.ld.igds.order.data.ExeRequest;
+import com.ld.igds.protocol.zldz.analysis.builder.ReMessageBuilder;
+import com.ld.igds.protocol.zldz.analysis.message.ReMessage;
+import com.ld.igds.protocol.zldz.task.CommandReSendService;
+import com.ld.igds.protocol.zldz.util.CRC8;
+import com.ld.igds.protocol.zldz.util.ServerUtils;
+import com.ld.igds.util.BytesUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 鍗忚瑙ｆ瀽鍏ュ彛
+ *
+ * @author jiazx
+ */
+@Slf4j
+@Component(AnalysisService.BEAN_ID)
+public class AnalysisService {
+
+ public static final String BEAN_ID = "zldz.analysisService";
+
+ @Autowired
+ private CoreSerService coreSerService;
+ @Autowired
+ private AnalysisTH analysisTH;
+ @Autowired
+ private AnalysisGrain analysisGrain;
+ @Autowired
+ private AnalysisConf analysisConf;
+ @Autowired
+ private NotifyWebInvoker notifyWebInvoker;
+ @Autowired
+ private ExeOrderService exeOrderService;
+ @Autowired
+ private CommandReSendService commandReSendService;
+
+
+ /**
+ * @param sessionKey ip:port
+ * @param strMsg
+ */
+ public void analysis2(String sessionKey, String strMsg) {
+ String[] attr = sessionKey.split(":");
+ String ip = attr[0];
+ Integer port = Integer.valueOf(attr[1]);
+
+ ReMessage reMessage = ReMessageBuilder.getInstance().buildMessage(null, ip, port, strMsg);
+
+ if (null == reMessage || null == reMessage.getCompanyId()) {
+ log.error("鍒嗘満----->>>骞冲彴锛氳繑鍥炰俊鎭病鏈夎幏鍙栫粍缁囩紪鐮佷俊鎭紝鏃犳硶缁х画瑙ｆ瀽----{}", sessionKey);
+ return;
+ }
+
+ DeviceSer ser = coreSerService.getCacheSer(reMessage.getCompanyId(), reMessage.getSourceId());
+
+ if (null == ser) {
+ String info = "鍒嗘満=" + reMessage.getSourceId() + "杩斿洖淇℃伅娌℃湁鍖归厤鍒板垎鏈猴紝绯荤粺韪㈠嚭绂荤嚎銆�";
+ log.error("鍒嗘満----->>>骞冲彴锛�" + info);
+ notifyWebInvoker.notifyWeb(reMessage.getCompanyId(), OrderRespEnum.MSG_ERROR, BizType.SYS, info);
+
+ // 娓呴櫎缂撳瓨骞堕攢姣侀摼鎺�
+ commandReSendService.destoryAndDelCache(reMessage.getCompanyId(), ip, port, reMessage.getMessageType());
+ return;
+ }
+
+ log.debug("鍒嗘満----->>>骞冲彴锛氭墍灞炵粍缁�-{}锛屽垎鏈�-{} 杩斿洖鐨勫懡浠や俊鎭�={}", ser.getCompanyId(), ser.getName(), reMessage.toString());
+
+ String checkMsg = this.checkMsg(reMessage, ser);
+ if (null != checkMsg) {
+ // 绯荤粺鎷︽埅鍒颁簡寮傚父鍘熷洜锛屼笉韪㈠嚭杩炴帴
+ if (ServerUtils.MSG_TYPE_8815.equals(reMessage.getMessageType()) || ServerUtils.MSG_TYPE_8817.equals(reMessage.getMessageType())) {
+ commandReSendService.cleanKey(ser.getCompanyId(), ser.getIp(), ser.getPort(), ServerUtils.MSG_TYPE_8817);
+
+ List<ExeRequest> list = exeOrderService.getInProgressOrderBySerId(BizType.GRAIN.getCode(), ser.getId());
+
+ if (null != list && list.size() > 0) {
+ exeOrderService.progressError(ser.getCompanyId(), BizType.GRAIN.getCode(), list.get(0).getDepotId(), checkMsg);
+ } else {
+ notifyWebInvoker.notifyWeb(ser.getCompanyId(), OrderRespEnum.MSG_ERROR, BizType.SYS, checkMsg);
+ }
+ } else {
+ commandReSendService.cleanKey(ser.getCompanyId(), ser.getIp(), ser.getPort(), reMessage.getMessageType());
+
+ notifyWebInvoker.notifyWeb(ser.getCompanyId(), OrderRespEnum.MSG_ERROR, BizType.SYS, checkMsg);
+ }
+
+ log.error("鍒嗘満----->>>骞冲彴锛氬懡浠ら獙璇佸紓甯革細鎵�灞炵粍缁�-{}锛屽紓甯镐俊鎭�-{}锛屾姤鏂囦俊鎭�-{}", ser.getCompanyId(), checkMsg, reMessage.getStrMsg());
+ return;
+ }
+
+ switch (reMessage.getMessageType()) {
+ case ServerUtils.MSG_TYPE_8828:// 娓╂箍搴﹁В鏋�
+ analysisTH.analysis8828(reMessage, ser);
+ break;
+
+ case ServerUtils.MSG_TYPE_8815:// 缁堢搴旂瓟绮儏璇锋眰
+ analysisGrain.analysis8815(reMessage, ser);
+ break;
+
+ case ServerUtils.MSG_TYPE_1117:// 绮儏鏁版嵁淇℃伅
+ analysisGrain.analysis8817(reMessage, ser);
+ break;
+
+
+ case ServerUtils.MSG_TYPE_1129:// 缁堢鍙戦�侀�氶亾鐢电紗鏁版嵁缁欏悗鍙�
+ analysisConf.analysis1129(reMessage, ser);
+ break;
+
+ case ServerUtils.MSG_TYPE_8816:// 瑙ｆ瀽閰嶇疆
+ analysisConf.analysis8816(reMessage, ser);
+ break;
+
+ case ServerUtils.MSG_TYPE_8822:// 鐢电紗鍒濆鍖栨垚鍔�
+ analysisConf.analysis8822(reMessage, ser);
+ break;
+
+ case ServerUtils.MSG_TYPE_8823:// 鐢电紗姹囨�诲簲绛�
+ analysisConf.analysis8823(reMessage, ser);
+ break;
+
+ case ServerUtils.MSG_TYPE_8825:// 璇诲彇閫氶亾鐢电紗閰嶇疆
+ analysisConf.analysis8825(reMessage, ser);
+ break;
+
+ case ServerUtils.MSG_TYPE_8826:// 淇敼鐢电紗鐨勮繑鍥�
+ analysisConf.analysis8826(reMessage, ser);
+ break;
+ default:
+ break;
+ }
+ }
+
+ /**
+ * 鏍￠獙锛屾甯歌繑鍥濶ULL锛屽紓甯歌繑鍥炲紓甯稿師鍥狅紝姝ｅ父寮傚父鍘熷洜杩斿洖涓嶈涪鎺夐噸鏂拌繛鎺�
+ *
+ * @param message
+ * @param ser
+ * @return
+ * @throws Exception
+ */
+ private String checkMsg(ReMessage message, DeviceSer ser) {
+ String result;
+ if (message.getResult() == 1) {
+ result = "鍒嗘満=" + ser.getName() + " 鍗忚瑙ｆ瀽澶辫触锛屽師鍥狅細鎺ユ敹鐨勫簲绛旀牎楠屽紓甯�";
+ return result;
+ }
+ if (message.getResult() == 2) {
+ result = "鍒嗘満=" + ser.getName() + " 鍗忚瑙ｆ瀽澶辫触锛屽師鍥狅細鍙戦�佺殑鏁版嵁鏍￠獙寮傚父";
+ return result;
+ }
+ if (message.getResult() == 3) {
+ result = "鍒嗘満=" + ser.getName() + " 鍗忚瑙ｆ瀽澶辫触锛屽師鍥狅細鎺掗槦涓�";
+ return result;
+ }
+ if (message.getResult() == 4) {
+ result = "鍒嗘満=" + ser.getName() + " 鍗忚瑙ｆ瀽澶辫触锛屽師鍥狅細鍙戦�佽秴鏃堕敊璇�";
+ return result;
+ }
+ if (message.getResult() == 9) {
+ result = "鍒嗘満=" + ser.getName() + " 鍗忚瑙ｆ瀽澶辫触锛屽師鍥狅細Io妯″潡涓嶅湪绾�";
+ return result;
+ }
+ if (message.getResult() == 10) {
+ result = "鍒嗘満=" + ser.getName() + " 鍗忚瑙ｆ瀽澶辫触锛屽師鍥狅細鍙戦�佷腑";
+ return result;
+ }
+ if (message.getResult() == 11) {
+ result = "鍒嗘満=" + ser.getName() + " 鍗忚瑙ｆ瀽澶辫触锛屽師鍥狅細鏃犵嚎妯″潡鏁呴殰";
+ return result;
+ }
+ if (message.getResult() == 12) {
+ result = "鍒嗘満=" + ser.getName()
+ + " 鍗忚瑙ｆ瀽澶辫触锛屽師鍥狅細涓昏鏄弽棣堝潗鏍囩偣浜ゆ崲鍛戒护鎴栬�呮槸鐢电紗淇敼鍛戒护鐨勯敊璇紝鎴栬�呯伯鎯呴噰闆嗙殑鍙傛暟涓嶅";
+ return result;
+ }
+ if (message.getResult() == 13) {
+ result = "鍒嗘満=" + ser.getName() + " 鍗忚瑙ｆ瀽澶辫触锛屽師鍥狅細缃戝叧鏈敞鍐�";
+ return result;
+ }
+
+ // 鑾峰彇鏍￠獙鐨勬姤鏂囦俊鎭�
+ int end = 4 + 18 * 2 + message.getBody().getLength() * 2;
+ String checkStr = message.getStrMsg().substring(4, end);
+
+ byte[] byteCrc16 = BytesUtil.hexStrToBytes(checkStr);
+ short crc16Hex2 = CRC8.calculateCrc16(byteCrc16, (short) 0,
+ (short) (byteCrc16.length));
+ byte[] crc16Hex2Bytes = BytesUtil.shortToByte(crc16Hex2);
+ int crc16 = BytesUtil.bytesToInt(crc16Hex2Bytes);
+ String hexCrc16 = BytesUtil.intToHexStr(crc16);
+
+ if (message.getHexCrc16().equals(hexCrc16)) {
+ return null;
+ } else {
+ result = "鍒嗘満=" + ser.getName() + " 鍗忚瑙ｆ瀽澶辫触锛屽師鍥狅細CRC16鏍￠獙寮傚父";
+ return result;
+ }
+ }
+
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisTH.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisTH.java
new file mode 100644
index 0000000..de2c7d2
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisTH.java
@@ -0,0 +1,120 @@
+package com.ld.igds.protocol.zldz.analysis;
+
+import com.ld.igds.common.dto.THDto;
+import com.ld.igds.constant.BizType;
+import com.ld.igds.constant.Constant;
+import com.ld.igds.io.notify.NotifyWebInvoker;
+import com.ld.igds.io.constant.OrderRespEnum;
+import com.ld.igds.models.DeviceSer;
+import com.ld.igds.order.ExeOrderService;
+import com.ld.igds.order.data.ExeRequest;
+import com.ld.igds.protocol.zldz.analysis.message.ReMessage;
+import com.ld.igds.th.CoreThService;
+import com.ld.igds.util.BytesUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 瑙ｆ瀽娓╂箍搴︿俊鎭�
+ *
+ * @author Andy
+ */
+@Slf4j
+@Component(AnalysisTH.BEAN_ID)
+public class AnalysisTH {
+
+ public static final String BEAN_ID = "zldz.analysisTH";
+
+ @Autowired
+ private CoreThService thService;
+
+ @Autowired
+ private NotifyWebInvoker notifyWebInvoker;
+
+ @Autowired
+ private ExeOrderService exeOrderService;
+
+ public static int ERROR_TH_TAG = -50;
+
+ /**
+ * 瑙ｆ瀽浠撳簱娓╂箍搴︿俊鎭紝灏嗕俊鎭斁鍦ㄧ紦瀛樹腑锛屼互渚跨伯鎯呬娇鐢�
+ *
+ * @param msg
+ * @param ser
+ */
+ public void analysis8828(ReMessage msg, DeviceSer ser) {
+
+ log.debug("-----------analysis8828------------{}-{}.{}", ser.getCompanyId(), ser.getIp(), ser.getPort());
+
+ String content = msg.getBody().getContent();
+
+ //娓╂箍搴﹀湴鍧�,鎴彇4浣�
+ String temp = content.substring(0, 0 + 2 * 2);
+ //楂樹綆浣嶈浆鎹�
+ temp = BytesUtil.tran_LH(temp);
+ int thConf = BytesUtil.hexToInt(temp);
+
+ List<ExeRequest> list = exeOrderService.getInProgressOrderBySerId(BizType.SYS.getCode(), ser.getId() + "_" + thConf);
+ ExeRequest exeRequest = list.get(0);
+
+ int t, h;
+
+ THDto th = new THDto();
+ th.setCompanyId(ser.getCompanyId());
+ th.setTempIn(Constant.ERROR_TEMP);
+ th.setHumidityIn(Constant.ERROR_TEMP);
+
+ //娓╁害
+ int start = 2, len = 1;
+ temp = content.substring(start * 2, start * 2 + len * 2);
+ t = BytesUtil.hexToInt(temp);
+ if (t > 127) {//璇存槑鏄礋鏁�
+ t = BytesUtil.hexToInt("FF" + temp);
+ }
+ if (t == ERROR_TH_TAG) {
+ log.error("{}娓╂箍搴﹁В鏋愬紓甯革紝鍘熷洜锛氭病鏈夋娴嬪埌浼犳劅鍣�", ser.getName());
+ th.setRemark(ser.getName() + "娓╂箍搴﹁В鏋愬紓甯革紝鍘熷洜锛氭病鏈夋娴嬪埌浼犳劅鍣�");
+ } else {
+ th.setTempIn(Double.valueOf(t));
+ }
+
+ //婀垮害
+ start = 3;
+ len = 1;
+ temp = content.substring(start * 2, start * 2 + len * 2);
+ h = BytesUtil.hexToInt(temp);
+ if (h > 127) {//璇存槑鏄礋鏁�
+ h = BytesUtil.hexToInt("FF" + temp);
+ }
+ if (h == ERROR_TH_TAG) {
+ log.error("{}娓╂箍搴﹁В鏋愬紓甯革紝鍘熷洜锛氭病鏈夋娴嬪埌浼犳劅鍣�", ser.getName());
+ th.setRemark(ser.getName() + "娓╂箍搴﹁В鏋愬紓甯革紝鍘熷洜锛氭病鏈夋娴嬪埌浼犳劅鍣�");
+ } else {
+ th.setHumidityIn(Double.valueOf(h));
+ }
+
+ th.setSerId(ser.getId());
+ if (null != exeRequest) {
+ th.setThConf(exeRequest.getThConf());
+ } else {
+ th.setThConf(thConf + "");
+ }
+
+ log.info("浠撴俯浠撴箍瑙ｆ瀽瀹屾垚={}", th.toString());
+
+ //鎸夌収鍒嗘満閲囬泦鏉ョ‘瀹�
+ thService.setCacheTH(th);
+
+ String info = ser.getName() + " 娓╂箍搴﹁幏鍙栧畬鎴�";
+ if (null != exeRequest) {
+ //瀹屾垚
+ exeRequest.setMsg(info);
+ exeOrderService.completeCache(exeRequest, false);
+ }
+ notifyWebInvoker.notifyWeb(ser.getCompanyId(), OrderRespEnum.MSG_SUCCESS, BizType.SYS, info);
+
+ }
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/builder/ReMessageBuilder.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/builder/ReMessageBuilder.java
new file mode 100644
index 0000000..07e3a9a
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/builder/ReMessageBuilder.java
@@ -0,0 +1,130 @@
+package com.ld.igds.protocol.zldz.analysis.builder;
+
+import com.ld.igds.protocol.zldz.analysis.message.ReMessage;
+import com.ld.igds.protocol.zldz.analysis.message.ReMessageBody;
+import com.ld.igds.util.BytesUtil;
+import com.ld.igds.util.ContextUtil;
+
+import java.util.Date;
+
+/**
+ * 鏍规嵁鎺ユ敹鍒扮殑淇℃伅杩涜灏佽
+ *
+ * @author Andy
+ */
+public class ReMessageBuilder {
+
+ private final static ReMessageBuilder instance = new ReMessageBuilder();
+
+ private ReMessageBuilder() {
+ }
+
+ public static ReMessageBuilder getInstance() {
+ return instance;
+ }
+
+ /**
+ * 浣跨敤涓彂鐜癈RC16鍙兘浠E缁撳熬锛孨ETTY璇互涓烘槸缁撳熬瀵艰嚧鎴彇灏戜簡涓�涓狤E锛屽綋鍓嶆柟娉曞繀椤讳粠澶村悜鍚庢埅鍙栵紝淇濊瘉CRC16鐨勪綅缃噯纭�
+ *
+ * @param bytes
+ * @param ip
+ * @param port
+ * @param strMsg
+ * @return
+ */
+ public ReMessage buildMessage(byte[] bytes, String ip, int port, String strMsg) {
+
+ ReMessage message = new ReMessage();
+ message.setIp(ip);
+ message.setPort(port);
+ message.setStrMsg(strMsg);
+ message.setByteMsg(bytes);
+
+ // 婧怚D锛屽垎鏈哄敮涓�ID
+ int start = 2, len = 2;
+ String temp = strMsg.substring(start * 2, start * 2 + len * 2);
+ message.setSourceId(BytesUtil.hexToInt(BytesUtil.tran_LH(temp)) + "");
+
+ //鍒嗘満鎵�灞炵粍缁囩紪鐮�
+ String companyId = ContextUtil.getCompanyIdBySn(message.getSourceId());
+
+ // 鐩爣ID
+ start = 4;
+ len = 2;
+ temp = strMsg.substring(start * 2, start * 2 + len * 2);
+ message.setTargetId(BytesUtil.hexToInt(BytesUtil.tran_LH(temp)) + "");
+
+ // 鍙戦�両D
+ start = 6;
+ len = 2;
+ temp = strMsg.substring(start * 2, start * 2 + len * 2);
+ message.setSendId(BytesUtil.hexToInt(BytesUtil.tran_LH(temp)) + "");
+
+ // 璺敱淇℃伅锛屼笉瑙ｆ瀽
+
+ // 娑堟伅绫诲瀷
+ start = 12;
+ len = 2;
+ temp = strMsg.substring(start * 2, start * 2 + len * 2);
+ message.setMessageType(BytesUtil.tran_LH(temp));
+
+ // 澶勭悊缁撴灉
+ start = 14;
+ len = 1;
+ temp = strMsg.substring(start * 2, start * 2 + len * 2);
+ message.setResult(BytesUtil.hexToInt(temp));
+
+ // 缁勭粐缂栫爜
+ start = 15;
+ len = 2;
+ temp = strMsg.substring(start * 2, start * 2 + len * 2);
+ if(null == companyId){
+ message.setCompanyId(BytesUtil.hexToInt(BytesUtil.tran_LH(temp)) + "");
+ }else{
+ message.setCompanyId(companyId);
+ }
+
+ //鍖呭ご鏍￠獙
+ start = 17;
+ len = 1;
+ temp = strMsg.substring(start * 2, start * 2 + len * 2);
+ message.setHexCrc8(temp);
+
+ // 鍛戒护浣�-闀垮害
+ message.setBody(buildBody());
+ start = 18;
+ len = 2;
+ temp = strMsg.substring(start * 2, start * 2 + len * 2);
+ int bodyLen = BytesUtil.hexToInt(BytesUtil.tran_LH(temp));
+ message.getBody().setLength(bodyLen);
+
+ //鍛戒护浣�-鍐呭
+ start = 20;
+ len = bodyLen;
+ temp = strMsg.substring(start * 2, start * 2 + len * 2);
+ message.getBody().setContent(temp);
+
+ // crc16楠岃瘉
+ start = 20 + bodyLen;
+ len = 2;
+ temp = strMsg.substring(start * 2, start * 2 + len * 2);
+ message.setHexCrc16(temp);
+
+ message.setReceiveDate(new Date());
+ message.setBatchId(ContextUtil.getDefaultBatchId());
+ return message;
+ }
+
+ /**
+ * 鍒涘缓BODY瀵硅薄
+ *
+ * @param
+ * @return
+ */
+ public ReMessageBody buildBody() {
+ ReMessageBody body = new ReMessageBody();
+ body.setLength(0);
+ body.setContent("");
+ return body;
+ }
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/message/Metadata.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/message/Metadata.java
new file mode 100644
index 0000000..6f2fd59
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/message/Metadata.java
@@ -0,0 +1,18 @@
+package com.ld.igds.protocol.zldz.analysis.message;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.FIELD;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(FIELD)
+public @interface Metadata {
+
+ String label() default "";
+
+ int bytes() default 0;
+
+ int startIndex() default 0;
+}
\ No newline at end of file
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/message/ReMessage.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/message/ReMessage.java
new file mode 100644
index 0000000..20e201f
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/message/ReMessage.java
@@ -0,0 +1,74 @@
+package com.ld.igds.protocol.zldz.analysis.message;
+
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 娑堟伅澶村璞�
+ *
+ * @author Andy
+ *
+ */
+@Data
+public class ReMessage {
+
+ private String ip;
+
+ private int port;
+
+ private String begin;
+
+ private String sourceId;// 婧� ID
+
+ private String targetId;// 鐩爣ID
+
+ private String sendId;//鍙戦�佽�匢D
+
+ private String gateway1;//璺敱1
+
+ private String gateway2;//璺敱2
+
+ private String messageType;// 娑堟伅绫诲瀷
+
+ private int result;// 澶勭悊缁撴灉
+
+ private String companyId;// 缁勭粐缂栫爜
+
+ private String hexCrc8;//crc8鍖呭ご鏍￠獙
+
+ private ReMessageBody body;
+
+ private String hexCrc16;//crc16鏍￠獙
+
+ private String end;
+
+ private byte[] byteMsg;// 褰撳墠鍛戒护鐨勫瓧鑺備俊鎭�
+
+ private String strMsg;// 褰撳墠鍛戒护杞崲涓哄瓧绗︿覆鐨勪俊鎭�
+
+ private String batchId;
+
+ private Date receiveDate;
+
+ // 寮傚父淇℃伅
+ private String error;
+
+ @Override
+ public String toString() {
+ return "ReMessage{" +
+ "ip='" + ip + '\'' +
+ ", port=" + port +
+ ", sourceId='" + sourceId + '\'' +
+ ", targetId='" + targetId + '\'' +
+ ", sendId='" + sendId + '\'' +
+ ", messageType='" + messageType + '\'' +
+ ", result=" + result +
+ ", companyId='" + companyId + '\'' +
+ ", hexCrc8='" + hexCrc8 + '\'' +
+ ", hexCrc16='" + hexCrc16 + '\'' +
+ ", strMsg='" + strMsg + '\'' +
+ '}';
+ }
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/message/ReMessageBody.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/message/ReMessageBody.java
new file mode 100644
index 0000000..f8db78b
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/message/ReMessageBody.java
@@ -0,0 +1,18 @@
+package com.ld.igds.protocol.zldz.analysis.message;
+
+import lombok.Data;
+
+/**
+ * 娑堟伅-娑堟伅浣�
+ *
+ * @author Andy
+ *
+ */
+@Data
+public class ReMessageBody {
+
+ private int length;
+
+ private String content;
+
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/BaseRemoteImpl.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/BaseRemoteImpl.java
new file mode 100644
index 0000000..d037461
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/BaseRemoteImpl.java
@@ -0,0 +1,46 @@
+package com.ld.igds.protocol.zldz.command;
+
+import com.ld.igds.io.constant.ProtocolEnum;
+import com.ld.igds.protocol.zldz.server.ZldzServerEngine;
+import com.ld.io.api.InvokeResult;
+import com.ld.io.api.IoSession;
+
+public class BaseRemoteImpl {
+
+ public String getProtocol() {
+ return ProtocolEnum.TCP_ZLDZ_GRAIN_V1.getCode();
+ }
+
+ /**
+ * 鍙戦�佸懡浠�
+ *
+ * @param ip
+ * @param port
+ * @param msg
+ * @return
+ */
+ public InvokeResult send(String ip, int port, byte[] msg) {
+ IoSession session = ZldzServerEngine.getSession(ip,port);
+ if (null == session) {
+ return InvokeResult.CHANNEL_CLOSED;
+ }
+ return session.invoke(msg);
+ }
+
+ public static void updateSession(String ip, int port, String companyId) {
+ IoSession ioSession = ZldzServerEngine.getSession(ip,port);
+ if(null != ioSession){
+ ioSession.setCompanyId(companyId);
+ }
+ }
+
+ public static InvokeResult destory(String ip, int port) {
+ IoSession session = ZldzServerEngine.getSession(ip,port);
+ if (null == session) {
+ return InvokeResult.SUCCESS;
+ }
+ // 鎵ц杩炴帴閿�姣�
+ session.destroy();
+ return InvokeResult.SUCCESS;
+ }
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/RemoteCommonImpl.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/RemoteCommonImpl.java
new file mode 100644
index 0000000..1bcebd8
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/RemoteCommonImpl.java
@@ -0,0 +1,426 @@
+package com.ld.igds.protocol.zldz.command;
+
+import com.ld.igds.io.RemoteCommonService;
+import com.ld.igds.io.constant.OrderRespEnum;
+import com.ld.igds.io.request.*;
+import com.ld.igds.io.response.BaseResponse;
+import com.ld.igds.io.response.GrainResponse;
+import com.ld.igds.protocol.zldz.command.builder.*;
+import com.ld.igds.protocol.zldz.command.message.Message;
+import com.ld.igds.protocol.zldz.task.CommandReSendService;
+import com.ld.igds.protocol.zldz.task.CommandTask;
+import com.ld.igds.protocol.zldz.util.ServerUtils;
+import com.ld.io.api.InvokeResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 褰撳墠鍗忚瀹炵幇锛岀伯鎯呮ā鍧楀懡浠ゆ帴鍙�
+ *
+ * @author jiazx
+ */
+@Slf4j
+@Component(RemoteCommonImpl.BEAN_ID)
+public class RemoteCommonImpl extends BaseRemoteImpl implements RemoteCommonService {
+
+ public static final String BEAN_ID = "zldz.remoteCommonService";
+
+ @Autowired
+ private CommandReSendService commandReSendService;
+
+ @Override
+ public BaseResponse heartBeat(BaseRequest request) {
+ return new GrainResponse(OrderRespEnum.ORDER_ERROR.getCode(), "鍗忚涓嶆敮鎸�");
+ }
+
+ @Override
+ public BaseResponse pullDevice(BaseRequest request) {
+ return new GrainResponse(OrderRespEnum.ORDER_ERROR.getCode(), "鍗忚涓嶆敮鎸�");
+ }
+
+ @Override
+ public BaseResponse pullDepot(BaseRequest request) {
+ return new GrainResponse(OrderRespEnum.ORDER_ERROR.getCode(), "鍗忚涓嶆敮鎸�");
+ }
+
+ @Override
+ public BaseResponse pullAccess(AccessRequest request) {
+ return new GrainResponse(OrderRespEnum.ORDER_ERROR.getCode(), "鍗忚涓嶆敮鎸�");
+ }
+
+ @Override
+ public BaseResponse pullDepotStatus(DepotStatusRequest request) {
+ return new GrainResponse(OrderRespEnum.ORDER_ERROR.getCode(), "鍗忚涓嶆敮鎸�");
+ }
+
+
+ @Override
+ public BaseResponse checkTh(CheckThRequest request) {
+ try {
+ Message message = CommandBuilder1128.getInstance().buildMessage(request);
+
+ log.info("骞冲彴------>>>鍒嗘満锛�" + request.getSerName() + "-娓╂箍搴﹀懡浠や俊鎭�=" + message.toString());
+
+ // 鍙戦�佸懡浠�
+ InvokeResult result = send(request.getIp(), request.getPort(), message.getByteMsg());
+
+ // 灏佽杩斿洖淇℃伅
+ if (InvokeResult.SUCCESS == result) {
+ return new BaseResponse(OrderRespEnum.ORDER_SUCCESS.getCode(),
+ "鍒嗘満=" + request.getSerName() + "鍙戦�佹俯婀垮害鍛戒护鎴愬姛");
+ } else {
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(),
+ "鍒嗘満=" + request.getSerName() + "鍙戦�佹俯婀垮害鍛戒护澶辫触锛�" + result.getMessage());
+ }
+
+
+ } catch (Exception e) {
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(), "鍒嗘満=" + request.getSerName() + "娓╂箍搴﹀懡浠ゅけ璐ワ細" + e.getMessage());
+ }
+ }
+
+ @Override
+ public BaseResponse writeConf(GrainSerConfRequest request) {
+ try {
+ // Step1 鐢熸垚鍛戒护
+ Message message = CommandBuilder1116_1.getInstance().buildMessage(request);
+
+ log.info("骞冲彴------>>>鍒嗘満锛�" + request.getSerName() + "-鍐欏叆閰嶇疆鍛戒护=" + message.toString());
+
+ // 鍙戦�佸懡浠�
+ InvokeResult result = send(request.getIp(), request.getPort(), message.getByteMsg());
+
+ // 灏佽杩斿洖淇℃伅
+ if (InvokeResult.SUCCESS == result) {
+
+ CommandTask commandData = new CommandTask();
+ commandData.setCompanyId(request.getCompanyId());
+ commandData.setIp(request.getIp());
+ commandData.setPort(request.getPort());
+ commandData.setByteCommand(message.getByteMsg());
+ commandData.setCommand(message.getStrMsg());
+ commandData.setResultType(ServerUtils.MSG_TYPE_8816);
+ commandReSendService.reSendTask(commandData);
+
+ return new BaseResponse(OrderRespEnum.ORDER_SUCCESS.getCode(),
+ "鍒嗘満=" + request.getSerName() + "鍐欏叆閰嶇疆鍛戒护鍙戦�佹垚鍔�");
+ } else {
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(),
+ "鍒嗘満=" + request.getSerName() + "鍐欏叆閰嶇疆鍛戒护鍙戦�佸紓甯革細" + result.getMessage());
+ }
+
+ } catch (Exception e) {
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(), "鍒嗘満=" + request.getSerName() + "鍐欏叆閰嶇疆鍛戒护鍙戦�佸紓甯革細" + e.getMessage());
+ }
+ }
+
+ @Override
+ public BaseResponse readConf(GrainSerConfRequest request) {
+ try {
+ // Step1 鐢熸垚鍛戒护
+ Message message = CommandBuilder1116_0.getInstance().buildMessage(request);
+
+ log.info("骞冲彴------>>>鍒嗘満锛�" + request.getSerName() + "-璇诲彇閰嶇疆鍛戒护=" + message.toString());
+
+ // 鍙戦�佸懡浠�
+ InvokeResult result = send(request.getIp(), request.getPort(), message.getByteMsg());
+
+ // 灏佽杩斿洖淇℃伅
+ if (InvokeResult.SUCCESS == result) {
+ CommandTask commandData = new CommandTask();
+ commandData.setCompanyId(request.getCompanyId());
+ commandData.setIp(request.getIp());
+ commandData.setPort(request.getPort());
+ commandData.setByteCommand(message.getByteMsg());
+ commandData.setCommand(message.getStrMsg());
+ commandData.setResultType(ServerUtils.MSG_TYPE_8816);
+ commandReSendService.reSendTask(commandData);
+
+ return new GrainResponse(OrderRespEnum.ORDER_SUCCESS.getCode(),
+ "鍒嗘満=" + request.getSerName() + "璇诲彇閰嶇疆鍛戒护鍙戦�佹垚鍔�");
+ } else {
+
+ return new GrainResponse(OrderRespEnum.ORDER_ERROR.getCode(),
+ "鍒嗘満=" + request.getSerName() + "璇诲彇閰嶇疆鍛戒护鍙戦�佸紓甯革細" + result.getMessage());
+ }
+ } catch (Exception e) {
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(), "鍒嗘満=" + request.getSerName() + "璇诲彇閰嶇疆鍛戒护鍙戦�佸紓甯革細" + e.getMessage());
+ }
+ }
+
+ @Override
+ public BaseResponse initCable(BaseRequest request) {
+ try {
+ // Step1 鐢熸垚绮儏淇℃伅
+ Message message = CommandBuilder1122.getInstance().buildMessage(request);
+
+ log.info("骞冲彴------>>>鍒嗘満锛�" + request.getSerName() + "-鍒濆鍖栫數缂嗗懡浠�=" + message.toString());
+
+ // 鍙戦�佸懡浠�
+ InvokeResult result = send(request.getIp(), request.getPort(),
+ message.getByteMsg());
+
+ // 灏佽杩斿洖淇℃伅
+ if (InvokeResult.SUCCESS == result) {
+ CommandTask commandData = new CommandTask();
+ commandData.setCompanyId(request.getCompanyId());
+ commandData.setIp(request.getIp());
+ commandData.setPort(request.getPort());
+ commandData.setByteCommand(message.getByteMsg());
+ commandData.setCommand(message.getStrMsg());
+ commandData.setResultType(ServerUtils.MSG_TYPE_8822);
+ commandReSendService.reSendTask(commandData);
+
+ return new BaseResponse(OrderRespEnum.ORDER_SUCCESS.getCode(),
+ "鍒嗘満=" + request.getSerName() + "鍒濆鍖栫數缂嗗彂閫佹垚鍔�");
+ } else {
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(),
+ "鍒嗘満=" + request.getSerName() + "鍒濆鍖栫數缂嗗懡浠ゅ彂閫佸け璐ワ細" + result.getMessage());
+ }
+ } catch (Exception e) {
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(), "鍒嗘満=" + request.getSerName() + "鍒濆鍖栫數缂嗗懡浠ゆ墽琛屽け璐ワ細" + e.getMessage());
+ }
+ }
+
+ @Override
+ public BaseResponse updateGrainSerCable(GrainSerConfRequest request) {
+ if (null == request.getEditTag()) {
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(),
+ "褰撳墠鎿嶄綔娌℃湁鍒跺畾淇敼鏍囪瘑锛屾棤娉曟墽琛岋紒");
+ }
+
+ //鏍规嵁淇敼鏍囪瘑澶勭悊涓嶅悓鐨勯�昏緫 -- 2鐐瑰彿淇敼 3鍒楀彿淇敼锛�4鏍瑰彿淇敼锛�5鍚屾鐢电紗锛�6鏍瑰彿鏇挎崲
+ if (2 == request.getEditTag()) {
+ return updateGrainSerCable2(request);
+ }
+ if (3 == request.getEditTag()) {
+ return updateGrainSerCable3(request);
+ }
+ if (4 == request.getEditTag()) {
+ return updateGrainSerCable4(request);
+ }
+ if (5 == request.getEditTag()) {
+ return updateGrainSerCable5(request);
+ }
+ if (6 == request.getEditTag()) {
+ return updateGrainSerCable6(request);
+ }
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(),
+ "娌℃湁鍖归厤鍒板綋鍓嶉渶瑕佹搷浣滅殑鏍囪瘑锛屾爣璇�=" + request.getEditTag());
+ }
+
+ /**
+ * 鏍瑰彿鏇挎崲
+ *
+ * @param request
+ * @return
+ */
+ private BaseResponse updateGrainSerCable6(GrainSerConfRequest request) {
+ if (null == request.getValue1() || null == request.getValue2()) {
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(),
+ "鏇挎崲鎿嶄綔涓紝娌℃湁鑾峰彇鍒版柊鏃у弬鏁伴厤缃紒");
+ }
+
+ // Step1
+ Message message = CommandBuilder1126.getInstance().buildMessage(request);
+
+ log.info("骞冲彴------>>>鍒嗘満锛�" + request.getSerName() + "鐢电紗-鏍瑰彿鏇挎崲鍛戒护=" + message.toString());
+
+ // 鍙戦�佸懡浠�
+ InvokeResult result = send(request.getIp(), request.getPort(),
+ message.getByteMsg());
+
+ // 灏佽杩斿洖淇℃伅
+ if (InvokeResult.SUCCESS == result) {
+ return new BaseResponse(OrderRespEnum.ORDER_SUCCESS.getCode(),
+ "鍒嗘満=" + request.getSerName() + "鐢电紗-鏍瑰彿鏇挎崲鍙戦�佹垚鍔燂紒");
+ } else {
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(),
+ "鍒嗘満=" + request.getSerName() + "鐢电紗-鏍瑰彿鏇挎崲鍙戦�佸け璐ワ細" + result.getMessage());
+ }
+
+ }
+
+ /**
+ * @param request
+ * @return
+ */
+ private BaseResponse updateGrainSerCable5(GrainSerConfRequest request) {
+ if (null == request.getValue1() || null == request.getValue2()) {
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(),
+ "鍚屾鐢电紗澶辫触锛屽悓姝ョ數缂嗗弬鏁颁笉瀹屾暣");
+ }
+
+
+ // Step1
+ Message message = CommandBuilder1126.getInstance().buildMessage(request);
+
+ log.info("骞冲彴------>>>鍒嗘満锛�" + request.getSerName() + "鍚屾鐢电紗-鍛戒护=" + message.toString());
+
+ // 鍙戦�佸懡浠�
+ InvokeResult result = send(request.getIp(), request.getPort(),
+ message.getByteMsg());
+
+ // 灏佽杩斿洖淇℃伅
+ if (InvokeResult.SUCCESS == result) {
+ return new BaseResponse(OrderRespEnum.ORDER_SUCCESS.getCode(),
+ "鍒嗘満=" + request.getSerName() + "鐢电紗-鏍瑰彿鏇挎崲鍙戦�佹垚鍔燂紒");
+ } else {
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(),
+ "鍒嗘満=" + request.getSerName() + "鐢电紗-鏍瑰彿鏇挎崲鍙戦�佸け璐ワ細" + result.getMessage());
+ }
+ }
+
+ private BaseResponse updateGrainSerCable4(GrainSerConfRequest request) {
+ if (null == request.getValue1() || null == request.getValue2()) {
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(),
+ "鏇挎崲鎿嶄綔涓紝娌℃湁鑾峰彇鍒版柊鏃у弬鏁伴厤缃紒");
+ }
+
+ //杈撳叆鍊奸渶瑕�-1
+ request.setValue1(request.getValue1() - 1);
+ request.setValue2(request.getValue2() - 1);
+
+ // Step1
+ Message message = CommandBuilder1126.getInstance().buildMessage(request);
+
+ log.info("骞冲彴------>>>鍒嗘満锛�" + request.getSerName() + "-鐢电紗-鏍瑰彿淇敼鍛戒护=" + message.toString());
+
+ // 鍙戦�佸懡浠�
+ InvokeResult result = send(request.getIp(), request.getPort(),
+ message.getByteMsg());
+
+ // 灏佽杩斿洖淇℃伅
+ if (InvokeResult.SUCCESS == result) {
+ return new BaseResponse(OrderRespEnum.ORDER_SUCCESS.getCode(),
+ "鍒嗘満=" + request.getSerName() + "鐢电紗-鏍瑰彿淇敼鍛戒护鍙戦�佹垚鍔燂紒");
+ } else {
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(),
+ "鍒嗘満=" + request.getSerName() + "鐢电紗-鏍瑰彿淇敼鍛戒护鍙戦�佸け璐ワ細" + result.getMessage());
+ }
+ }
+
+ private BaseResponse updateGrainSerCable3(GrainSerConfRequest request) {
+
+ if (null == request.getEditCol()) {
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(),
+ "鏇挎崲鎿嶄綔涓紝娌℃湁鑾峰彇鍒楀弬鏁帮紒");
+ }
+
+ // Step1
+ Message message = CommandBuilder1126.getInstance().buildMessage(request);
+
+ log.info("骞冲彴------>>>鍒嗘満锛�" + request.getSerName() + "鐢电紗-鍒楀彿淇敼鍛戒护=" + message.toString());
+
+ // 鍙戦�佸懡浠�
+ InvokeResult result = send(request.getIp(), request.getPort(),
+ message.getByteMsg());
+
+ // 灏佽杩斿洖淇℃伅
+ if (InvokeResult.SUCCESS == result) {
+ return new BaseResponse(OrderRespEnum.ORDER_SUCCESS.getCode(),
+ "鍒嗘満=" + request.getSerName() + "鐢电紗-鍒楀彿淇敼鍛戒护鍙戦�佹垚鍔燂紒");
+ } else {
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(),
+ "鍒嗘満=" + request.getSerName() + "鐢电紗-鍒楀彿淇敼鍛戒护鍙戦�佸け璐ワ細" + result.getMessage());
+ }
+ }
+
+ private BaseResponse updateGrainSerCable2(GrainSerConfRequest request) {
+
+ if (null == request.getValue1() || null == request.getValue2()) {
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(),
+ "鏇挎崲鎿嶄綔涓紝娌℃湁鑾峰彇鍒版柊鏃у弬鏁伴厤缃紒");
+ }
+
+ //杈撳叆鍊奸渶瑕�-1
+ request.setValue1(request.getValue1() - 1);
+ request.setValue2(request.getValue2() == null ? 0 : request.getValue2());
+
+ // Step1 鐢熸垚鍛戒护
+ Message message = CommandBuilder1126.getInstance().buildMessage(request);
+
+ log.info("骞冲彴------>>>鍒嗘満锛�" + request.getSerName() + "鐢电紗-鐐瑰彿淇敼鍛戒护=" + message.toString());
+
+ // 鍙戦�佸懡浠�
+ InvokeResult result = send(request.getIp(), request.getPort(), message.getByteMsg());
+
+ // 灏佽杩斿洖淇℃伅
+ if (InvokeResult.SUCCESS == result) {
+ return new BaseResponse(OrderRespEnum.ORDER_SUCCESS.getCode(),
+ "鍒嗘満=" + request.getSerName() + "鐢电紗-鐐瑰彿淇敼鍛戒护鍙戦�佹垚鍔燂紒");
+ } else {
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(),
+ "鍒嗘満=" + request.getSerName() + "鐢电紗-鐐瑰彿淇敼鍛戒护鍙戦�佸け璐ワ細" + result.getMessage());
+ }
+ }
+
+
+ /**
+ * 鑾峰彇閫氶亾鐢电紗
+ *
+ * @param request
+ * @return
+ */
+ @Override
+ public BaseResponse checkGrainSerCable(GrainSerConfRequest request) {
+
+ // Step1 鐢熸垚绮儏淇℃伅
+ Message message = CommandBuilder1125.getInstance().buildMessage(request);
+
+ log.info("骞冲彴------>>>鍒嗘満锛�" + request.getSerName() + "鑾峰彇閫氶亾鐢电紗鍛戒护=" + message.toString());
+
+ // 鍙戦�佸懡浠�
+ InvokeResult result = send(request.getIp(), request.getPort(), message.getByteMsg());
+
+ // 灏佽杩斿洖淇℃伅
+ if (InvokeResult.SUCCESS == result) {
+ return new BaseResponse(OrderRespEnum.ORDER_SUCCESS.getCode(),
+ "鍒嗘満=" + request.getSerName() + "鑾峰彇閫氶亾鐢电紗鍛戒护鍙戦�佹垚鍔燂紒");
+ } else {
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(),
+ "鍒嗘満=" + request.getSerName() + "鑾峰彇閫氶亾鐢电紗鍛戒护鍙戦�佸け璐ワ細" + result.getMessage());
+ }
+
+ }
+
+
+ @Override
+ public BaseResponse destroyCon(BaseRequest request) {
+ InvokeResult result = destory(request.getIp(), request.getPort());
+ if (InvokeResult.SUCCESS == result) {
+ return new BaseResponse(OrderRespEnum.ORDER_SUCCESS.getCode(),
+ "鍒嗘満=" + request.getSerName() + "鏂紑杩炴帴鎵ц鎴愬姛");
+ } else {
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(), "鍒嗘満=" + request.getSerName() + "鏂紑杩炴帴澶辫触锛�" + result.getMessage());
+ }
+ }
+
+ @Override
+ public BaseResponse updateSysDepotConf(BaseRequest request) {
+ return new BaseResponse(OrderRespEnum.NO_FUNCTION);
+ }
+
+ @Override
+ public BaseResponse sumGrainSerCable(GrainSerConfRequest request) {
+ // Step1
+ Message message = CommandBuilder1123.getInstance().buildMessage(request);
+
+ log.info("骞冲彴------>>>鍒嗘満锛�" + request.getSerName() + "鐢电紗姹囨�诲懡浠�=" + message.toString());
+
+ // 鍙戦�佸懡浠�
+ InvokeResult result = send(request.getIp(), request.getPort(), message.getByteMsg());
+
+ // 灏佽杩斿洖淇℃伅
+ if (InvokeResult.SUCCESS == result) {
+ return new BaseResponse(OrderRespEnum.ORDER_SUCCESS.getCode(),
+ "鍒嗘満=" + request.getSerName() + "鐢电紗姹囨�诲懡浠ゅ彂閫佹垚鍔燂紒");
+ } else {
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(),
+ "鍒嗘満=" + request.getSerName() + "鐢电紗姹囨�诲懡浠ゅ彂閫佸け璐ワ細" + result.getMessage());
+ }
+ }
+
+
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/RemoteGrainServiceImpl.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/RemoteGrainServiceImpl.java
new file mode 100644
index 0000000..676bcc1
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/RemoteGrainServiceImpl.java
@@ -0,0 +1,129 @@
+package com.ld.igds.protocol.zldz.command;
+
+import com.ld.igds.io.RemoteGrainService;
+import com.ld.igds.io.constant.OrderRespEnum;
+import com.ld.igds.io.request.BaseRequest;
+import com.ld.igds.io.request.CheckGrainRequest;
+import com.ld.igds.io.response.BaseResponse;
+import com.ld.igds.io.response.GrainResponse;
+import com.ld.igds.protocol.zldz.command.builder.CommandBuilder1115;
+import com.ld.igds.protocol.zldz.command.builder.CommandBuilder8815;
+import com.ld.igds.protocol.zldz.command.builder.CommandBuilder8817;
+import com.ld.igds.protocol.zldz.command.message.Message;
+import com.ld.igds.protocol.zldz.task.CommandReSendService;
+import com.ld.igds.protocol.zldz.task.CommandTask;
+import com.ld.igds.protocol.zldz.util.ServerUtils;
+import com.ld.io.api.InvokeResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 绮儏鍗忚锛岀洿鎺ヨ幏鍙栫伯鎯咃紝娓╂箍搴︿俊鎭�氳繃蹇冭烦瀹氭椂鑾峰彇銆�
+ *
+ * @author jiazx
+ */
+@Slf4j
+@Component(RemoteGrainServiceImpl.BEAN_ID)
+public class RemoteGrainServiceImpl extends BaseRemoteImpl implements
+ RemoteGrainService {
+
+ public static final String BEAN_ID = "zldz.remoteGrainService";
+
+ @Autowired
+ private CommandReSendService commandReSendService;
+
+ /**
+ * 绮儏妫�娴嬶紝棣栧厛闇�瑕佹墽琛屾俯婀垮害妫�娴嬶紝娓╂箍搴︽娴嬪畬鎴愬悗锛屽啀杩涚伯鎯呮娴嬨��
+ * 娓╂箍搴︾殑淇℃伅鏍规嵁鍒嗘満鍜屾俯婀垮害鍦板潃瀛樺湪缂撳瓨30鍒嗛挓锛�30鍒嗛挓鍐呬笉閲嶅閲囬泦锛岀郴缁熷垽鏂笌褰撳墠鏃堕棿宸窛绂诲綋鍓嶆椂闂存槸鍚﹁秴杩�25鍒嗛挓
+ * 锛岃秴杩囬噸鏂拌幏鍙栵紝娌℃湁瓒呰繃鐩存帴閲囬泦绮儏
+ *
+ * @param request
+ * @return
+ */
+ @Override
+ public GrainResponse checkGrain(CheckGrainRequest request) {
+ // Step1 鐢熸垚绮儏淇℃伅
+ Message message = CommandBuilder1115.getInstance().buildMessage(request);
+
+ log.info("骞冲彴------>>>鍒嗘満锛�" +request.getSerName() + "-绮儏閲囬泦鍛戒护=" + message.toString());
+
+ InvokeResult result = send(request.getIp(), request.getPort(), message.getByteMsg());
+
+ // 灏佽杩斿洖淇℃伅
+ if (InvokeResult.SUCCESS == result) {
+ CommandTask commandData = new CommandTask();
+ commandData.setCompanyId(request.getCompanyId());
+ commandData.setIp(request.getIp());
+ commandData.setPort(request.getPort());
+ commandData.setByteCommand(message.getByteMsg());
+ commandData.setCommand(message.getStrMsg());
+ commandData.setResultType(ServerUtils.MSG_TYPE_8817);
+ commandData.setCableRule(request.getCableRule());
+ commandData.setSerName(request.getSerName());
+ commandData.setDepotId(request.getDepotId());
+ commandReSendService.reSendGrainTask(commandData);
+ return new GrainResponse(OrderRespEnum.ORDER_SUCCESS.getCode(),
+ "绮儏閲囬泦鍛戒护鍙戦�佹垚鍔�");
+ } else {
+ log.info("鍒嗘満" + request.getSerName() + "绮儏閲囬泦鍛戒护鍙戦�佸け璐ワ細" + result.getMessage());
+ return new GrainResponse(OrderRespEnum.ORDER_ERROR.getCode(), result.getMessage());
+ }
+ }
+
+ /**
+ * 鏈嶅姟鍣ㄥ洖澶嶇粓绔殑鏀跺埌璇锋眰
+ *
+ * @param request
+ */
+ public BaseResponse reply8815(BaseRequest request) {
+ // Step1 鐢熸垚绮儏淇℃伅
+ Message message = CommandBuilder8815.getInstance().buildMessage(
+ request);
+
+ log.debug("骞冲彴------>>>鍒嗘満锛�" +request.getSerName() + "-绮儏鏈嶅姟绔洖澶嶅懡浠�=" + message.toString());
+
+ // 鍙戦�佸懡浠�
+ InvokeResult result = send(request.getIp(), request.getPort(),
+ message.getByteMsg());
+ // 灏佽杩斿洖淇℃伅
+ if (InvokeResult.SUCCESS == result) {
+ return new BaseResponse(OrderRespEnum.ORDER_SUCCESS.getCode(),
+ "鍒嗘満" + request.getSerName() + "绮儏鏈嶅姟绔洖澶嶅懡浠ゅ彂閫佹垚鍔�");
+ } else {
+ log.error("鍒嗘満" + request.getSerName() + "绮儏鏈嶅姟绔洖澶嶅懡浠ゅ彂閫佸け璐ワ細" + result.getMessage());
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(),
+ "鍒嗘満" + request.getSerName() + "绮儏鏈嶅姟绔洖澶嶅懡浠ゅ彂閫佸け璐ワ細" + result.getMessage());
+ }
+ }
+
+ /**
+ * 鍥炲鍛戒护
+ *
+ * @param request
+ * @param hexCurPacket 褰撳墠鍖呯殑hex
+ */
+ public BaseResponse reply8817(BaseRequest request, String hexCurPacket) {
+ // Step1 鐢熸垚绮儏淇℃伅锛屾妸淇℃伅鏀惧湪request
+ request.setBizType(hexCurPacket);
+
+ Message message = CommandBuilder8817.getInstance().buildMessage(request);
+
+ log.debug("骞冲彴------>>>鍒嗘満锛�" +request.getSerName() + "-绮儏鏈嶅姟绔洖澶嶆敹鍒扮伯鎯呭寘鍛戒护=" + message.toString());
+
+ // 鍙戦�佸懡浠�
+ InvokeResult result = send(request.getIp(), request.getPort(),
+ message.getByteMsg());
+
+ // 灏佽杩斿洖淇℃伅
+ if (InvokeResult.SUCCESS == result) {
+ return new BaseResponse(OrderRespEnum.ORDER_SUCCESS.getCode(),
+ "鍒嗘満" + request.getSerName() + "绮儏鏈嶅姟绔洖澶嶆敹鍒扮伯鎯呭寘鍛戒护鍙戦�佹垚鍔�");
+ } else {
+ log.info("鍒嗘満" + request.getSerName() + "绮儏鏈嶅姟绔洖澶嶆敹鍒扮伯鎯呭寘鍛戒护鍙戦�佸け璐ワ細" + result.getMessage());
+
+ return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(),
+ "鍒嗘満" + request.getSerName() + "绮儏鏈嶅姟绔洖澶嶆敹鍒扮伯鎯呭寘鍛戒护鍙戦�佸け璐ワ細" + result.getMessage());
+ }
+ }
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder.java
new file mode 100644
index 0000000..de3f9c0
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder.java
@@ -0,0 +1,144 @@
+package com.ld.igds.protocol.zldz.command.builder;
+
+import com.ld.igds.io.request.BaseRequest;
+import com.ld.igds.protocol.zldz.command.message.Message;
+import com.ld.igds.protocol.zldz.command.message.MessageBody;
+import com.ld.igds.protocol.zldz.util.CRC8;
+import com.ld.igds.protocol.zldz.util.ServerUtils;
+import com.ld.igds.util.BytesUtil;
+
+
+/**
+ * 鍛戒护鐢熸垚鍣�
+ *
+ * @author Andy
+ */
+public abstract class CommandBuilder {
+
+ /*
+ * 鍛戒护鍒涘缓
+ *
+ * @param order
+ */
+ public Message buildMessage(BaseRequest request) {
+ Message message = new Message();
+
+ message.setBegin(ServerUtils.MSG_START);
+
+ // 璋冩暣Message澶撮儴淇℃伅
+ buildHeader(message, request);
+
+ //鍖呭ご鏍￠獙
+ buildCrc8(message);
+
+ // 鍒涘缓娑堟伅浣�
+ buildBody(message, request);
+
+ // 娣诲姞鏍￠獙
+ buildCrc16(message);
+
+ message.setEnd(ServerUtils.MSG_END);
+
+ // 鐢熸垚鏁翠綋鍛戒护淇℃伅鍜孊Yte淇℃伅
+ build(message);
+
+ return message;
+ }
+
+
+ public void buildHeader(Message message, BaseRequest request) {
+ String hexCompanyId = BytesUtil.getTargetId(request.getCompanyId(),true);
+ hexCompanyId = BytesUtil.tran_LH(hexCompanyId);
+ message.setSourceId(hexCompanyId);
+ message.setSendId(hexCompanyId);
+ message.setCompanyId(hexCompanyId);
+
+ message.setSourceId(BytesUtil.getTargetId(request.getSerId(), true));
+
+ message.setMessageType(ServerUtils.MSG_TYPE_1116);
+ }
+
+ public void buildBody(Message message, BaseRequest request) {
+ MessageBody body = new MessageBody();
+ body.setContent("");
+ body.setLength(0);
+ message.setBody(body);
+ }
+
+ public void buildCrc8(Message message) {
+ StringBuffer hexSbCrc8 = new StringBuffer();
+ hexSbCrc8.append(message.getSourceId());
+ hexSbCrc8.append(message.getTargetId());
+ hexSbCrc8.append(message.getSendId());
+ hexSbCrc8.append(message.getGateway1());
+ hexSbCrc8.append(message.getGateway2());
+ hexSbCrc8.append(message.getMessageType());
+ hexSbCrc8.append(message.getResult());
+ hexSbCrc8.append(message.getCompanyId());
+
+ byte[] bytes = BytesUtil.hexStrToBytes(hexSbCrc8.toString());
+ byte crc8 = CRC8.calcCrc8(bytes, (short) 0, (short) (bytes.length),
+ (byte) 0);
+
+ message.setHexCrc8(BytesUtil.byteToHex(crc8));
+ }
+
+
+ public void buildCrc16(Message message) {
+ StringBuffer hexSbCrc16 = new StringBuffer();
+ hexSbCrc16.append(message.getSourceId());
+ hexSbCrc16.append(message.getTargetId());
+ hexSbCrc16.append(message.getSendId());
+ hexSbCrc16.append(message.getGateway1());
+ hexSbCrc16.append(message.getGateway2());
+ hexSbCrc16.append(message.getMessageType());
+ hexSbCrc16.append(message.getResult());
+ hexSbCrc16.append(message.getCompanyId());
+
+ hexSbCrc16.append(message.getHexCrc8());
+
+ hexSbCrc16.append(BytesUtil.tran_LH(BytesUtil
+ .getHex2LenStr(message.getBody().getLength())));
+
+ hexSbCrc16.append(message.getBody().getContent());
+
+ byte[] byteCrc16 = BytesUtil.hexStrToBytes(hexSbCrc16.toString());
+ short crc16Hex2 = CRC8.calculateCrc16(byteCrc16, (short) 0, (short) (byteCrc16.length));
+ byte[] crc16Hex2Bytes = BytesUtil.shortToByte(crc16Hex2);
+ int crc16 = BytesUtil.bytesToInt(crc16Hex2Bytes);
+
+
+ message.setHexCrc16(BytesUtil.intToHexStr(crc16));
+ }
+
+ /**
+ * 鏍规嵁鐢熸垚鐨勫懡浠わ紝杩涜璋冩暣
+ *
+ * @param message
+ */
+ public void build(Message message) {
+ StringBuffer hexSb = new StringBuffer();
+
+ hexSb.append(message.getBegin());
+ hexSb.append(message.getSourceId());
+ hexSb.append(message.getTargetId());
+ hexSb.append(message.getSendId());
+ hexSb.append(message.getGateway1());
+ hexSb.append(message.getGateway2());
+ hexSb.append(message.getMessageType());
+ hexSb.append(message.getResult());
+ hexSb.append(message.getCompanyId());
+ hexSb.append(message.getHexCrc8());
+
+ hexSb.append(BytesUtil.tran_LH(BytesUtil
+ .getHex2LenStr(message.getBody().getLength())));
+
+ hexSb.append(message.getBody().getContent());
+ hexSb.append(message.getHexCrc16());
+ hexSb.append(message.getEnd());
+
+ message.setStrMsg(hexSb.toString());
+ message.setByteMsg(BytesUtil.hexStrToBytes(message.getStrMsg()));
+ }
+
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1115.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1115.java
new file mode 100644
index 0000000..5e4c908
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1115.java
@@ -0,0 +1,79 @@
+package com.ld.igds.protocol.zldz.command.builder;
+
+import com.ld.igds.io.request.BaseRequest;
+import com.ld.igds.io.request.CheckGrainRequest;
+import com.ld.igds.protocol.zldz.command.message.Message;
+import com.ld.igds.protocol.zldz.command.message.MessageBody;
+import com.ld.igds.protocol.zldz.util.ServerUtils;
+import com.ld.igds.util.BytesUtil;
+
+
+/**
+ * 绮儏淇℃伅鍛戒护
+ *
+ * @author Andy
+ */
+public class CommandBuilder1115 extends CommandBuilder {
+
+
+ private final static CommandBuilder1115 instance = new CommandBuilder1115();
+
+ private CommandBuilder1115() {
+
+ }
+
+ public static CommandBuilder1115 getInstance() {
+ return instance;
+ }
+
+ public Message buildMessage(CheckGrainRequest request) {
+
+ //request.setCompanyId("1");
+
+ Message message = new Message();
+
+ message.setBegin(ServerUtils.MSG_START);
+
+ // 璋冩暣Message澶撮儴淇℃伅
+ buildHeader(message, request);
+
+ //鍖呭ご鏍￠獙
+ buildCrc8(message);
+
+ // 鍒涘缓娑堟伅浣�
+ buildBody(message, request);
+
+ // 娣诲姞鏍￠獙
+ buildCrc16(message);
+
+ message.setEnd(ServerUtils.MSG_END);
+
+ // 鐢熸垚鏁翠綋鍛戒护淇℃伅鍜孊Yte淇℃伅
+ build(message);
+
+ return message;
+ }
+
+ public void buildHeader(Message message, BaseRequest order) {
+ String hexCompanyId = BytesUtil.getTargetId(order.getCompanyId(),true);
+ hexCompanyId = BytesUtil.tran_LH(hexCompanyId);
+
+ message.setSourceId(hexCompanyId);
+ message.setSendId(hexCompanyId);
+ message.setCompanyId(hexCompanyId);
+
+ message.setTargetId(BytesUtil.tran_LH(BytesUtil.getTargetId(order.getSerId(), true)));
+ message.setMessageType(BytesUtil.tran_LH(ServerUtils.MSG_TYPE_1115));
+ }
+
+
+ public void buildBody(Message message, CheckGrainRequest order) {
+ MessageBody body = new MessageBody();
+ body.setLength(2);
+ int start = order.getCableStart();
+ int end = order.getCableEnd();
+ body.setContent(BytesUtil.toHexString(start) + BytesUtil.toHexString(end));
+ message.setBody(body);
+ }
+
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1116_0.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1116_0.java
new file mode 100644
index 0000000..a290402
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1116_0.java
@@ -0,0 +1,83 @@
+package com.ld.igds.protocol.zldz.command.builder;
+
+import com.ld.igds.io.request.GrainSerConfRequest;
+import com.ld.igds.protocol.zldz.command.message.Message;
+import com.ld.igds.protocol.zldz.command.message.MessageBody;
+import com.ld.igds.protocol.zldz.util.ServerUtils;
+import com.ld.igds.util.BytesUtil;
+
+
+/**
+ *
+ * @author Andy
+ */
+public class CommandBuilder1116_0 extends CommandBuilder {
+
+
+ private final static CommandBuilder1116_0 instance = new CommandBuilder1116_0();
+
+ private CommandBuilder1116_0() {
+
+ }
+
+ public static CommandBuilder1116_0 getInstance() {
+ return instance;
+ }
+
+ public Message buildMessage(GrainSerConfRequest request) {
+
+ Message message = new Message();
+
+ message.setBegin(ServerUtils.MSG_START);
+
+ // 璋冩暣Message澶撮儴淇℃伅
+ buildHeader(message, request);
+
+ //鍖呭ご鏍￠獙
+ buildCrc8(message);
+
+ // 鍒涘缓娑堟伅浣�
+ buildBody(message, request);
+
+ // 娣诲姞鏍￠獙
+ buildCrc16(message);
+
+ message.setEnd(ServerUtils.MSG_END);
+
+ // 鐢熸垚鏁翠綋鍛戒护淇℃伅鍜孊Yte淇℃伅
+ build(message);
+
+ return message;
+ }
+
+ public void buildHeader(Message message, GrainSerConfRequest request) {
+
+// String hexCompanyId = BytesUtil.getTargetId(request.getCompanyId(),true);
+//
+// hexCompanyId = BytesUtil.tran_LH(hexCompanyId);
+// message.setSourceId(hexCompanyId);
+// message.setSendId(hexCompanyId);
+//
+// //鍙戦�佺殑蹇呴』鏄師鏉ョ殑缁勭粐缂栫爜
+// String orgId = BytesUtil.tran_LH(BytesUtil.getTargetId(request.getOrgId(),true));
+// message.setCompanyId(orgId);
+//
+// message.setTargetId(BytesUtil.tran_LH(BytesUtil.getTargetId(request.getSerId(), true)));
+
+ message.setSourceId("0000");
+ message.setSendId("0000");
+ message.setCompanyId("0000");
+ message.setTargetId("FFFF");
+
+ message.setMessageType(BytesUtil.tran_LH(ServerUtils.MSG_TYPE_1116));
+ }
+
+
+ public void buildBody(Message message, GrainSerConfRequest request) {
+ MessageBody body = new MessageBody();
+ body.setContent("0000000000000000000000000000");
+ body.setLength(14);
+ message.setBody(body);
+ }
+
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1116_1.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1116_1.java
new file mode 100644
index 0000000..fbec3fd
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1116_1.java
@@ -0,0 +1,97 @@
+package com.ld.igds.protocol.zldz.command.builder;
+
+import com.ld.igds.io.request.GrainSerConfRequest;
+import com.ld.igds.protocol.zldz.command.message.Message;
+import com.ld.igds.protocol.zldz.command.message.MessageBody;
+import com.ld.igds.protocol.zldz.util.ServerUtils;
+import com.ld.igds.util.BytesUtil;
+import org.apache.commons.lang3.StringUtils;
+
+
+/**
+ *
+ * @author Andy
+ */
+public class CommandBuilder1116_1 extends CommandBuilder {
+
+
+ private final static CommandBuilder1116_1 instance = new CommandBuilder1116_1();
+
+ private CommandBuilder1116_1() {
+
+ }
+
+ public static CommandBuilder1116_1 getInstance() {
+ return instance;
+ }
+
+ public Message buildMessage(GrainSerConfRequest request) {
+
+ Message message = new Message();
+
+ message.setBegin(ServerUtils.MSG_START);
+
+ // 璋冩暣Message澶撮儴淇℃伅
+ buildHeader(message, request);
+
+ //鍖呭ご鏍￠獙
+ buildCrc8(message);
+
+ // 鍒涘缓娑堟伅浣�
+ buildBody(message, request);
+
+ // 娣诲姞鏍￠獙
+ buildCrc16(message);
+
+ message.setEnd(ServerUtils.MSG_END);
+
+ // 鐢熸垚鏁翠綋鍛戒护淇℃伅鍜孊Yte淇℃伅
+ build(message);
+
+ return message;
+ }
+
+ public void buildHeader(Message message, GrainSerConfRequest request) {
+
+ String hexCompanyId = BytesUtil.getTargetId(request.getCompanyId(),true);
+ hexCompanyId = BytesUtil.tran_LH(hexCompanyId);
+
+ message.setSourceId(hexCompanyId);
+ message.setSendId(hexCompanyId);
+
+ //鍙戦�佺殑蹇呴』鏄師鏉ョ殑缁勭粐缂栫爜
+ String orgId = BytesUtil.tran_LH(BytesUtil.getTargetId(request.getOrgId(),true));
+ message.setCompanyId(orgId);
+
+ message.setTargetId(BytesUtil.tran_LH(BytesUtil.getTargetId(request.getSerId(), true)));
+ message.setMessageType(BytesUtil.tran_LH(ServerUtils.MSG_TYPE_1116));
+ }
+
+
+ public void buildBody(Message message, GrainSerConfRequest request) {
+ MessageBody body = new MessageBody();
+ StringBuffer content = new StringBuffer();
+ content.append("01");//鍐欐爣璁�
+ content.append(message.getTargetId());
+ content.append(BytesUtil.getTargetId("01",false));//缃戠粶ID
+ content.append("0A");//榛樿10 淇￠亾
+ content.append(BytesUtil.getTargetId("03",false));//閫熺巼
+ content.append(BytesUtil.toHexString(request.getCableZ()));
+ content.append(BytesUtil.toHexString(request.getCableY()));
+ content.append(BytesUtil.toHexString(request.getCableX()));
+ content.append(BytesUtil.getTargetId(request.getCableFormat(),false));
+ content.append(BytesUtil.getTargetId(request.getCableType(),false));
+
+ if(StringUtils.isEmpty(request.getPowerModel())){
+ request.setPowerModel("02");
+ }
+ content.append(BytesUtil.getTargetId(request.getPowerModel(),false));
+
+ content.append(message.getSourceId());
+
+ body.setContent(content.toString());
+ body.setLength(14);
+ message.setBody(body);
+ }
+
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1122.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1122.java
new file mode 100644
index 0000000..22ed886
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1122.java
@@ -0,0 +1,46 @@
+package com.ld.igds.protocol.zldz.command.builder;
+
+import com.ld.igds.io.request.BaseRequest;
+import com.ld.igds.protocol.zldz.command.message.Message;
+import com.ld.igds.protocol.zldz.command.message.MessageBody;
+import com.ld.igds.protocol.zldz.util.ServerUtils;
+import com.ld.igds.util.BytesUtil;
+
+/**
+ * 鍒濆鍖栫數缂嗙數缂�
+ *
+ * @author Andy
+ */
+public class CommandBuilder1122 extends CommandBuilder {
+
+ private final static CommandBuilder1122 instance = new CommandBuilder1122();
+
+ private CommandBuilder1122() {
+
+ }
+
+ public static CommandBuilder1122 getInstance() {
+ return instance;
+ }
+
+ public void buildHeader(Message message, BaseRequest request) {
+
+ String hexCompanyId = BytesUtil.getTargetId(request.getCompanyId(),true);
+ hexCompanyId = BytesUtil.tran_LH(hexCompanyId);
+
+ message.setSourceId(hexCompanyId);
+ message.setSendId(hexCompanyId);
+ message.setCompanyId(hexCompanyId);
+
+ message.setTargetId(BytesUtil.tran_LH(BytesUtil.getTargetId(request.getSerId(), true)));
+ message.setMessageType(BytesUtil.tran_LH(ServerUtils.MSG_TYPE_1122));
+ }
+
+ public void buildBody(Message message, BaseRequest request) {
+ MessageBody body = new MessageBody();
+ body.setContent("01");
+ body.setLength(1);
+ message.setBody(body);
+ }
+
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1123.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1123.java
new file mode 100644
index 0000000..2991602
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1123.java
@@ -0,0 +1,65 @@
+package com.ld.igds.protocol.zldz.command.builder;
+
+import com.ld.igds.io.request.GrainSerConfRequest;
+import com.ld.igds.protocol.zldz.command.message.Message;
+import com.ld.igds.protocol.zldz.util.ServerUtils;
+import com.ld.igds.util.BytesUtil;
+
+/**
+ * 绮儏鍒嗘満-鐢电紗姹囨��
+ *
+ * @author Andy
+ */
+public class CommandBuilder1123 extends CommandBuilder {
+
+ private final static CommandBuilder1123 instance = new CommandBuilder1123();
+
+ private CommandBuilder1123() {
+
+ }
+
+ public static CommandBuilder1123 getInstance() {
+ return instance;
+ }
+
+ public Message buildMessage(GrainSerConfRequest request) {
+
+ Message message = new Message();
+
+ message.setBegin(ServerUtils.MSG_START);
+
+ // 璋冩暣Message澶撮儴淇℃伅
+ buildHeader(message, request);
+
+ // 鍖呭ご鏍￠獙
+ buildCrc8(message);
+
+ // 鍒涘缓娑堟伅浣�
+ buildBody(message, request);
+
+ // 娣诲姞鏍￠獙
+ buildCrc16(message);
+
+ message.setEnd(ServerUtils.MSG_END);
+
+ // 鐢熸垚鏁翠綋鍛戒护淇℃伅鍜孊Yte淇℃伅
+ build(message);
+
+ return message;
+ }
+
+ public void buildHeader(Message message, GrainSerConfRequest request) {
+ String hexCompanyId = BytesUtil.getTargetId(request.getCompanyId(),
+ true);
+ hexCompanyId = BytesUtil.tran_LH(hexCompanyId);
+
+ message.setSourceId(hexCompanyId);
+ message.setSendId(hexCompanyId);
+ message.setCompanyId(hexCompanyId);
+
+ message.setTargetId(BytesUtil.tran_LH(BytesUtil.getTargetId(
+ request.getSerId(), true)));
+
+ message.setMessageType(BytesUtil.tran_LH(ServerUtils.MSG_TYPE_1123));
+ }
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1125.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1125.java
new file mode 100644
index 0000000..0344230
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1125.java
@@ -0,0 +1,73 @@
+package com.ld.igds.protocol.zldz.command.builder;
+
+import com.ld.igds.io.request.GrainSerConfRequest;
+import com.ld.igds.protocol.zldz.command.message.Message;
+import com.ld.igds.protocol.zldz.command.message.MessageBody;
+import com.ld.igds.protocol.zldz.util.ServerUtils;
+import com.ld.igds.util.BytesUtil;
+
+/**
+ * 绮儏鍒嗘満-鐢电紗妫�娴�
+ *
+ * @author Andy
+ */
+public class CommandBuilder1125 extends CommandBuilder {
+
+ private final static CommandBuilder1125 instance = new CommandBuilder1125();
+
+ private CommandBuilder1125() {
+
+ }
+
+ public static CommandBuilder1125 getInstance() {
+ return instance;
+ }
+
+ public Message buildMessage(GrainSerConfRequest request) {
+
+ Message message = new Message();
+
+ message.setBegin(ServerUtils.MSG_START);
+
+ // 璋冩暣Message澶撮儴淇℃伅
+ buildHeader(message, request);
+
+ // 鍖呭ご鏍￠獙
+ buildCrc8(message);
+
+ // 鍒涘缓娑堟伅浣�
+ buildBody(message, request);
+
+ // 娣诲姞鏍￠獙
+ buildCrc16(message);
+
+ message.setEnd(ServerUtils.MSG_END);
+
+ // 鐢熸垚鏁翠綋鍛戒护淇℃伅鍜孊Yte淇℃伅
+ build(message);
+
+ return message;
+ }
+
+ public void buildHeader(Message message, GrainSerConfRequest request) {
+ String hexCompanyId = BytesUtil.getTargetId(request.getCompanyId(),
+ true);
+ hexCompanyId = BytesUtil.tran_LH(hexCompanyId);
+
+ message.setSourceId(hexCompanyId);
+ message.setSendId(hexCompanyId);
+ message.setCompanyId(hexCompanyId);
+
+ message.setTargetId(BytesUtil.tran_LH(BytesUtil.getTargetId(
+ request.getSerId(), true)));
+ message.setMessageType(BytesUtil.tran_LH(ServerUtils.MSG_TYPE_1125));
+ }
+
+ public void buildBody(Message message, GrainSerConfRequest request) {
+ MessageBody body = new MessageBody();
+ body.setLength(1);
+ body.setContent(BytesUtil.toHexString(request.getPassCode()));
+ message.setBody(body);
+ }
+
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1126.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1126.java
new file mode 100644
index 0000000..13a1ed3
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1126.java
@@ -0,0 +1,100 @@
+package com.ld.igds.protocol.zldz.command.builder;
+
+import com.ld.igds.io.request.GrainSerConfRequest;
+import com.ld.igds.protocol.zldz.command.message.Message;
+import com.ld.igds.protocol.zldz.command.message.MessageBody;
+import com.ld.igds.protocol.zldz.util.ServerUtils;
+import com.ld.igds.util.BytesUtil;
+
+/**
+ * 绮儏鍒嗘満-淇敼閫氶亾鐢电紗
+ *
+ * @author Andy
+ */
+public class CommandBuilder1126 extends CommandBuilder {
+
+ private final static CommandBuilder1126 instance = new CommandBuilder1126();
+
+ private CommandBuilder1126() {
+
+ }
+
+ public static CommandBuilder1126 getInstance() {
+ return instance;
+ }
+
+ public Message buildMessage(GrainSerConfRequest request) {
+
+ Message message = new Message();
+
+ message.setBegin(ServerUtils.MSG_START);
+
+ // 璋冩暣Message澶撮儴淇℃伅
+ buildHeader(message, request);
+
+ // 鍖呭ご鏍￠獙
+ buildCrc8(message);
+
+ // 鍒涘缓娑堟伅浣�
+ buildBody(message, request);
+
+ // 娣诲姞鏍￠獙
+ buildCrc16(message);
+
+ message.setEnd(ServerUtils.MSG_END);
+
+ // 鐢熸垚鏁翠綋鍛戒护淇℃伅鍜孊Yte淇℃伅
+ build(message);
+
+ return message;
+ }
+
+ public void buildHeader(Message message, GrainSerConfRequest request) {
+ String hexCompanyId = BytesUtil.getTargetId(request.getCompanyId(),
+ true);
+ hexCompanyId = BytesUtil.tran_LH(hexCompanyId);
+
+ message.setSourceId(hexCompanyId);
+ message.setSendId(hexCompanyId);
+ message.setCompanyId(hexCompanyId);
+
+ message.setTargetId(BytesUtil.tran_LH(BytesUtil.getTargetId(
+ request.getSerId(), true)));
+ message.setMessageType(BytesUtil.tran_LH(ServerUtils.MSG_TYPE_1126));
+ }
+
+ public void buildBody(Message message, GrainSerConfRequest request) {
+ MessageBody body = new MessageBody();
+ body.setLength(5);
+ StringBuilder bodyStr = new StringBuilder();
+ // 淇敼鏍囪瘑
+ bodyStr.append(BytesUtil.toHexString(request.getEditTag()));
+ // 閫氶亾鍙�
+ bodyStr.append(BytesUtil.toHexString(request.getPassCode()));
+ // 鍒楀彿
+ bodyStr.append(BytesUtil.toHexString(request.getEditCol()));
+
+ // 鐐瑰簭鍙�/鍘熸牴鍙�/璧峰鏍瑰彿/鏍瑰簭鍙�
+ // 鏂扮偣鍙�/鏂版牴鍙�/鐢电紗灞傛暟/鏂版牴鍙�
+ if (6 == request.getEditTag()) {
+ bodyStr.append(BytesUtil.toHexString(request.getValue1()));
+ bodyStr.append(BytesUtil.toHexString(request.getValue2()));
+ } else if (5 == request.getEditTag()) {
+ bodyStr.append(BytesUtil.toHexString(request.getValue1()));
+ bodyStr.append(BytesUtil.toHexString(request.getValue2()));
+ } else if (4 == request.getEditTag()) {
+ bodyStr.append(BytesUtil.toHexString(request.getValue1()));
+ bodyStr.append(BytesUtil.toHexString(request.getValue2()));
+ } else if (2 == request.getEditTag()) {
+ bodyStr.append(BytesUtil.toHexString(request.getValue1()));
+ bodyStr.append(BytesUtil.toHexString(request.getValue2()));
+ } else {
+ bodyStr.append("00");
+ bodyStr.append("00");
+ }
+
+ body.setContent(bodyStr.toString());
+ message.setBody(body);
+ }
+
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1128.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1128.java
new file mode 100644
index 0000000..0f0af60
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder1128.java
@@ -0,0 +1,74 @@
+package com.ld.igds.protocol.zldz.command.builder;
+
+import com.ld.igds.io.request.CheckThRequest;
+import com.ld.igds.protocol.zldz.command.message.Message;
+import com.ld.igds.protocol.zldz.command.message.MessageBody;
+import com.ld.igds.protocol.zldz.util.ServerUtils;
+import com.ld.igds.util.BytesUtil;
+
+
+/**
+ * 浠撴俯浠撴箍鍛戒护
+ *
+ * @author Andy
+ */
+public class CommandBuilder1128 extends CommandBuilder {
+
+
+ private final static CommandBuilder1128 instance = new CommandBuilder1128();
+
+ private CommandBuilder1128() {
+
+ }
+
+ public static CommandBuilder1128 getInstance() {
+ return instance;
+ }
+
+ public Message buildMessage(CheckThRequest request) {
+
+ Message message = new Message();
+
+ message.setBegin(ServerUtils.MSG_START);
+
+ // 璋冩暣Message澶撮儴淇℃伅
+ buildHeader(message, request);
+
+ //鍖呭ご鏍￠獙
+ buildCrc8(message);
+
+ // 鍒涘缓娑堟伅浣�
+ buildBody(message, request);
+
+ // 娣诲姞鏍￠獙
+ buildCrc16(message);
+
+ message.setEnd(ServerUtils.MSG_END);
+
+ // 鐢熸垚鏁翠綋鍛戒护淇℃伅鍜孊Yte淇℃伅
+ build(message);
+
+ return message;
+ }
+
+ public void buildHeader(Message message, CheckThRequest request) {
+ String hexCompanyId = BytesUtil.getTargetId(request.getCompanyId(), true);
+ hexCompanyId = BytesUtil.tran_LH(hexCompanyId);
+
+ message.setSourceId(hexCompanyId);
+ message.setSendId(hexCompanyId);
+ message.setCompanyId(hexCompanyId);
+
+ message.setTargetId(BytesUtil.tran_LH(BytesUtil.getTargetId(request.getSerId(), true)));
+ message.setMessageType(BytesUtil.tran_LH(ServerUtils.MSG_TYPE_1128));
+ }
+
+
+ public void buildBody(Message message, CheckThRequest request) {
+ MessageBody body = new MessageBody();
+ body.setLength(2);
+ body.setContent(BytesUtil.tran_LH(BytesUtil.getTargetId(request.getThConf(), true)));
+ message.setBody(body);
+ }
+
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder8815.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder8815.java
new file mode 100644
index 0000000..cc4d84f
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder8815.java
@@ -0,0 +1,41 @@
+package com.ld.igds.protocol.zldz.command.builder;
+
+import com.ld.igds.io.request.BaseRequest;
+import com.ld.igds.protocol.zldz.command.message.Message;
+import com.ld.igds.protocol.zldz.util.ServerUtils;
+import com.ld.igds.util.BytesUtil;
+
+
+/**
+ * 绮儏淇℃伅鍛戒护
+ *
+ * @author Andy
+ */
+public class CommandBuilder8815 extends CommandBuilder {
+
+
+ private final static CommandBuilder8815 instance = new CommandBuilder8815();
+
+ private CommandBuilder8815() {
+
+ }
+
+ public static CommandBuilder8815 getInstance() {
+ return instance;
+ }
+
+
+ public void buildHeader(Message message, BaseRequest request) {
+ String hexCompanyId = BytesUtil.getTargetId(request.getCompanyId(),true);
+ hexCompanyId = BytesUtil.tran_LH(hexCompanyId);
+
+ message.setSourceId(hexCompanyId);
+ message.setSendId(hexCompanyId);
+ message.setCompanyId(hexCompanyId);
+
+ message.setTargetId(BytesUtil.tran_LH(BytesUtil.getTargetId(request.getSerId(), true)));
+
+ message.setMessageType(BytesUtil.tran_LH(ServerUtils.MSG_TYPE_8815));
+ }
+
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder8817.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder8817.java
new file mode 100644
index 0000000..8185e2e
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder8817.java
@@ -0,0 +1,54 @@
+package com.ld.igds.protocol.zldz.command.builder;
+
+import com.ld.igds.io.request.BaseRequest;
+import com.ld.igds.protocol.zldz.command.message.Message;
+import com.ld.igds.protocol.zldz.command.message.MessageBody;
+import com.ld.igds.protocol.zldz.util.ServerUtils;
+import com.ld.igds.util.BytesUtil;
+
+
+/**
+ * 绮儏淇℃伅鍛戒护
+ *
+ * @author Andy
+ */
+public class CommandBuilder8817 extends CommandBuilder {
+
+
+ private final static CommandBuilder8817 instance = new CommandBuilder8817();
+
+ private CommandBuilder8817() {
+
+ }
+
+ public static CommandBuilder8817 getInstance() {
+ return instance;
+ }
+
+
+ public void buildHeader(Message message, BaseRequest request) {
+
+ //request.setCompanyId("1");
+
+ String hexCompanyId = BytesUtil.getTargetId(request.getCompanyId(),true);
+ hexCompanyId = BytesUtil.tran_LH(hexCompanyId);
+
+ message.setSourceId(hexCompanyId);
+ message.setSendId(hexCompanyId);
+ message.setCompanyId(hexCompanyId);
+
+ message.setTargetId(BytesUtil.tran_LH(BytesUtil.getTargetId(request.getSerId(), true)));
+
+ message.setMessageType(BytesUtil.tran_LH(ServerUtils.MSG_TYPE_8817));
+ }
+
+
+ public void buildBody(Message message, BaseRequest request) {
+ MessageBody body = new MessageBody();
+ body.setContent(request.getBizType());
+ body.setLength(1);
+ message.setBody(body);
+ }
+
+
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder8829.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder8829.java
new file mode 100644
index 0000000..8364a41
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/CommandBuilder8829.java
@@ -0,0 +1,73 @@
+package com.ld.igds.protocol.zldz.command.builder;
+
+import com.ld.igds.io.request.GrainSerConfRequest;
+import com.ld.igds.protocol.zldz.command.message.Message;
+import com.ld.igds.protocol.zldz.command.message.MessageBody;
+import com.ld.igds.protocol.zldz.util.ServerUtils;
+import com.ld.igds.util.BytesUtil;
+
+/**
+ * 绮儏鍒嗘満-鐢电紗姹囨��
+ *
+ * @author Andy
+ */
+public class CommandBuilder8829 extends CommandBuilder {
+
+ private final static CommandBuilder8829 instance = new CommandBuilder8829();
+
+ private CommandBuilder8829() {
+
+ }
+
+ public static CommandBuilder8829 getInstance() {
+ return instance;
+ }
+
+ public Message buildMessage(GrainSerConfRequest request) {
+
+ Message message = new Message();
+
+ message.setBegin(ServerUtils.MSG_START);
+
+ // 璋冩暣Message澶撮儴淇℃伅
+ buildHeader(message, request);
+
+ // 鍖呭ご鏍￠獙
+ buildCrc8(message);
+
+ // 鍒涘缓娑堟伅浣�
+ buildBody(message, request);
+
+ // 娣诲姞鏍￠獙
+ buildCrc16(message);
+
+ message.setEnd(ServerUtils.MSG_END);
+
+ // 鐢熸垚鏁翠綋鍛戒护淇℃伅鍜孊Yte淇℃伅
+ build(message);
+
+ return message;
+ }
+
+ public void buildHeader(Message message, GrainSerConfRequest request) {
+ String hexCompanyId = BytesUtil.getTargetId(request.getCompanyId(),
+ true);
+ hexCompanyId = BytesUtil.tran_LH(hexCompanyId);
+
+ message.setSourceId(hexCompanyId);
+ message.setSendId(hexCompanyId);
+ message.setCompanyId(hexCompanyId);
+
+ message.setTargetId(BytesUtil.tran_LH(BytesUtil.getTargetId(
+ request.getSerId(), true)));
+
+ message.setMessageType(BytesUtil.tran_LH(ServerUtils.MSG_TYPE_8829));
+ }
+
+ public void buildBody(Message message, GrainSerConfRequest request) {
+ MessageBody body = new MessageBody();
+ body.setLength(1);
+ body.setContent(BytesUtil.toHexString(request.getValue1()));
+ message.setBody(body);
+ }
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/OnLineCommandBuilder.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/OnLineCommandBuilder.java
new file mode 100644
index 0000000..178e7cb
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/builder/OnLineCommandBuilder.java
@@ -0,0 +1,40 @@
+package com.ld.igds.protocol.zldz.command.builder;
+
+import com.ld.igds.io.request.BaseRequest;
+import com.ld.igds.protocol.zldz.command.message.Message;
+import com.ld.igds.protocol.zldz.command.message.MessageBody;
+import com.ld.igds.protocol.zldz.util.ServerUtils;
+import com.ld.igds.util.BytesUtil;
+
+/**
+ *
+ * @author Andy
+ */
+public class OnLineCommandBuilder extends CommandBuilder {
+
+ private final static OnLineCommandBuilder instance = new OnLineCommandBuilder();
+
+ private OnLineCommandBuilder() {
+
+ }
+
+ public static OnLineCommandBuilder getInstance() {
+ return instance;
+ }
+
+ public void buildHeader(Message message, BaseRequest request) {
+ message.setSourceId("0000");
+ message.setSendId("0000");
+ message.setCompanyId("0000");
+ message.setTargetId("FFFF");
+ message.setMessageType(BytesUtil.tran_LH(ServerUtils.MSG_TYPE_1116));
+ }
+
+ public void buildBody(Message message, BaseRequest request) {
+ MessageBody body = new MessageBody();
+ body.setContent("0000000000000000000000000000");
+ body.setLength(14);
+ message.setBody(body);
+ }
+
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/message/Message.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/message/Message.java
new file mode 100644
index 0000000..cc0916a
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/message/Message.java
@@ -0,0 +1,52 @@
+package com.ld.igds.protocol.zldz.command.message;
+
+import lombok.Data;
+
+/**
+ * 瀛楃涓插�煎潎閲囩敤鍗佸叚杩涘埗锛屾柟渚挎牎楠屽拰寮�鍙�
+ */
+@Data
+public class Message {
+
+ private String begin;
+
+ private String sourceId;// 婧� ID
+
+ private String targetId="FFFF";// 鐩爣ID
+
+ private String sendId;//鍙戦�佽�匢D
+
+ private String gateway1 = "0100";//璺敱1
+
+ private String gateway2 = "0000";//璺敱2
+
+ private String messageType;// 娑堟伅绫诲瀷
+
+ private String result ="00";// 澶勭悊缁撴灉
+
+ private String companyId;// 缁勭粐缂栫爜
+
+ private String hexCrc8;//crc8鍖呭ご鏍￠獙
+
+ private MessageBody body;
+
+ private String hexCrc16;//crc16鏍￠獙
+
+ private String end;
+
+ private byte[] byteMsg;// 褰撳墠鍛戒护鐨勫瓧鑺備俊鎭�
+
+ private String strMsg;// 褰撳墠鍛戒护杞崲涓哄瓧绗︿覆鐨勪俊鎭�
+
+ @Override
+ public String toString() {
+ return "Message [sourceId=" + sourceId
+ + ", targetId=" + targetId
+ + ", messageType=" + messageType
+ + ", result=" + result + ", companyId=" + companyId
+ + ", hexCrc8=" + hexCrc8 + ", body=" + body + ", hexCrc16="
+ + hexCrc16 + ", strMsg=" + strMsg + "]";
+ }
+
+
+}
\ No newline at end of file
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/message/MessageBody.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/message/MessageBody.java
new file mode 100644
index 0000000..0e4f961
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/command/message/MessageBody.java
@@ -0,0 +1,13 @@
+package com.ld.igds.protocol.zldz.command.message;
+
+import lombok.Data;
+
+@Data
+public class MessageBody {
+
+ //榛樿10杩涘埗闀垮害
+ private int length = 0;
+
+ //娑堟伅浣撳唴瀹�
+ private String content = "";
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/mq/PublisherControl.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/mq/PublisherControl.java
new file mode 100644
index 0000000..325eb22
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/mq/PublisherControl.java
@@ -0,0 +1,42 @@
+package com.ld.igds.protocol.zldz.mq;
+
+import com.ld.igds.io.constant.ProtocolEnum;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+/**
+ * 鎺у埗缁堢浣滀负鍙戝竷鑰呭彂甯冧俊鎭紝鏈嶅姟绔綔涓鸿闃呰�呰闃咃紝閫氶亾瀹氫箟涓哄綋鍓嶅崗璁紪鐮�
+ */
+@Slf4j
+@Component(PublisherControl.BEAN_ID)
+public class PublisherControl {
+
+ public static final String BEAN_ID = "zldz.redisPublisher";
+
+ @Autowired
+ private RedisTemplate<String, Object> redisTemplate;
+
+
+ /**
+ * 姝ｅ父杩斿洖淇℃伅鑾峰彇
+ *
+ * @param reMessage
+ */
+ public void publishMessage(String reMessage) {
+ redisTemplate.convertAndSend(ProtocolEnum.TCP_ZLDZ_GRAIN_V1.getCode(), reMessage);
+ log.debug("-----------鎶ユ枃淇℃伅瀛樺叆闃熷垪------{}", reMessage);
+ }
+
+ /**
+ * 鐧诲綍淇℃伅鑾峰彇
+ *
+ * @param sessionKey
+ */
+ public void publishLoginMessage(String sessionKey) {
+ redisTemplate.convertAndSend(ProtocolEnum.TCP_ZLDZ_GRAIN_V1.getCode() + "_LOGIN", sessionKey);
+ log.debug("-----------鐧诲綍淇℃伅瀛樺叆闃熷垪------{}", sessionKey);
+ }
+
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/mq/ReceiverServer.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/mq/ReceiverServer.java
new file mode 100644
index 0000000..ab0bed4
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/mq/ReceiverServer.java
@@ -0,0 +1,90 @@
+package com.ld.igds.protocol.zldz.mq;
+
+import com.ld.igds.io.request.BaseRequest;
+import com.ld.igds.protocol.zldz.analysis.AnalysisService;
+import com.ld.igds.protocol.zldz.command.builder.OnLineCommandBuilder;
+import com.ld.igds.protocol.zldz.command.message.Message;
+import com.ld.igds.protocol.zldz.server.ZldzServerEngine;
+import com.ld.igds.protocol.zldz.util.ServerUtils;
+import com.ld.io.api.InvokeResult;
+import com.ld.io.api.IoSession;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.RandomUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.concurrent.CountDownLatch;
+
+/**
+ * 鎶ユ枃鎺ュ彈鍒板悗澶勭悊
+ */
+@Slf4j
+public class ReceiverServer {
+
+ private CountDownLatch latch;
+
+ @Autowired
+ public ReceiverServer(CountDownLatch latch) {
+ this.latch = latch;
+ }
+
+ @Autowired
+ private AnalysisService analysisService;
+
+
+
+
+ public void onMessage(String message) {
+ message = message.replaceAll("\"", "");
+ log.info("-------鑾峰彇闃熷垪淇℃伅---" + message);
+ try {
+ String[] attr = message.split("_");
+ String sessionKey = attr[0];
+ String msg = attr[1];
+ analysisService.analysis2(sessionKey, msg);
+ } catch (Exception e) {
+ latch.countDown();
+ log.error("[姝ｆ潵鐢靛瓙--娑堟伅闃熷垪鏁版嵁澶辫触锛屽け璐ヤ俊鎭�:{}]", e.getMessage(),e);
+ }
+ latch.countDown();
+ }
+
+
+ public void onLoginMessage(String sessionKey) {
+ log.info("-------鑾峰彇鐧诲綍闃熷垪淇℃伅---{}", sessionKey);
+ try {
+ sessionKey = sessionKey.replaceAll("\"", "");
+ String[] attr = sessionKey.split(":");
+ IoSession session = ZldzServerEngine.getSession(attr[0],Integer.valueOf(attr[1]));
+
+ if (null == session) {
+ log.warn("---------------娌℃湁鑾峰彇鍒颁細璇濅俊鎭�-------------{}", sessionKey);
+ latch.countDown();
+ return;
+ }
+
+ long l = RandomUtils.nextInt(1000, 9999);
+ Thread.sleep(l);
+
+ BaseRequest request = new BaseRequest();
+ request.setIp(session.getAddress());
+ request.setPort(session.getPort());
+ request.setCompanyId(ServerUtils.DEFAULT_COMPANY);
+
+ // Step1 鐢熸垚鍦ㄧ嚎娴嬭瘯鍛戒护
+ Message message = OnLineCommandBuilder.getInstance().buildMessage(request);
+ // 鍙戦�佸懡浠�
+ InvokeResult result = session.invoke(message.getByteMsg());
+
+ //濡傛灉鍛戒护鍙戦�佸け璐ワ紝鐩存帴韪㈡帀杩炴帴
+ if (!InvokeResult.SUCCESS.getCode().equals(result.getCode())) {
+ session.destroy();
+ }
+ } catch (Exception e) {
+ latch.countDown();
+ log.error("[姝ｆ潵鐢靛瓙--鐧诲綍娑堟伅闃熷垪鏁版嵁澶辫触锛屽け璐ヤ俊鎭�:{}]", e.getMessage());
+ }
+ latch.countDown();
+ }
+
+
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/mq/RedisSubConfig.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/mq/RedisSubConfig.java
new file mode 100644
index 0000000..f71aedd
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/mq/RedisSubConfig.java
@@ -0,0 +1,75 @@
+package com.ld.igds.protocol.zldz.mq;
+
+import com.ld.igds.io.constant.ProtocolEnum;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.listener.PatternTopic;
+import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+import org.springframework.data.redis.listener.adapter.MessageListenerAdapter;
+
+import java.util.concurrent.CountDownLatch;
+
+/**
+ * 娑堟伅璁㈤槄閰嶇疆
+ */
+@Configuration
+public class RedisSubConfig {
+
+ /**
+ * 鍒涘缓杩炴帴宸ュ巶
+ *
+ * @param connectionFactory
+ * @return
+ */
+ @Bean
+ public RedisMessageListenerContainer container(RedisConnectionFactory connectionFactory,
+ MessageListenerAdapter adapter1,
+ MessageListenerAdapter adapter2) {
+ RedisMessageListenerContainer container = new RedisMessageListenerContainer();
+ container.setConnectionFactory(connectionFactory);
+
+ //鐩戝惉瀵瑰簲鐨刢hannel
+ container.addMessageListener(adapter1, new PatternTopic(ProtocolEnum.TCP_ZLDZ_GRAIN_V1.getCode()));
+
+ //鐩戝惉瀵瑰簲鐨刢hannel
+ container.addMessageListener(adapter2, new PatternTopic(ProtocolEnum.TCP_ZLDZ_GRAIN_V1.getCode() + "_LOGIN"));
+
+ return container;
+ }
+
+ /**
+ * 缁戝畾娑堟伅鐩戝惉鑰呭拰鎺ユ敹鐩戝惉鐨勬柟娉�
+ *
+ * @param receiver
+ * @return
+ */
+ @Bean
+ public MessageListenerAdapter adapter1(ReceiverServer receiver) {
+ return new MessageListenerAdapter(receiver, "onMessage");
+ }
+
+ /**
+ * 缁戝畾娑堟伅鐩戝惉鑰呭拰鎺ユ敹鐩戝惉鐨勬柟娉�
+ *
+ * @param receiver
+ * @return
+ */
+ @Bean
+ public MessageListenerAdapter adapter2(ReceiverServer receiver) {
+ return new MessageListenerAdapter(receiver, "onLoginMessage");
+ }
+
+
+ @Bean
+ ReceiverServer receiver(CountDownLatch latch) {
+ return new ReceiverServer(latch);
+ }
+
+
+ @Bean
+ public CountDownLatch latch() {
+ return new CountDownLatch(1);//鎸囧畾浜嗚鏁扮殑娆℃暟 1
+ }
+
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/package-info.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/package-info.java
new file mode 100644
index 0000000..071fa0f
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/package-info.java
@@ -0,0 +1,6 @@
+
+/**
+ * 姝ｆ潵鐢靛瓙-绮儏鍗忚V1
+ *
+ */
+package com.ld.igds.protocol.zldz;
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/server/HeartbeatProviderImpl.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/server/HeartbeatProviderImpl.java
new file mode 100644
index 0000000..4a6e458
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/server/HeartbeatProviderImpl.java
@@ -0,0 +1,45 @@
+package com.ld.igds.protocol.zldz.server;
+
+import com.ld.igds.common.CoreSerService;
+import com.ld.igds.models.DeviceSer;
+import com.ld.igds.util.SpringUtil;
+import com.ld.io.api.HeartbeatProvider;
+import com.ld.io.api.IoSession;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+
+
+/**
+ * 蹇冭烦缁存寔锛岄獙璇佸綋鍓嶈繛鎺ヤ腑鐨処P鍦ㄦ湇鍔″櫒涓婇厤缃殑鏈夋病鏈夛紝濡傛灉鏈夊垯琛ㄧず姝ｅ父杩炴帴锛屽鏋滄病鏈夊垯韪㈤櫎杩炴帴銆�
+ * <p>
+ * 濡傛灉鏈夋甯稿績璺筹紝鍒欏彂閫佹甯稿績璺冲懡浠わ紝濡傛灉娌℃湁鍒欏彂閫佽澶囩姸鎬佹煡璇紝
+ */
+@Slf4j
+public class HeartbeatProviderImpl implements HeartbeatProvider {
+
+ private CoreSerService serService;
+
+ @Override
+ public byte[] provide(IoSession session) {
+
+ log.debug("========绯荤粺寮�濮嬫墽琛屽績璺�=========={}---{}", session.getCompanyId(), session.getBusinessKey());
+
+ if (null == serService) {
+ serService = SpringUtil.getBean(CoreSerService.class);
+ }
+
+ DeviceSer ser = null;
+ String companyId = session.getCompanyId();
+ if (StringUtils.isNotEmpty(companyId)) {
+ ser = serService.getCacheSerByIp(companyId, session.getAddress(), session.getPort());
+ }
+
+ if (null == ser) {
+ log.error("========蹇冭烦鎵ц娌℃湁鑾峰彇鍒板垎鏈轰俊鎭�======IP={}-{}锛屽彇娑堣涪鍑猴紝鍙仛鏃ュ織鎻愰啋銆�", session.getAddress(), session.getPort());
+ session.destroy();
+ return null;
+ }
+ return null;
+ }
+
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/server/MsgConsumer.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/server/MsgConsumer.java
new file mode 100644
index 0000000..d6d6480
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/server/MsgConsumer.java
@@ -0,0 +1,46 @@
+package com.ld.igds.protocol.zldz.server;
+
+import com.ld.igds.protocol.zldz.mq.PublisherControl;
+import com.ld.igds.protocol.zldz.util.ServerUtils;
+import com.ld.igds.util.BytesUtil;
+import com.ld.igds.util.SpringUtil;
+import com.ld.io.api.IoMsgConsumer;
+import com.ld.io.api.IoSession;
+
+/**
+ * 鎺ユ敹缁堢杩斿洖鍥炴潵鐨勪俊鎭��
+ *
+ * @author Andy
+ */
+public class MsgConsumer implements IoMsgConsumer {
+
+ // private AnalysisService analysisService;
+
+ private PublisherControl publisherControl;
+
+ @Override
+ public void consume(IoSession session, byte[] bytes) {
+
+ // 璋冪敤瑙ｆ瀽鎺ュ彛寮�濮嬭В鏋�
+ // if(null == analysisService){
+ // analysisService = (AnalysisService)
+ // SpringUtil.getBean(AnalysisService.BEAN_ID);
+ // }
+ // analysisService.analysis(session.getAddress(),session.getPort(),bytes);
+
+ // 2021骞�6鏈�9鏃� 璋冩暣涓烘秷鎭槦鍒楀鐞�
+ if (null == publisherControl) {
+ publisherControl = SpringUtil.getBean(PublisherControl.class);
+ }
+
+ String strMsg = BytesUtil.bytesToString(bytes) + ServerUtils.MSG_END;
+
+ // 浜屾璋冩暣鎶ユ枃
+ if (!strMsg.startsWith(ServerUtils.MSG_START)) {
+ strMsg = strMsg.substring(strMsg.indexOf(ServerUtils.MSG_START));
+ }
+
+ publisherControl.publishMessage(session.getBusinessKey() + "_" + strMsg);
+ }
+
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/server/SessionListener.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/server/SessionListener.java
new file mode 100644
index 0000000..c09ec88
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/server/SessionListener.java
@@ -0,0 +1,40 @@
+package com.ld.igds.protocol.zldz.server;
+
+import com.ld.igds.io.notify.ServerNotifyInvoker;
+import com.ld.igds.protocol.zldz.command.BaseRemoteImpl;
+import com.ld.igds.protocol.zldz.mq.PublisherControl;
+import com.ld.igds.protocol.zldz.util.ServerUtils;
+import com.ld.igds.util.SpringUtil;
+import com.ld.io.api.IoSession;
+import com.ld.io.api.IoSessionListener;
+
+public class SessionListener extends BaseRemoteImpl implements IoSessionListener {
+
+ public static final String BEAN_ID = "zldz.sessionListener";
+
+ private ServerNotifyInvoker serverNotifyInvoker;
+
+ private PublisherControl publisherControl;
+
+ @Override
+ public void onCreate(IoSession session) {
+
+ // 娣诲姞鑷畾涔変笟鍔D
+ session.setBusinessKey(ServerUtils.getServerKey(session.getAddress(), session.getPort()));
+
+ //2021骞�6鏈�9鏃� 璋冩暣浣跨敤涓洪槦鍒�
+ if (null == publisherControl) {
+ publisherControl = SpringUtil.getBean(PublisherControl.class);
+ }
+ publisherControl.publishLoginMessage(session.getBusinessKey());
+ }
+
+ @Override
+ public void onDestroy(IoSession session) {
+ if (null == serverNotifyInvoker) {
+ serverNotifyInvoker = SpringUtil.getBean(ServerNotifyInvoker.class);
+ }
+ serverNotifyInvoker.connectDestory(session.getBusinessKey(),
+ session.getAddress(), session.getPort());
+ }
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/server/ZldzServerEngine.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/server/ZldzServerEngine.java
new file mode 100644
index 0000000..0c54762
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/server/ZldzServerEngine.java
@@ -0,0 +1,113 @@
+package com.ld.igds.protocol.zldz.server;
+
+import com.ld.igds.protocol.zldz.util.ServerUtils;
+import com.ld.igds.util.BytesUtil;
+import com.ld.io.api.*;
+import com.ld.io.netty.NettyServer;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+
+/**
+ * 閰嶇疆涓绘湇鍔′俊鎭�
+ *
+ * @author Andy 2019骞�10鏈�4鏃� 鏂板
+ */
+@Slf4j
+public class ZldzServerEngine {
+
+ public static final int PORT = 8000;
+
+ public static NettyServer ioServer = null;
+ // 閰嶇疆娑堟伅鎺ユ敹绫�
+ private static MsgConsumer messageConsume = new MsgConsumer();
+ // 鐩戝惉浼氳瘽鐨勫垱寤轰笌閿�姣�
+ private static SessionListener ioSessionListener = new SessionListener();
+
+ // 蹇冭烦鎻愪緵 锛岃鏈嶅姟涓嶉渶瑕佸績璺崇淮鎸�
+ private static HeartbeatProvider heartbeatProvider = new HeartbeatProviderImpl();
+
+
+ public static void start() {
+ start(PORT);
+ }
+
+ public static void start(int port) {
+ // 閰嶇疆Server鐨勯厤缃�
+ IoServerOption ioServerOption = new IoServerOption(port);
+
+ ioServerOption.setSplitDecoderType(SplitByteDecoderType.DELIMITER_SYMBOL);
+ ioServerOption.setDelimiter(BytesUtil.hexStrToBytes(ServerUtils.MSG_END));
+
+ // 閰嶇疆蹇冭烦鎵ц鏃堕棿
+ ioServerOption.setReaderIdleTime(60 * 60);
+
+ ioServer = new NettyServer(ioServerOption, messageConsume, ioSessionListener, heartbeatProvider);
+
+ ioServer.startup();
+
+ log.info("* ========================");
+ log.info("* ");
+ log.info("* 绾伯鎯呭崗璁紝绔彛鍙�={}", port);
+ log.info("* ");
+ log.info("* ========================");
+
+
+ System.out.println("* ========================");
+ System.out.println("* ");
+ System.out.println("* 绾伯鎯呭崗璁紝绔彛鍙�=" + port);
+ System.out.println("* ");
+ System.out.println("* ========================");
+ }
+
+ /**
+ * 鍙戦�佷俊鎭�
+ *
+ * @param ip
+ * @param port
+ * @param msg
+ * @return
+ */
+ public static InvokeResult push(String ip, int port, byte[] msg) {
+ IoSession session = getSession(ip, port);
+ if (null == session) {
+ return InvokeResult.CHANNEL_CLOSED;
+ }
+ return session.invoke(msg);
+ }
+
+ /**
+ * 涓诲姩閿�姣佸綋鍓嶈繛鎺�
+ *
+ * @param ip
+ * @param port
+ * @return
+ */
+ public static InvokeResult destory(String ip, int port) {
+ IoSession session = getSession(ip, port);
+
+ if (null == session) {
+ return InvokeResult.SUCCESS;
+ }
+ // 鎵ц杩炴帴閿�姣�
+ session.destroy();
+ return InvokeResult.SUCCESS;
+ }
+
+ /**
+ * 鏍规嵁SessionKey鑾峰彇Session淇℃伅
+ *
+ * @param ip
+ * @return
+ */
+ public static IoSession getSession(String ip, int port) {
+ IoSessionQuery sessionFactory = ioServer.getSessionQuery();
+ List<IoSession> sessions = sessionFactory.getAllSession();
+ for (IoSession ioSession : sessions) {
+ if (ip.equals(ioSession.getAddress()) && port == ioSession.getPort()) {
+ return ioSession;
+ }
+ }
+ return null;
+ }
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/task/CommandReSendService.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/task/CommandReSendService.java
new file mode 100644
index 0000000..018f342
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/task/CommandReSendService.java
@@ -0,0 +1,145 @@
+package com.ld.igds.protocol.zldz.task;
+
+import com.ld.igds.io.request.CheckGrainRequest;
+import com.ld.igds.io.request.CheckThRequest;
+import com.ld.igds.protocol.zldz.command.BaseRemoteImpl;
+import com.ld.igds.protocol.zldz.util.ServerUtils;
+import com.ld.igds.util.RedisUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.FutureTask;
+
+/**
+ * 鍛戒护閲嶅彂
+ */
+@Slf4j
+@Component(CommandReSendService.BEAN_ID)
+public class CommandReSendService extends BaseRemoteImpl {
+
+ public static final String BEAN_ID = "zldz.commandReSendService";
+
+ public static final String REDIS_KEY_RESEND_COMMAND = "REDIS_KEY_RESEND_COMMAND";
+
+ public static final String REDIS_KEY_TH_QUEEN = "REDIS_KEY_TH_QUEEN";
+
+ public static final int REDIS_KEY_TIME = 4 * 60;
+
+ @Autowired
+ private RedisUtil redisUtil;
+
+ public String buildKey(CommandTask data) {
+ return buildKey(data.getCompanyId(), data.getIp(), data.getPort(),
+ data.getResultType());
+ }
+
+ public String buildKey(String companyId, String ip, int port,
+ String resultType) {
+ String key = ip + "." + port + ":" + resultType;
+ return companyId + ":" + REDIS_KEY_RESEND_COMMAND + ":" + key;
+ }
+
+ public void reSendTask(CommandTask data) {
+ // 缂撳瓨
+ redisUtil.set(buildKey(data), data, REDIS_KEY_TIME);
+
+ // 鍒涘缓瀛愪换鍔�
+ FutureTask<String> futureTask = new FutureTask<>(new ReSendCommonTask(data, redisUtil, buildKey(data)));
+ ExecutorService executorService = Executors.newCachedThreadPool();
+ executorService.submit(futureTask);
+ executorService.shutdown();
+ }
+
+ // 娓╂箍搴﹀懡浠や笉浣跨敤瀛愪换鍔�
+ public void reSendThTask(CommandTask data) {
+ // 缂撳瓨
+ redisUtil.set(buildKey(data), data, REDIS_KEY_TIME);
+ }
+
+ public void reSendGrainTask(CommandTask data) {
+ // 缂撳瓨
+ redisUtil.set(buildKey(data), data, REDIS_KEY_TIME);
+
+ // 鍒涘缓瀛愪换鍔�
+ FutureTask<String> futureTask = new FutureTask<>(new ReSendGrainTask(
+ data, redisUtil, buildKey(data)));
+ ExecutorService executorService = Executors.newCachedThreadPool();
+ executorService.submit(futureTask);
+ executorService.shutdown();
+ }
+
+ public void cleanKey(String companyId, String ip, int port,
+ String resultType) {
+
+ String key = buildKey(companyId, ip, port, resultType);
+ redisUtil.del(key);
+ }
+
+ public void destoryAndDelCache(String companyId, String ip, Integer port,
+ String messageType) {
+ try {
+ // 绮儏鐩存帴浣跨敤鏈�鎬荤殑鐘舵�佽繑鍥�
+ if (messageType.equals(ServerUtils.MSG_TYPE_1115)) {
+ messageType = ServerUtils.MSG_TYPE_8817;
+ }
+ this.cleanKey(companyId, ip, port, messageType);
+
+ //闂撮殧5S韪㈠嚭锛岄伩鍏嶅揩閫熺洿鎺ヨ繛鎺�
+ Thread.sleep(5 * 1000);
+
+ super.destory(ip, port);
+
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
+ public void reSend(String companyId, String ip, int port, String resultType) {
+ String key = buildKey(companyId, ip, port, resultType);
+ CommandTask commandData = (CommandTask) redisUtil.get(key);
+ if (null != commandData) {
+ super.send(ip, port, commandData.getByteCommand());
+ } else {
+ log.error("鍛戒护閲嶅彂澶辫触锛歿}-{}-{}娌℃湁鑾峰彇鍒板懡浠ゃ��", ip, port, resultType);
+ }
+ }
+
+ public CommandTask getRedisCommand(String companyId, String ip,
+ Integer port, String resultType) {
+ String key = this.buildKey(companyId, ip, port, resultType);
+ return (CommandTask) redisUtil.get(key);
+ }
+
+ /**
+ * 褰撳墠鍒嗘満鐩稿悓绮儏鍒嗘満鐨勭瓑寰呴槦鍒�
+ *
+ * @param thRequest
+ * @param request
+ */
+ public void addToThQueen(CheckThRequest thRequest, CheckGrainRequest request) {
+ String key = thRequest.getCompanyId() + ":" + REDIS_KEY_TH_QUEEN + ":"
+ + thRequest.getSerId();
+
+ List<CheckGrainRequest> list = this.getThQueen(
+ thRequest.getCompanyId(), thRequest.getSerId());
+ if (null == list) {
+ list = new ArrayList<>();
+ }
+
+ list.add(request);
+
+ redisUtil.set(key, list, 60);
+ }
+
+ @SuppressWarnings("unchecked")
+ public List<CheckGrainRequest> getThQueen(String companyId, String serId) {
+ String key = companyId + ":" + REDIS_KEY_TH_QUEEN + ":" + serId;
+ return (List<CheckGrainRequest>) redisUtil.get(key);
+ }
+
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/task/CommandTask.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/task/CommandTask.java
new file mode 100644
index 0000000..b2545e5
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/task/CommandTask.java
@@ -0,0 +1,31 @@
+package com.ld.igds.protocol.zldz.task;
+
+import lombok.Data;
+
+/**
+ * 鐢ㄤ簬瀛樻斁鍙戦�佺殑鍛戒护淇℃伅锛屽瓨鏀惧埌缂撳瓨涓�
+ */
+@Data
+public class CommandTask {
+
+ private String companyId;
+
+ private String depotId;//鎵ц浠撳簱
+
+ private String serName;
+
+ private String ip = "";
+
+ private int port = 0;
+
+ private String command; //鍙戦�佺殑鍛戒护
+
+ private byte[] byteCommand; //鍙戦�佺殑鍛戒护
+
+ private String resultType;//绛夊緟杩斿洖鐨勫懡浠ょ被鍨�
+
+ private int sendNum = 1;//鍙戦�佹鏁�
+
+ private String cableRule;
+
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/task/ReSendCommonTask.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/task/ReSendCommonTask.java
new file mode 100644
index 0000000..974e882
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/task/ReSendCommonTask.java
@@ -0,0 +1,95 @@
+package com.ld.igds.protocol.zldz.task;
+
+import com.ld.igds.protocol.zldz.command.BaseRemoteImpl;
+import com.ld.igds.util.RedisUtil;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.concurrent.Callable;
+
+/**
+ * 瀛愪换鍔★紝鐢ㄤ簬鍒ゆ柇閲嶅彂鍜屽紓甯稿鐞嗭紝鍛戒护鍙戦�佸悗灏嗗懡浠や俊鎭瓨鏀剧紦瀛橈紝褰撳墠
+ *
+ * @author andy.jia
+ */
+@Slf4j
+public class ReSendCommonTask extends BaseRemoteImpl implements Callable<String> {
+
+ private CommandTask commandData;
+
+ private RedisUtil redisUtil;
+
+ private String redisKey;
+
+ public RedisUtil getRedisUtil() {
+ return redisUtil;
+ }
+
+ public void setRedisUtil(RedisUtil redisUtil) {
+ this.redisUtil = redisUtil;
+ }
+
+ public String getRedisKey() {
+ return redisKey;
+ }
+
+ public void setRedisKey(String redisKey) {
+ this.redisKey = redisKey;
+ }
+
+ public void setCommandData(CommandTask commandData) {
+ this.commandData = commandData;
+ }
+
+ public CommandTask getCommandData() {
+ return commandData;
+ }
+
+ public ReSendCommonTask() {
+ super();
+ }
+
+ public ReSendCommonTask(CommandTask commandData, RedisUtil redisUtil, String redisKey) {
+ super();
+ this.commandData = commandData;
+ this.redisUtil = redisUtil;
+ this.redisKey = redisKey;
+ }
+
+ @Override
+ public String call() throws Exception {
+
+ //1,鑾峰彇缂撳瓨涓俊鎭�
+ Thread.sleep(15 * 1000);
+
+ CommandTask redisData = (CommandTask) redisUtil.get(redisKey);
+ if (null == redisData) {
+ return "鍛戒护绗�1娆＄瓑寰咃紝缁堢宸茬粡姝ｅ父杩斿洖";
+ } else {
+ log.info("{}-绗�1娆″懡浠よˉ鍙戝懡浠�={}", commandData.getIp(), commandData.getCommand());
+ super.send(commandData.getIp(), commandData.getPort(), commandData.getByteCommand());
+ }
+
+ //2锛岀瓑寰�20S
+ Thread.sleep(15 * 1000);
+ redisData = (CommandTask) redisUtil.get(redisKey);
+ if (null == redisData) {
+ return "鍛戒护绗�2娆＄瓑绛夛紝缁堢宸茬粡姝ｅ父杩斿洖";
+ } else {
+ log.info("{}-绗�2娆″懡浠よˉ鍛戒护={}", commandData.getIp(), commandData.getCommand());
+ super.send(commandData.getIp(), commandData.getPort(), commandData.getByteCommand());
+ }
+
+ //2锛岀瓑寰�20S
+ Thread.sleep(15 * 1000);
+ redisData = (CommandTask) redisUtil.get(redisKey);
+ if (null == redisData) {
+ return "鍛戒护绗�3娆＄瓑绛夛紝缁堢宸茬粡姝ｅ父杩斿洖";
+ } else {
+ log.info("{}-绗�3娆″懡浠よˉ鍙戝悗锛屼粛鐒舵病鏈夎繑鍥烇紝鍙栨秷绛夊緟銆�", commandData.getIp());
+ //super.destory(commandData.getIp(), commandData.getPort());
+ }
+
+ return "瀛愪换鍔℃墽琛屽畬鎴�";
+ }
+
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/task/ReSendGrainTask.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/task/ReSendGrainTask.java
new file mode 100644
index 0000000..accb15f
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/task/ReSendGrainTask.java
@@ -0,0 +1,99 @@
+package com.ld.igds.protocol.zldz.task;
+
+import com.ld.igds.protocol.zldz.command.BaseRemoteImpl;
+import com.ld.igds.util.RedisUtil;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.concurrent.Callable;
+
+/**
+ * 绮儏瀛愪换鍔★紝绮儏瀛愪换鍔★紝蹇界暐8815鐨勫洖澶嶅拰8817鐨勫洖澶嶏紝鐩存帴绛夌粨鏋滃寘鐨勫埌杈撅紝濡傛灉缁撴灉鍖呮病鏈夊埌杈撅紝灏遍噸澶嶅彂閫佺伯鎯呰姹�
+ *
+ * @author andy.jia
+ */
+@Slf4j
+public class ReSendGrainTask extends BaseRemoteImpl implements Callable<String> {
+
+ private CommandTask commandData;
+
+ private RedisUtil redisUtil;
+
+ private String redisKey;
+
+ public RedisUtil getRedisUtil() {
+ return redisUtil;
+ }
+
+ public void setRedisUtil(RedisUtil redisUtil) {
+ this.redisUtil = redisUtil;
+ }
+
+ public String getRedisKey() {
+ return redisKey;
+ }
+
+ public void setRedisKey(String redisKey) {
+ this.redisKey = redisKey;
+ }
+
+ public void setCommandData(CommandTask commandData) {
+ this.commandData = commandData;
+ }
+
+ public CommandTask getCommandData() {
+ return commandData;
+ }
+
+ public ReSendGrainTask() {
+ super();
+ }
+
+ public ReSendGrainTask(CommandTask commandData, RedisUtil redisUtil, String redisKey) {
+ super();
+ this.commandData = commandData;
+ this.redisUtil = redisUtil;
+ this.redisKey = redisKey;
+ }
+
+ @Override
+ public String call() throws Exception {
+
+ String[] attCable = commandData.getCableRule().split("-");
+ int cableZ = Integer.valueOf(attCable[0]);
+ int cableY = Integer.valueOf(attCable[1]);
+ int cableX = Integer.valueOf(attCable[2]);
+
+ int point = cableX * cableY * cableZ;
+ long time = point * 100 + (point / 100) * 500;
+
+ //1,绮儏绗�1娆＄瓑寰呮椂闂翠负閲囬泦鐐逛釜鏁�* 0.1 绉� + 20绉掞紝濡傛灉娌℃湁姝ｅ父杩斿洖鍒欏彂閫佺浜屾鍛戒护銆�
+ Thread.sleep(time);
+ CommandTask redisData = (CommandTask) redisUtil.get(redisKey);
+ if (null == redisData) {
+ return "鍛戒护绗�1娆＄瓑寰咃紝缁堢宸茬粡姝ｅ父杩斿洖";
+ } else {
+ String msg = commandData.getSerName() + " 绗�1娆¤ˉ鍙戝懡浠�=" + commandData.getCommand();
+ log.info(msg);
+
+ super.send(commandData.getIp(), commandData.getPort(), commandData.getByteCommand());
+ }
+
+ //2
+ Thread.sleep(time);
+ redisData = (CommandTask) redisUtil.get(redisKey);
+ if (null == redisData) {
+ return "鍛戒护绗�2娆＄瓑绛夛紝缁堢宸茬粡姝ｅ父杩斿洖";
+ } else {
+ String msg = commandData.getSerName() + " 绗�2娆¤ˉ鍙戠伯鎯呭懡浠わ紝娌℃湁杩斿洖锛岀郴缁熸柇寮�褰撳墠杩炴帴銆�";
+ log.info(msg);
+
+// ExeOrderService orderService = SpringUtil.getBean(ExeOrderService.class);
+// orderService.progressError(commandData.getCompanyId(), BizType.GRAIN, commandData.getDepotId(), msg);
+
+ //2021骞�6鏈�5鏃� 07:30:22 鍙栨秷瓒呮椂韪㈠嚭杩炴帴
+ // super.destory(commandData.getIp(), commandData.getPort());
+ }
+ return "瀛愪换鍔℃墽琛屽畬鎴�";
+ }
+
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/util/CRC16.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/util/CRC16.java
new file mode 100644
index 0000000..3492e68
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/util/CRC16.java
@@ -0,0 +1,135 @@
+package com.ld.igds.protocol.zldz.util;
+
+/***
+ *
+ * @author Andy
+ *
+ */
+public class CRC16 {
+
+ static byte[] crc16_tab_h = { (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
+ (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
+ (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
+ (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
+ (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
+ (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
+ (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
+ (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
+ (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
+ (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
+ (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
+ (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
+ (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
+ (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
+ (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
+ (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
+ (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
+ (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
+ (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
+ (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
+ (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
+ (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
+ (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
+ (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
+ (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
+ (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
+ (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
+ (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
+ (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
+ (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
+ (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
+ (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
+ (byte) 0x81, (byte) 0x40 };
+
+ static byte[] crc16_tab_l = { (byte) 0x00, (byte) 0xC0, (byte) 0xC1, (byte) 0x01, (byte) 0xC3, (byte) 0x03,
+ (byte) 0x02, (byte) 0xC2, (byte) 0xC6, (byte) 0x06, (byte) 0x07, (byte) 0xC7, (byte) 0x05, (byte) 0xC5,
+ (byte) 0xC4, (byte) 0x04, (byte) 0xCC, (byte) 0x0C, (byte) 0x0D, (byte) 0xCD, (byte) 0x0F, (byte) 0xCF,
+ (byte) 0xCE, (byte) 0x0E, (byte) 0x0A, (byte) 0xCA, (byte) 0xCB, (byte) 0x0B, (byte) 0xC9, (byte) 0x09,
+ (byte) 0x08, (byte) 0xC8, (byte) 0xD8, (byte) 0x18, (byte) 0x19, (byte) 0xD9, (byte) 0x1B, (byte) 0xDB,
+ (byte) 0xDA, (byte) 0x1A, (byte) 0x1E, (byte) 0xDE, (byte) 0xDF, (byte) 0x1F, (byte) 0xDD, (byte) 0x1D,
+ (byte) 0x1C, (byte) 0xDC, (byte) 0x14, (byte) 0xD4, (byte) 0xD5, (byte) 0x15, (byte) 0xD7, (byte) 0x17,
+ (byte) 0x16, (byte) 0xD6, (byte) 0xD2, (byte) 0x12, (byte) 0x13, (byte) 0xD3, (byte) 0x11, (byte) 0xD1,
+ (byte) 0xD0, (byte) 0x10, (byte) 0xF0, (byte) 0x30, (byte) 0x31, (byte) 0xF1, (byte) 0x33, (byte) 0xF3,
+ (byte) 0xF2, (byte) 0x32, (byte) 0x36, (byte) 0xF6, (byte) 0xF7, (byte) 0x37, (byte) 0xF5, (byte) 0x35,
+ (byte) 0x34, (byte) 0xF4, (byte) 0x3C, (byte) 0xFC, (byte) 0xFD, (byte) 0x3D, (byte) 0xFF, (byte) 0x3F,
+ (byte) 0x3E, (byte) 0xFE, (byte) 0xFA, (byte) 0x3A, (byte) 0x3B, (byte) 0xFB, (byte) 0x39, (byte) 0xF9,
+ (byte) 0xF8, (byte) 0x38, (byte) 0x28, (byte) 0xE8, (byte) 0xE9, (byte) 0x29, (byte) 0xEB, (byte) 0x2B,
+ (byte) 0x2A, (byte) 0xEA, (byte) 0xEE, (byte) 0x2E, (byte) 0x2F, (byte) 0xEF, (byte) 0x2D, (byte) 0xED,
+ (byte) 0xEC, (byte) 0x2C, (byte) 0xE4, (byte) 0x24, (byte) 0x25, (byte) 0xE5, (byte) 0x27, (byte) 0xE7,
+ (byte) 0xE6, (byte) 0x26, (byte) 0x22, (byte) 0xE2, (byte) 0xE3, (byte) 0x23, (byte) 0xE1, (byte) 0x21,
+ (byte) 0x20, (byte) 0xE0, (byte) 0xA0, (byte) 0x60, (byte) 0x61, (byte) 0xA1, (byte) 0x63, (byte) 0xA3,
+ (byte) 0xA2, (byte) 0x62, (byte) 0x66, (byte) 0xA6, (byte) 0xA7, (byte) 0x67, (byte) 0xA5, (byte) 0x65,
+ (byte) 0x64, (byte) 0xA4, (byte) 0x6C, (byte) 0xAC, (byte) 0xAD, (byte) 0x6D, (byte) 0xAF, (byte) 0x6F,
+ (byte) 0x6E, (byte) 0xAE, (byte) 0xAA, (byte) 0x6A, (byte) 0x6B, (byte) 0xAB, (byte) 0x69, (byte) 0xA9,
+ (byte) 0xA8, (byte) 0x68, (byte) 0x78, (byte) 0xB8, (byte) 0xB9, (byte) 0x79, (byte) 0xBB, (byte) 0x7B,
+ (byte) 0x7A, (byte) 0xBA, (byte) 0xBE, (byte) 0x7E, (byte) 0x7F, (byte) 0xBF, (byte) 0x7D, (byte) 0xBD,
+ (byte) 0xBC, (byte) 0x7C, (byte) 0xB4, (byte) 0x74, (byte) 0x75, (byte) 0xB5, (byte) 0x77, (byte) 0xB7,
+ (byte) 0xB6, (byte) 0x76, (byte) 0x72, (byte) 0xB2, (byte) 0xB3, (byte) 0x73, (byte) 0xB1, (byte) 0x71,
+ (byte) 0x70, (byte) 0xB0, (byte) 0x50, (byte) 0x90, (byte) 0x91, (byte) 0x51, (byte) 0x93, (byte) 0x53,
+ (byte) 0x52, (byte) 0x92, (byte) 0x96, (byte) 0x56, (byte) 0x57, (byte) 0x97, (byte) 0x55, (byte) 0x95,
+ (byte) 0x94, (byte) 0x54, (byte) 0x9C, (byte) 0x5C, (byte) 0x5D, (byte) 0x9D, (byte) 0x5F, (byte) 0x9F,
+ (byte) 0x9E, (byte) 0x5E, (byte) 0x5A, (byte) 0x9A, (byte) 0x9B, (byte) 0x5B, (byte) 0x99, (byte) 0x59,
+ (byte) 0x58, (byte) 0x98, (byte) 0x88, (byte) 0x48, (byte) 0x49, (byte) 0x89, (byte) 0x4B, (byte) 0x8B,
+ (byte) 0x8A, (byte) 0x4A, (byte) 0x4E, (byte) 0x8E, (byte) 0x8F, (byte) 0x4F, (byte) 0x8D, (byte) 0x4D,
+ (byte) 0x4C, (byte) 0x8C, (byte) 0x44, (byte) 0x84, (byte) 0x85, (byte) 0x45, (byte) 0x87, (byte) 0x47,
+ (byte) 0x46, (byte) 0x86, (byte) 0x82, (byte) 0x42, (byte) 0x43, (byte) 0x83, (byte) 0x41, (byte) 0x81,
+ (byte) 0x80, (byte) 0x40 };
+
+ /**
+ * 璁＄畻CRC16鏍￠獙
+ *
+ * @param data
+ * 闇�瑕佽绠楃殑鏁扮粍
+ * @return CRC16鏍￠獙鍊�
+ */
+ public static int calcCrc16(byte[] data) {
+ return calcCrc16(data, 0, data.length);
+ }
+
+ /**
+ * 璁＄畻CRC16鏍￠獙
+ *
+ * @param data
+ * 闇�瑕佽绠楃殑鏁扮粍
+ * @param offset
+ * 璧峰浣嶇疆
+ * @param len
+ * 闀垮害
+ * @return CRC16鏍￠獙鍊�
+ */
+ public static int calcCrc16(byte[] data, int offset, int len) {
+ return calcCrc16(data, offset, len, 0xffff);
+ }
+
+ /**
+ * 璁＄畻CRC16鏍￠獙
+ *
+ * @param data
+ * 闇�瑕佽绠楃殑鏁扮粍
+ * @param offset
+ * 璧峰浣嶇疆
+ * @param len
+ * 闀垮害
+ * @param preval
+ * 涔嬪墠鐨勬牎楠屽��
+ * @return CRC16鏍￠獙鍊�
+ */
+ public static int calcCrc16(byte[] data, int offset, int len, int preval) {
+ int ucCRCHi = (preval & 0xff00) >> 8;
+ int ucCRCLo = preval & 0x00ff;
+ int iIndex;
+ for (int i = 0; i < len; ++i) {
+ iIndex = (ucCRCLo ^ data[offset + i]) & 0x00ff;
+ ucCRCLo = ucCRCHi ^ crc16_tab_h[iIndex];
+ ucCRCHi = crc16_tab_l[iIndex];
+ }
+ return ((ucCRCHi & 0x00ff) << 8) | (ucCRCLo & 0x00ff) & 0xffff;
+ }
+
+ // 娴嬭瘯
+ public static void main(String[] args) {
+ // 0x02 05 00 03 FF 00 , crc16=7C 09
+ int crc = CRC16.calcCrc16(new byte[] { 0x02, 0x05, 0x00, 0x03, (byte) 0xff, 0x00 });
+ System.out.println(String.format("0x%04x", crc));
+ }
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/util/CRC8.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/util/CRC8.java
new file mode 100644
index 0000000..e0bcc25
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/util/CRC8.java
@@ -0,0 +1,186 @@
+package com.ld.igds.protocol.zldz.util;
+
+/**
+ *璁＄畻CRC8鏍￠獙鍊�
+ */
+public class CRC8 {
+
+ public static void main(String[] args) {
+
+ }
+
+ static short[] gCrc16Table = { (short) 0x0000, (short) 0x1021, (short) 0x2042, (short) 0x3063, (short) 0x4084,
+ (short) 0x50a5, (short) 0x60c6, (short) 0x70e7, (short) 0xd94c, (short) 0xc96d, (short) 0xf90e,
+ (short) 0xe92f, (short) 0x99c8, (short) 0x89e9, (short) 0xb98a, (short) 0xa9ab, (short) 0x5844,
+ (short) 0x4865, (short) 0x7806, (short) 0x6827, (short) 0x18c0, (short) 0x08e1, (short) 0x3882,
+ (short) 0x28a3, (short) 0xcb7d, (short) 0xdb5c, (short) 0xeb3f, (short) 0xfb1e, (short) 0x8bf9,
+ (short) 0x9bd8, (short) 0xabbb, (short) 0xbb9a, (short) 0x4a75, (short) 0x5a54, (short) 0x6a37,
+ (short) 0x7a16, (short) 0x0af1, (short) 0x1ad0, (short) 0x2ab3, (short) 0x3a92, (short) 0xfd2e,
+ (short) 0xed0f, (short) 0xdd6c, (short) 0xcd4d, (short) 0xbdaa, (short) 0xad8b, (short) 0x9de8,
+ (short) 0x8dc9, (short) 0xc9cc, (short) 0xd9ed, (short) 0xe98e, (short) 0xf9af, (short) 0x8948,
+ (short) 0x9969, (short) 0xa90a, (short) 0xb92b, (short) 0x5af5, (short) 0x4ad4, (short) 0x7ab7,
+ (short) 0x6a96, (short) 0x1a71, (short) 0x0a50, (short) 0x3a33, (short) 0x2a12, (short) 0xdbfd,
+ (short) 0xcbdc, (short) 0xfbbf, (short) 0xeb9e, (short) 0x9b79, (short) 0x8b58, (short) 0xbb3b,
+ (short) 0xab1a, (short) 0x6ca6, (short) 0x7c87, (short) 0x4ce4, (short) 0x5cc5, (short) 0x2c22,
+ (short) 0x3c03, (short) 0x0c60, (short) 0x1c41, (short) 0x8108, (short) 0x9129, (short) 0xa14a,
+ (short) 0xb16b, (short) 0xc18c, (short) 0xd1ad, (short) 0xe1ce, (short) 0xf1ef, (short) 0x1231,
+ (short) 0x0210, (short) 0x3273, (short) 0x2252, (short) 0x52b5, (short) 0x4294, (short) 0x72f7,
+ (short) 0x62d6, (short) 0x9339, (short) 0x8318, (short) 0xb37b, (short) 0xa35a, (short) 0xd3bd,
+ (short) 0xc39c, (short) 0xf3ff, (short) 0xe3de, (short) 0x2462, (short) 0x3443, (short) 0x0420,
+ (short) 0x1401, (short) 0x64e6, (short) 0x74c7, (short) 0x44a4, (short) 0x5485, (short) 0xa56a,
+ (short) 0xb54b, (short) 0x8528, (short) 0x9509, (short) 0xe5ee, (short) 0xf5cf, (short) 0xc5ac,
+ (short) 0xd58d, (short) 0x3653, (short) 0x2672, (short) 0x1611, (short) 0x0630, (short) 0x76d7,
+ (short) 0x66f6, (short) 0x5695, (short) 0x46b4, (short) 0xb75b, (short) 0xa77a, (short) 0x9719,
+ (short) 0x8738, (short) 0xf7df, (short) 0xe7fe, (short) 0xd79d, (short) 0xc7bc, (short) 0x48c4,
+ (short) 0x58e5, (short) 0x6886, (short) 0x78a7, (short) 0x0840, (short) 0x1861, (short) 0x2802,
+ (short) 0x3823, (short) 0x83b9, (short) 0x9398, (short) 0xa3fb, (short) 0xb3da, (short) 0xc33d,
+ (short) 0xd31c, (short) 0xe37f, (short) 0xf35e, (short) 0x02b1, (short) 0x1290, (short) 0x22f3,
+ (short) 0x32d2, (short) 0x4235, (short) 0x5214, (short) 0x6277, (short) 0x7256, (short) 0xb5ea,
+ (short) 0xa5cb, (short) 0x95a8, (short) 0x8589, (short) 0xf56e, (short) 0xe54f, (short) 0xd52c,
+ (short) 0xc50d, (short) 0x34e2, (short) 0x24c3, (short) 0x14a0, (short) 0x0481, (short) 0x7466,
+ (short) 0x6447, (short) 0x5424, (short) 0x4405, (short) 0xa7db, (short) 0xb7fa, (short) 0x8799,
+ (short) 0x97b8, (short) 0xe75f, (short) 0xf77e, (short) 0xc71d, (short) 0xd73c, (short) 0x26d3,
+ (short) 0x36f2, (short) 0x0691, (short) 0x16b0, (short) 0x6657, (short) 0x7676, (short) 0x4615,
+ (short) 0x5634, (short) 0xedae, (short) 0xfd8f, (short) 0xcdec, (short) 0xddcd, (short) 0xad2a,
+ (short) 0xbd0b, (short) 0x8d68, (short) 0x9d49, (short) 0x7e97, (short) 0x6eb6, (short) 0x5ed5,
+ (short) 0x4ef4, (short) 0x3e13, (short) 0x2e32, (short) 0x1e51, (short) 0x0e70, (short) 0xff9f,
+ (short) 0xefbe, (short) 0xdfdd, (short) 0xcffc, (short) 0xbf1b, (short) 0xaf3a, (short) 0x9f59,
+ (short) 0x8f78, (short) 0x9188, (short) 0x81a9, (short) 0xb1ca, (short) 0xa1eb, (short) 0xd10c,
+ (short) 0xc12d, (short) 0xf14e, (short) 0xe16f, (short) 0x1080, (short) 0x00a1, (short) 0x30c2,
+ (short) 0x20e3, (short) 0x5004, (short) 0x4025, (short) 0x7046, (short) 0x6067, (short) 0x7c26,
+ (short) 0x6c07, (short) 0x5c64, (short) 0x4c45, (short) 0x3ca2, (short) 0x2c83, (short) 0x1ce0,
+ (short) 0x0cc1, (short) 0xef1f, (short) 0xff3e, (short) 0xcf5d, (short) 0xdf7c, (short) 0xaf9b,
+ (short) 0xbfba, (short) 0x8fd9, (short) 0x9ff8, (short) 0x6e17, (short) 0x7e36, (short) 0x4e55,
+ (short) 0x5e74, (short) 0x2e93, (short) 0x3eb2, (short) 0x0ed1, (short) 0x1ef0 };
+
+ static short[] crc8_tab = { (short) 0x00, (short) 0x07, (short) 0x0E, (short) 0x09, (short) 0x1C, (short) 0x1B,
+ (short) 0x12, (short) 0x15, (short) 0x38, (short) 0x3F, (short) 0x36, (short) 0x31, (short) 0x24,
+ (short) 0x23, (short) 0x2A, (short) 0x2D, (short) 0x70, (short) 0x77, (short) 0x7E, (short) 0x79,
+ (short) 0x6C, (short) 0x6B, (short) 0x62, (short) 0x65, (short) 0x48, (short) 0x4F, (short) 0x46,
+ (short) 0x41, (short) 0x54, (short) 0x53, (short) 0x5A, (short) 0x5D, (short) 0xE0, (short) 0xE7,
+ (short) 0xEE, (short) 0xE9, (short) 0xFC, (short) 0xFB, (short) 0xF2, (short) 0xF5, (short) 0xD8,
+ (short) 0xDF, (short) 0xD6, (short) 0xD1, (short) 0xC4, (short) 0xC3, (short) 0xCA, (short) 0xCD,
+ (short) 0x90, (short) 0x97, (short) 0x9E, (short) 0x99, (short) 0x8C, (short) 0x8B, (short) 0x82,
+ (short) 0x85, (short) 0xA8, (short) 0xAF, (short) 0xA6, (short) 0xA1, (short) 0xB4, (short) 0xB3,
+ (short) 0xBA, (short) 0xBD, (short) 0xC7, (short) 0xC0, (short) 0xC9, (short) 0xCE, (short) 0xDB,
+ (short) 0xDC, (short) 0xD5, (short) 0xD2, (short) 0xFF, (short) 0xF8, (short) 0xF1, (short) 0xF6,
+ (short) 0xE3, (short) 0xE4, (short) 0xED, (short) 0xEA, (short) 0xB7, (short) 0xB0, (short) 0xB9,
+ (short) 0xBE, (short) 0xAB, (short) 0xAC, (short) 0xA5, (short) 0xA2, (short) 0x8F, (short) 0x88,
+ (short) 0x81, (short) 0x86, (short) 0x93, (short) 0x94, (short) 0x9D, (short) 0x9A, (short) 0x27,
+ (short) 0x20, (short) 0x29, (short) 0x2E, (short) 0x3B, (short) 0x3C, (short) 0x35, (short) 0x32,
+ (short) 0x1F, (short) 0x18, (short) 0x11, (short) 0x16, (short) 0x03, (short) 0x04, (short) 0x0D,
+ (short) 0x0A, (short) 0x57, (short) 0x50, (short) 0x59, (short) 0x5E, (short) 0x4B, (short) 0x4C,
+ (short) 0x45, (short) 0x42, (short) 0x6F, (short) 0x68, (short) 0x61, (short) 0x66, (short) 0x73,
+ (short) 0x74, (short) 0x7D, (short) 0x7A, (short) 0x89, (short) 0x8E, (short) 0x87, (short) 0x80,
+ (short) 0x95, (short) 0x92, (short) 0x9B, (short) 0x9C, (short) 0xB1, (short) 0xB6, (short) 0xBF,
+ (short) 0xB8, (short) 0xAD, (short) 0xAA, (short) 0xA3, (short) 0xA4, (short) 0xF9, (short) 0xFE,
+ (short) 0xF7, (short) 0xF0, (short) 0xE5, (short) 0xE2, (short) 0xEB, (short) 0xEC, (short) 0xC1,
+ (short) 0xC6, (short) 0xCF, (short) 0xC8, (short) 0xDD, (short) 0xDA, (short) 0xD3, (short) 0xD4,
+ (short) 0x69, (short) 0x6E, (short) 0x67, (short) 0x60, (short) 0x75, (short) 0x72, (short) 0x7B,
+ (short) 0x7C, (short) 0x51, (short) 0x56, (short) 0x5F, (short) 0x58, (short) 0x4D, (short) 0x4A,
+ (short) 0x43, (short) 0x44, (short) 0x19, (short) 0x1E, (short) 0x17, (short) 0x10, (short) 0x05,
+ (short) 0x02, (short) 0x0B, (short) 0x0C, (short) 0x21, (short) 0x26, (short) 0x2F, (short) 0x28,
+ (short) 0x3D, (short) 0x3A, (short) 0x33, (short) 0x34, (short) 0x4E, (short) 0x49, (short) 0x40,
+ (short) 0x47, (short) 0x52, (short) 0x55, (short) 0x5C, (short) 0x5B, (short) 0x76, (short) 0x71,
+ (short) 0x78, (short) 0x7F, (short) 0x6A, (short) 0x6D, (short) 0x64, (short) 0x63, (short) 0x3E,
+ (short) 0x39, (short) 0x30, (short) 0x37, (short) 0x22, (short) 0x25, (short) 0x2C, (short) 0x2B,
+ (short) 0x06, (short) 0x01, (short) 0x08, (short) 0x0F, (short) 0x1A, (short) 0x1D, (short) 0x14,
+ (short) 0x13, (short) 0xAE, (short) 0xA9, (short) 0xA0, (short) 0xA7, (short) 0xB2, (short) 0xB5,
+ (short) 0xBC, (short) 0xBB, (short) 0x96, (short) 0x91, (short) 0x98, (short) 0x9F, (short) 0x8A,
+ (short) 0x8D, (short) 0x84, (short) 0x83, (short) 0xDE, (short) 0xD9, (short) 0xD0, (short) 0xD7,
+ (short) 0xC2, (short) 0xC5, (short) 0xCC, (short) 0xCB, (short) 0xE6, (short) 0xE1, (short) 0xE8,
+ (short) 0xEF, (short) 0xFA, (short) 0xFD, (short) 0xF4, (short) 0xF3 };
+
+ static byte[] crc8_tab2 = { (byte) 0x00, (byte) 0x07, (byte) 0x0E, (byte) 0x09, (byte) 0x1C, (byte) 0x1B,
+ (byte) 0x12, (byte) 0x15, (byte) 0x38, (byte) 0x3F, (byte) 0x36, (byte) 0x31, (byte) 0x24, (byte) 0x23,
+ (byte) 0x2A, (byte) 0x2D, (byte) 0x70, (byte) 0x77, (byte) 0x7E, (byte) 0x79, (byte) 0x6C, (byte) 0x6B,
+ (byte) 0x62, (byte) 0x65, (byte) 0x48, (byte) 0x4F, (byte) 0x46, (byte) 0x41, (byte) 0x54, (byte) 0x53,
+ (byte) 0x5A, (byte) 0x5D, (byte) 0xE0, (byte) 0xE7, (byte) 0xEE, (byte) 0xE9, (byte) 0xFC, (byte) 0xFB,
+ (byte) 0xF2, (byte) 0xF5, (byte) 0xD8, (byte) 0xDF, (byte) 0xD6, (byte) 0xD1, (byte) 0xC4, (byte) 0xC3,
+ (byte) 0xCA, (byte) 0xCD, (byte) 0x90, (byte) 0x97, (byte) 0x9E, (byte) 0x99, (byte) 0x8C, (byte) 0x8B,
+ (byte) 0x82, (byte) 0x85, (byte) 0xA8, (byte) 0xAF, (byte) 0xA6, (byte) 0xA1, (byte) 0xB4, (byte) 0xB3,
+ (byte) 0xBA, (byte) 0xBD, (byte) 0xC7, (byte) 0xC0, (byte) 0xC9, (byte) 0xCE, (byte) 0xDB, (byte) 0xDC,
+ (byte) 0xD5, (byte) 0xD2, (byte) 0xFF, (byte) 0xF8, (byte) 0xF1, (byte) 0xF6, (byte) 0xE3, (byte) 0xE4,
+ (byte) 0xED, (byte) 0xEA, (byte) 0xB7, (byte) 0xB0, (byte) 0xB9, (byte) 0xBE, (byte) 0xAB, (byte) 0xAC,
+ (byte) 0xA5, (byte) 0xA2, (byte) 0x8F, (byte) 0x88, (byte) 0x81, (byte) 0x86, (byte) 0x93, (byte) 0x94,
+ (byte) 0x9D, (byte) 0x9A, (byte) 0x27, (byte) 0x20, (byte) 0x29, (byte) 0x2E, (byte) 0x3B, (byte) 0x3C,
+ (byte) 0x35, (byte) 0x32, (byte) 0x1F, (byte) 0x18, (byte) 0x11, (byte) 0x16, (byte) 0x03, (byte) 0x04,
+ (byte) 0x0D, (byte) 0x0A, (byte) 0x57, (byte) 0x50, (byte) 0x59, (byte) 0x5E, (byte) 0x4B, (byte) 0x4C,
+ (byte) 0x45, (byte) 0x42, (byte) 0x6F, (byte) 0x68, (byte) 0x61, (byte) 0x66, (byte) 0x73, (byte) 0x74,
+ (byte) 0x7D, (byte) 0x7A, (byte) 0x89, (byte) 0x8E, (byte) 0x87, (byte) 0x80, (byte) 0x95, (byte) 0x92,
+ (byte) 0x9B, (byte) 0x9C, (byte) 0xB1, (byte) 0xB6, (byte) 0xBF, (byte) 0xB8, (byte) 0xAD, (byte) 0xAA,
+ (byte) 0xA3, (byte) 0xA4, (byte) 0xF9, (byte) 0xFE, (byte) 0xF7, (byte) 0xF0, (byte) 0xE5, (byte) 0xE2,
+ (byte) 0xEB, (byte) 0xEC, (byte) 0xC1, (byte) 0xC6, (byte) 0xCF, (byte) 0xC8, (byte) 0xDD, (byte) 0xDA,
+ (byte) 0xD3, (byte) 0xD4, (byte) 0x69, (byte) 0x6E, (byte) 0x67, (byte) 0x60, (byte) 0x75, (byte) 0x72,
+ (byte) 0x7B, (byte) 0x7C, (byte) 0x51, (byte) 0x56, (byte) 0x5F, (byte) 0x58, (byte) 0x4D, (byte) 0x4A,
+ (byte) 0x43, (byte) 0x44, (byte) 0x19, (byte) 0x1E, (byte) 0x17, (byte) 0x10, (byte) 0x05, (byte) 0x02,
+ (byte) 0x0B, (byte) 0x0C, (byte) 0x21, (byte) 0x26, (byte) 0x2F, (byte) 0x28, (byte) 0x3D, (byte) 0x3A,
+ (byte) 0x33, (byte) 0x34, (byte) 0x4E, (byte) 0x49, (byte) 0x40, (byte) 0x47, (byte) 0x52, (byte) 0x55,
+ (byte) 0x5C, (byte) 0x5B, (byte) 0x76, (byte) 0x71, (byte) 0x78, (byte) 0x7F, (byte) 0x6A, (byte) 0x6D,
+ (byte) 0x64, (byte) 0x63, (byte) 0x3E, (byte) 0x39, (byte) 0x30, (byte) 0x37, (byte) 0x22, (byte) 0x25,
+ (byte) 0x2C, (byte) 0x2B, (byte) 0x06, (byte) 0x01, (byte) 0x08, (byte) 0x0F, (byte) 0x1A, (byte) 0x1D,
+ (byte) 0x14, (byte) 0x13, (byte) 0xAE, (byte) 0xA9, (byte) 0xA0, (byte) 0xA7, (byte) 0xB2, (byte) 0xB5,
+ (byte) 0xBC, (byte) 0xBB, (byte) 0x96, (byte) 0x91, (byte) 0x98, (byte) 0x9F, (byte) 0x8A, (byte) 0x8D,
+ (byte) 0x84, (byte) 0x83, (byte) 0xDE, (byte) 0xD9, (byte) 0xD0, (byte) 0xD7, (byte) 0xC2, (byte) 0xC5,
+ (byte) 0xCC, (byte) 0xCB, (byte) 0xE6, (byte) 0xE1, (byte) 0xE8, (byte) 0xEF, (byte) 0xFA, (byte) 0xFD,
+ (byte) 0xF4, (byte) 0xF3 };
+
+ /**
+ * 璁＄畻鏁扮粍鐨凜RC8鏍￠獙鍊�
+ *
+ * @param data
+ * 闇�瑕佽绠楃殑鏁扮粍
+ * @return CRC8鏍￠獙鍊�
+ */
+ public static byte calcCrc8(byte[] data) {
+ return calcCrc8(data, (short) 2, (short) (data.length - 2), (byte) 0);
+ }
+
+ /**
+ * 璁＄畻CRC8鏍￠獙鍊�
+ *
+ * @param data
+ * 鏁版嵁
+ * @param offset
+ * 璧峰浣嶇疆
+ * @param len
+ * 闀垮害
+ * @return 鏍￠獙鍊�
+ */
+ public static byte calcCrc8(byte[] data, short offset, short len) {
+ return calcCrc8(data, offset, len, (byte) 0);
+ }
+
+ public static byte calcCrc8(byte[] ucPtr, short offset, short ucLen, byte preval) {
+ short ucIndex; // CRC8鏍￠獙琛ㄦ牸绱㈠紩
+ short ucCRC8 = 0; // CRC8瀛楄妭鍒濆鍖�
+ short i = 0;
+ // 杩涜CRC8浣嶆牎楠�
+ while ((ucLen--) > 0) {
+ short indexI = (short) (i + offset);
+ short data = ucPtr[indexI];
+ if (data < 0) {
+ int sd = Byte.toUnsignedInt(ucPtr[indexI]);
+ data = (short) sd;
+ }
+ ucIndex = (short) (ucCRC8 ^ data);
+ ucCRC8 = crc8_tab[(short) ucIndex];
+ i++;
+ }
+ // 杩斿洖CRC8鏍￠獙鏁版嵁
+ return (byte) (~ucCRC8);
+ }
+
+ public static short crc16Byte(short crc, byte data) {
+ return (short) ((crc << 8) ^ gCrc16Table[((crc >> 8) ^ data) & 0xff]);
+ }
+
+ public static short calculateCrc16(byte[] buf, short offset, short length) {
+ short crc = 0;
+ short i = 0;
+ while ((length--) > 0) {
+ crc = crc16Byte(crc, buf[offset + (i++)]);
+ }
+ return crc;
+ }
+}
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/util/ServerUtils.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/util/ServerUtils.java
new file mode 100644
index 0000000..bd5a3b1
--- /dev/null
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/util/ServerUtils.java
@@ -0,0 +1,68 @@
+package com.ld.igds.protocol.zldz.util;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 宸ュ叿绫�
+ *
+ * @author Andy
+ */
+public class ServerUtils {
+
+ public static final Map<String, String> contextMap = new HashMap<>();
+
+ public static final String MSG_START = "AAAA";
+ public static final String MSG_END = "EEEE";
+
+ //榛樿缁勭粐缂栧彿
+ public static final String DEFAULT_COMPANY = "0000";
+
+
+ public static final String MSG_TYPE_1115 = "1115";// 鍚庡彴鑾峰彇绮儏鏁版嵁璇锋眰
+
+ public static final String MSG_TYPE_8815 = "8815";// 缁堢搴旂瓟绮儏鏁版嵁璇锋眰
+
+ public static final String MSG_TYPE_1116 = "1116";// 閰嶇疆璇诲彇鍒嗘満鍙傛暟
+
+ public static final String MSG_TYPE_8816 = "8816";// 閰嶇疆璇诲彇鍒嗘満鍙傛暟搴旂瓟
+
+ public static final String MSG_TYPE_1117 = "1117";// 缁堢鍙戦�佺伯鎯呮暟鎹粰鍚庡彴
+
+ public static final String MSG_TYPE_8817 = "8817";// 鍚庡彴鏀跺埌绮儏鏁版嵁搴旂瓟
+
+ public static final String MSG_TYPE_1122 = "1122";// 鍒濆鍖栫數缂嗙數缂�
+
+ public static final String MSG_TYPE_1123 = "1123";// 鐢电紗姹囨��
+
+ public static final String MSG_TYPE_1125 = "1125";// 璇诲彇閫氶亾鐢电紗
+
+ public static final String MSG_TYPE_8825 = "8825";//璇诲彇閫氶亾鐢电紗搴旂瓟
+
+ public static final String MSG_TYPE_1126 = "1126";// 淇敼閫氶亾鐢电紗
+
+ public static final String MSG_TYPE_8826 = "8826";// 淇敼閫氶亾鐢电紗搴旂瓟
+
+
+ public static final String MSG_TYPE_1128 = "1128";// 璇诲彇鏈夌嚎娓╂箍搴�
+
+ public static final String MSG_TYPE_8822 = "8822";// 搴旂瓟鍒濆鍖栫數缂嗙數缂�
+
+ public static final String MSG_TYPE_8823 = "8823";// 搴旂瓟鐢电紗姹囨�荤粨鏋�
+
+ public static final String MSG_TYPE_8828 = "8828";// 璇诲彇鏈夌嚎娓╂箍搴﹀簲绛�
+
+ public static final String MSG_TYPE_1129 = "1129";// 缁堢鍙戦�侀�氶亾鐢电紗鏁版嵁缁欏悗鍙�
+
+ public static final String MSG_TYPE_8829 = "8829";// 鍚庡彴鏀跺埌鐢电紗鏁版嵁搴旂瓟
+
+ public static final String MSG_TYPE_112B = "112B";// 閲嶅惎鍒嗘満
+
+ public static final String MSG_TYPE_882B = "882B";// 閲嶅惎鍒嗘満搴旂瓟
+
+
+ public static String getServerKey(String ip, int port) {
+ return ip + ":" + port;
+ }
+}
diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index 8190d3a..de80120 100644
--- a/igds-web/pom.xml
+++ b/igds-web/pom.xml
@@ -125,7 +125,7 @@
<artifactId>igds-api-phone</artifactId>
<version>${igds.version}</version>
</dependency>
-
+
<!-- 鍏朵粬閫氱敤鍝佺墝鍗忚 -->
<dependency>
<groupId>com.ld.igds</groupId>
@@ -168,23 +168,23 @@
</exclusion>
</exclusions>
</dependency>
-
+
<!-- MODBUS-TCP -->
- <dependency>
- <groupId>com.ld.igds</groupId>
- <artifactId>igds-protocol-modbus</artifactId>
- <version>${igds.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>com.ld.igds</groupId>-->
+<!-- <artifactId>igds-protocol-modbus</artifactId>-->
+<!-- <version>${igds.version}</version>-->
+<!-- <exclusions>-->
+<!-- <exclusion>-->
+<!-- <artifactId>slf4j-log4j12</artifactId>-->
+<!-- <groupId>org.slf4j</groupId>-->
+<!-- </exclusion>-->
+<!-- <exclusion>-->
+<!-- <artifactId>log4j</artifactId>-->
+<!-- <groupId>log4j</groupId>-->
+<!-- </exclusion>-->
+<!-- </exclusions>-->
+<!-- </dependency>-->
<!-- 绉佹湁鍗忚-椋庢鑷磋繙IOT銆佸埗姘満-->
@@ -204,7 +204,7 @@
</exclusions>
</dependency>
- <!-- 绉佹湁鍗忚-璐濆崥绮儏
+ <!-- 绉佹湁鍗忚-璐濆崥绮儏-->
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-beibo</artifactId>
@@ -219,9 +219,9 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>-->
+ </dependency>
- <!-- 绉佹湁鍗忚-閭︽捣鏅鸿兘
+ <!-- 绉佹湁鍗忚-閭︽捣鏅鸿兘-->
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-bhzn</artifactId>
@@ -236,9 +236,23 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>-->
-
- <!-- 娴峰悍杞︾墝璇嗗埆-SDK
+ </dependency>
+ <dependency>
+ <groupId>com.ld.igds</groupId>
+ <artifactId>igds-protocol-zldz</artifactId>
+ <version>${igds.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- 娴峰悍杞︾墝璇嗗埆-SDK -->
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-sdk</artifactId>
@@ -254,10 +268,7 @@
</exclusion>
</exclusions>
</dependency>
- -->
-
</dependencies>
-
<dependencyManagement>
<dependencies>
diff --git a/igds-web/src/main/resources/application-pro1000.yml b/igds-web/src/main/resources/application-pro1000.yml
new file mode 100644
index 0000000..6ed4ff3
--- /dev/null
+++ b/igds-web/src/main/resources/application-pro1000.yml
@@ -0,0 +1,80 @@
+########################## 椋庢鑷磋繙-绮儏鏈嶅姟鍣� ##########################
+server:
+ port: 8201
+ context-path: /
+ connection-timeout: 5000
+ tomcat:
+ uri-encoding: UTF-8
+
+########################## datasourcec ##########################
+spring:
+ datasource:
+ db-base:
+ name: db-base
+ type: com.alibaba.druid.pool.DruidDataSource
+ url: jdbc:mysql://127.0.0.1:3306/igds_master_v35?useUnicode=true&characterEncoding=utf-8
+ driver-class-name: com.mysql.jdbc.Driver
+ username: root
+ password: ukJp12Qf+elyBvGHkJ5MQMa95pfVm0oFBHefdEgDFKoFSjbgYa9PYfv5vlem5nvoXjQsP9tIIo53DvSbsl160Q==
+ public-key:
+ config-decrypt: true
+ initial-size: 5
+ min-idle: 5
+ max-active: 50
+ max-wait: 60000
+ time-between-eviction-runs-millis: 60000
+ min-evictable-idle-time-millis: 300000
+ validation-query: select 1 from dual
+ test-whileIdle: true
+ test-on-borrow: false
+ test-on-return: false
+ pool-prepared-statements: true
+ max-pool-prepared-statement-per-connection-size: 20
+ filters: stat
+ connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+ use-global-data-source-stat: true
+ remove-abandoned: true
+ remove-abandoned-timeout: 1800
+ log-abandoned: true
+ db-sqlite:
+ name: db-sqlite
+ url: jdbc:sqlite:D:/app/igds/db/iot_cfg.db
+ driver-class-name: org.sqlite.JDBC
+ type: com.alibaba.druid.pool.DruidDataSource
+ username:
+ password:
+
+ # Redis鐩稿叧閰嶇疆
+ redis:
+ database: 0
+ host: 127.0.0.1
+ port: 6379
+ password: Abc123..
+ # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
+ pool:
+ max-active: 200
+ max-wait: -1
+ max-idle: 10
+ min-idle: 0
+ timeout: 6000
+
+license:
+ subject: ld_license
+ publicAlias: publicCert
+ storePass: PUBLICFZZYXXJSGFYXGS888888
+ licensePath: C:/license/license.lic
+ publicKeysStorePath: C:/license/publicCerts.keystore
+
+########################## IGDS ##########################
+## 绯荤粺鎺ュ彛璺敱閰嶇疆 娉ㄦ剰鏁板瓧濡傛灉浠�0寮�澶寸殑璇濓紝鍚庡彴浼氬嚭鐜拌浆涔夛紝璇锋坊鍔�""
+igds:
+ default:
+ companyId: 1000
+ sys-name: 鏅烘収绮簱绠＄悊绯荤粺
+ logo: logo-default.png
+ logo-title: logo-title-default.png
+ support: 鏅烘収绮儏绮儏浜戠鐞嗗钩鍙�
+ grian-add-point: N
+ media-ip: 124.71.162.207
+ media-port: 18000
+ file-path: C:/IGDS-PLATFORM/
\ No newline at end of file
diff --git a/igds-web/src/main/resources/application-pro5322.yml b/igds-web/src/main/resources/application-pro5322.yml
new file mode 100644
index 0000000..1d4f61d
--- /dev/null
+++ b/igds-web/src/main/resources/application-pro5322.yml
@@ -0,0 +1,80 @@
+########################## 骞夸笢寰愰椈椤圭洰 ##########################
+server:
+ port: 8888
+ context-path: /
+ connection-timeout: 5000
+ tomcat:
+ uri-encoding: UTF-8
+
+########################## datasourcec ##########################
+spring:
+ datasource:
+ db-base:
+ name: db-base
+ type: com.alibaba.druid.pool.DruidDataSource
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
+ driver-class-name: com.mysql.jdbc.Driver
+ username: root
+ password: ukJp12Qf+elyBvGHkJ5MQMa95pfVm0oFBHefdEgDFKoFSjbgYa9PYfv5vlem5nvoXjQsP9tIIo53DvSbsl160Q==
+ public-key:
+ config-decrypt: true
+ initial-size: 5
+ min-idle: 5
+ max-active: 50
+ max-wait: 60000
+ time-between-eviction-runs-millis: 60000
+ min-evictable-idle-time-millis: 300000
+ validation-query: select 1 from dual
+ test-whileIdle: true
+ test-on-borrow: false
+ test-on-return: false
+ pool-prepared-statements: true
+ max-pool-prepared-statement-per-connection-size: 20
+ filters: stat
+ connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+ use-global-data-source-stat: true
+ removeAbandoned: true
+ removeAbandonedTimeout: 90
+ logAbandoned: true
+ poolPreparedStatements: true
+ maxPoolPreparedStatementPerConnectionSize: 20
+ db-sqlite:
+ name: db-sqlite
+ url: jdbc:sqlite:D:/app/igds/db/iot_cfg.db
+ driver-class-name: org.sqlite.JDBC
+ type: com.alibaba.druid.pool.DruidDataSource
+ username:
+ password:
+
+ # Redis鐩稿叧閰嶇疆
+ redis:
+ database: 0
+ host: 127.0.0.1
+ port: 6379
+ password: Abc123..
+ # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
+ pool:
+ max-active: 200
+ max-wait: -1
+ max-idle: 10
+ min-idle: 0
+ timeout: 6000
+
+license:
+ subject: ld_license
+ publicAlias: publicCert
+ storePass: PUBLICFZZYXXJSGFYXGS888888
+ licensePath: D:/IGDS/license/license.lic
+ publicKeysStorePath: D:/IGDS/license/publicCerts.keystore
+
+########################## IGDS ##########################
+## 绯荤粺鎺ュ彛璺敱閰嶇疆 娉ㄦ剰鏁板瓧濡傛灉浠�0寮�澶寸殑璇濓紝鍚庡彴浼氬嚭鐜拌浆涔夛紝璇锋坊鍔�""
+igds:
+ default:
+ companyId: 5322
+ sys-name: 鏅烘収绮簱绠＄悊绯荤粺
+ logo: logo-default.png
+ logo-title: logo-title-default.png
+ support: 鏅烘収绮簱缁煎悎绠＄悊骞冲彴
+ grian-add-point: N
+ file-path: D:/IGDS/FILE/
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 6dfaab5..f500421 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,8 @@
<module>igds-protocol-fzzy3</module>
<!--閭︽捣鏅鸿兘-->
<module>igds-protocol-bhzn</module>
+ <!--閭︽捣鏅鸿兘-->
+ <module>igds-protocol-zldz</module>
<!--璐濆崥绮儏鍗忚-->
<module>igds-protocol-beibo</module>
<!--鐗╄仈缃戞嫇灞曡澶囧寘-->
@@ -54,7 +56,7 @@
<module>igds-api-phone</module>
<!-- 鎺ュ彛鍖咃紝鍖呮嫭涓夌淮鎺ュ彛 -->
<module>igds-api-inte</module>
-
+<!-- <module>igds-api-three</module>-->
<!-- 鍙鍖�-->
<module>igds-databoard</module>
--
Gitblit v1.9.3