From cbe1226ae82f1818e13b7a4faa965b591d631633 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 11 十月 2023 12:24:18 +0800
Subject: [PATCH] 更新油罐页面
---
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/AnalysisService.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 4f54fce..6a883f3 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
@@ -6,7 +6,9 @@
import com.ld.igds.constant.BizType;
import com.ld.igds.constant.Constant;
import com.ld.igds.constant.DepotType;
+import com.ld.igds.constant.RedisConst;
import com.ld.igds.grain.GrainUtil;
+import com.ld.igds.grain.dto.GrainData;
import com.ld.igds.grain.dto.GrainItemInfo;
import com.ld.igds.io.notify.NotifyGrainInvoker;
import com.ld.igds.models.*;
@@ -19,6 +21,7 @@
import com.ld.igds.protocol.bhzn.grainv1.server.BhznGrainV1ServerUtils;
import com.ld.igds.util.BytesUtil;
import com.ld.igds.util.ContextUtil;
+import com.ld.igds.util.RedisUtil;
import com.ld.igds.warn.WarnUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +51,8 @@
public static final String BEAN_ID = "bhznGrainv1.analysisService";
+ @Autowired
+ private RedisUtil redisUtil;
@Autowired
private CoreSerService coreSerService;
@Autowired
@@ -293,12 +298,13 @@
if (null != thDto) {
log.debug("-------THDto--={}", thDto.toString());
}
+
+
//娓呯┖
String key = "GRAIN_" + message.getAddr();
contextMapGrain.put(key, null);
// 灏嗛泦鍚堣В鏋愭垚鍧愭爣鏁版嵁
addPoint1(temps, depotConf, ser, exeRequest, thDto, sysConf, batchId);
-
}
@@ -344,6 +350,9 @@
}
+
+
+
Grain grain = new Grain();
grain.setDepotId(depotConf.getDepotId());
grain.setCompanyId(depotConf.getCompanyId());
@@ -353,6 +362,14 @@
grain.setTempIn(Constant.ERROR_TEMP);
grain.setHumidityIn(Constant.ERROR_TEMP);
+ //濡傛灉鏄补缃愪粨
+ if(DepotType.TYPE_03.getCode().equals(depot.getDepotType())){
+ GrainData tempData = (GrainData) redisUtil.get(RedisConst.buildKey(ser.getCompanyId(),RedisConst.KEY_DEPOT_HEIGHT,depot.getId()));
+ if(null != tempData){
+ //TODO
+ }
+ }
+
if (null != thDto) {
log.debug("绮儏瑙ｆ瀽涓幏鍙栧埌鐨勬俯婀垮害淇℃伅={}", thDto.toString());
grain.setHumidityIn(thDto.getHumidityIn());
--
Gitblit v1.9.3