From 564295458c720206db9b5194b90481b711f4b010 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 11 十月 2023 12:09:22 +0800
Subject: [PATCH] 更改配置及筒仓偏移量
---
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/AnalysisService.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
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 7772715..4f54fce 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
@@ -68,12 +68,19 @@
*/
public void analysis(String sessionKey, IoMessage message) throws Exception {
+ String companyId = ContextUtil.getDefaultCompanyId();
+ //FZZY浜戞湇鍔″櫒-璁告槍鍐涚伯
+ if("1000".equals(companyId)){
+ companyId = "5323";
+ }
+ message.setCompanyId(companyId);
//娉ㄥ唽
if (BhznGrainV1ServerUtils.FUNCTION_ID_F1.equals(message.getFunctionId())) {
//DO NOTHING
log.info("涓绘満------->>骞冲彴锛氭敞鍐屼俊鎭姤鏂�={}", message);
- DeviceSer ser = coreSerService.getCacheSerBySn("5323",message.getAddr());
+
+ DeviceSer ser = coreSerService.getCacheSerBySn(message.getCompanyId(), message.getAddr());
if(ser!= null ){
ser.setIp(message.getIp());
ser.setPort(message.getPort());
@@ -111,7 +118,7 @@
//鏍规嵁鍒嗘満鍦板潃鑾峰彇鍒嗘満淇℃伅
- DeviceSer ser = coreSerService.getCacheSer("5323", message.getAddr());
+ DeviceSer ser = coreSerService.getCacheSer(message.getCompanyId(), message.getAddr());
if (ser == null) {
replayGrain(message);
log.error("涓绘満-------->>骞冲彴锛岃В鏋愮伯鎯呭け璐ワ紝鏈幏鍙栧埌绯荤粺绮儏涓绘満閰嶇疆锛�" + message.getAddr());
@@ -158,7 +165,7 @@
int cableY = 1;
int cableX = 1;
- if(DepotType.TYPE_01.equals(depot.getDepotType())){
+ if(DepotType.TYPE_01.getCode().equals(depot.getDepotType())){
cableZ = Integer.valueOf(attCable[0]);
cableY = Integer.valueOf(attCable[1]);
cableX = Integer.valueOf(attCable[2]);
@@ -239,7 +246,7 @@
int cableY = 1;
int cableX = 1;
- if(DepotType.TYPE_01.equals(depot.getDepotType())){
+ if(DepotType.TYPE_01.getCode().equals(depot.getDepotType())){
cableZ = Integer.valueOf(attCable[0]);
cableY = Integer.valueOf(attCable[1]);
cableX = Integer.valueOf(attCable[2]);
@@ -326,7 +333,7 @@
int cableY = 1;
int cableX = 1;
- if(DepotType.TYPE_01.equals(depot.getDepotType())){
+ if(DepotType.TYPE_01.getCode().equals(depot.getDepotType())){
cableZ = Integer.valueOf(attCable[0]);
cableY = Integer.valueOf(attCable[1]);
cableX = Integer.valueOf(attCable[2]);
@@ -476,7 +483,7 @@
private void analysisTh(IoMessage message) {
try {
THDto th = new THDto();
- th.setCompanyId("5323");
+ th.setCompanyId(message.getCompanyId());
String data = message.getContent();
String houseNo = data.substring(0, 2);
String t = data.substring(4, 8);
--
Gitblit v1.9.3