From b1c572949997a5d82d9b609163ff280a1c49627d Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期五, 26 四月 2024 14:09:45 +0800
Subject: [PATCH] 粮情协议优化
---
src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java | 622 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 615 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java b/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
index 56683c8..19ce2cf 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
@@ -1,21 +1,30 @@
package com.fzzy.gateway.hx2023.service;
-import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.fzzy.api.data.DepotType;
import com.fzzy.api.data.PushProtocol;
+import com.fzzy.async.fzzy40.entity.Fz40Grain;
+import com.fzzy.data.ConfigData;
+import com.fzzy.gateway.GatewayUtils;
import com.fzzy.gateway.api.GatewayDeviceReportService;
import com.fzzy.gateway.data.BaseReqData;
import com.fzzy.gateway.data.BaseResp;
+import com.fzzy.gateway.data.GrainCableData;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
-import com.fzzy.gateway.hx2023.data.WebSocketPacket;
-import com.fzzy.gateway.hx2023.data.WebSocketPacketHeader;
-import com.fzzy.gateway.hx2023.data.WeightInfo;
+import com.fzzy.gateway.hx2023.data.*;
import com.fzzy.gateway.hx2023.kafka.KafkaDeviceReportService;
import com.fzzy.mqtt.MqttGatewayService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
@Slf4j
@Component
@@ -25,6 +34,8 @@
private KafkaDeviceReportService kafkaDeviceReportService;
@Resource
private MqttGatewayService publishService;
+ @Resource
+ private ConfigData configData;
@Override
public String getProtocol() {
@@ -37,12 +48,37 @@
String topic = ScConstant.TOPIC_REPORT;
topic = topic.replace("${productId}", reqData.getProductId()).replace("${deviceId}", reqData.getDeviceId());
+ //濡傛灉鏄祴璇曟ā寮忎笉鎵ц鎺ㄩ��
+ if (configData.getActive().indexOf("dev") >= 0) {
+
+ log.info("----------------------------鎺ㄩ�丮QTT绮儏淇℃伅锛屾敞锛氳皟璇曟ā寮忎笉鎺ㄩ��---------------------------");
+ log.info("-----TOPIC-----{}", topic);
+ log.info("-----Message-----{}", reqData.getData());
+
+ return new BaseResp();
+ }
+
publishService.publishMqttWithTopic(reqData.getData(), topic);
log.info("----------------------------鎺ㄩ�丮QTT绮儏淇℃伅---------------------------");
log.info("-----TOPIC-----{}", topic);
log.info("-----Message-----{}", reqData.getData());
+ return new BaseResp();
+ }
+ @Override
+ public BaseResp reportGrainDataByKafka(BaseReqData reqData) {
+ String topic = ScConstant.TOPIC_ZLJ_GRAIN_TEMPERATURE;
+ //濡傛灉鏄祴璇曟ā寮忎笉鎵ц鎺ㄩ��
+ if (configData.getActive().indexOf("dev") >= 0) {
+ log.info("----------------------------鎺ㄩ�並AFKA绮儏淇℃伅锛屾敞锛氳皟璇曟ā寮忎笉鎺ㄩ��---------------------------");
+ log.info("-----TOPIC-----{}", topic);
+ log.info("-----Message-----{}", reqData.getData());
+
+ return new BaseResp();
+ }
+
+ kafkaDeviceReportService.publishWithTopic(reqData.getData(), topic);
return new BaseResp();
}
@@ -72,7 +108,7 @@
weightInfo.setNetWeight(reqData.getWeight());
weightInfo.setWeightUnit("KG");
JSONObject jsonObject = new JSONObject();
- jsonObject.put("weightInfo", JSONObject.toJSONString(weightInfo));
+ jsonObject.put("weightInfo", weightInfo);
packet.setProperties(jsonObject);
@@ -94,6 +130,31 @@
String topic = ScConstant.TOPIC_MESSAGE_REPORT;
topic = topic.replace("${productId}", reqData.getProductId()).replace("${deviceId}", reqData.getDeviceId());
+ GatewayDevice device = reqData.getDevice();
+
+ if (StringUtils.isEmpty(reqData.getData())) {
+ WebSocketPacket packet = new WebSocketPacket();
+ WebSocketPacketHeader header = new WebSocketPacketHeader();
+ header.setDeviceName(reqData.getDeviceName());
+ header.setProductId(reqData.getProductId());
+
+ packet.setHeaders(header);
+ packet.setMessageType(ScConstant.MESSAGE_TYPE_REPORT_PROPERTY);
+ packet.setDeviceId(reqData.getDeviceId());
+ packet.setMessageId(System.currentTimeMillis() + "");
+ //璁剧疆淇℃伅涓讳綋
+ LprData lpr = new LprData();
+ lpr.setDeviceId(reqData.getDeviceId());
+ lpr.setCarNumber(reqData.getCarNumber());
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("carNumber", reqData.getCarNumber());
+ jsonObject.put("position", device.getPosition());
+ packet.setProperties(jsonObject);
+ packet.setTimestamp(System.currentTimeMillis());
+
+ reqData.setData(JSONObject.toJSONString(packet));
+ }
+
publishService.publishMqttWithTopic(reqData.getData(), topic);
log.info("----------------------------鎺ㄩ�丮QTT杞︾墝璇嗗埆淇℃伅---------------------------");
@@ -103,9 +164,556 @@
}
@Override
- public BaseResp reportGrainDataByKafka(BaseReqData reqData) {
- String topic = ScConstant.TOPIC_MESSAGE_REPORT;
+ public BaseResp reportGrainDataByHand(BaseReqData reqData) {
+ String topic = ScConstant.TOPIC_ZLJ_GRAIN_TEMPERATURE;
+
+ //濡傛灉鏄祴璇曟ā寮忎笉鎵ц鎺ㄩ��
+ if (configData.getActive().indexOf("dev") >= 0) {
+
+ log.info("----------------------------鎺ㄩ�並AFKA绮儏淇℃伅锛屾敞锛氳皟璇曟ā寮忎笉鎺ㄩ��---------------------------");
+ log.info("-----TOPIC-----{}", topic);
+ log.info("-----Message-----{}", reqData.getData());
+
+ return new BaseResp();
+ }
+
kafkaDeviceReportService.publishWithTopic(reqData.getData(), topic);
return new BaseResp();
}
+
+ @Override
+ public BaseResp grainData2GatewayApiInfo(Fz40Grain grainData, GatewayDevice device) {
+
+ BaseResp resp = new BaseResp();
+
+ GrainCableData cableData = GatewayUtils.getCableData(device);
+
+ if (null == device.getDepotType()) device.setDepotType(DepotType.TYPE_01.getCode());
+
+ //琛ㄧず绛掍粨
+ if (DepotType.TYPE_02.getCode().equals(device.getDepotType()) || DepotType.TYPE_04.getCode().equals(device.getDepotType())) {
+ return grainData2GatewayApiInfo2(grainData, device, cableData);
+ }
+
+ //琛ㄧず涓虹瓛浠撳寘鎷补缃愪粨
+ if (DepotType.TYPE_03.getCode().equals(device.getDepotType())) {
+ return grainData2GatewayApiInfo3(grainData, device, cableData);
+ }
+
+
+ KafaGrainData result = new KafaGrainData();
+
+ result.setMessageId(ScConstant.getMessageId());
+ result.setMessgeId(result.getMessageId());
+ result.setDeviceID(device.getDeviceId());
+ result.setAvgTemperature(grainData.getTempAve() + "");
+ result.setMinTemperature(grainData.getTempMin() + "");
+ result.setMaxTemperature(grainData.getTempMax() + "");
+ result.setCollectTime(DateFormatUtils.format(grainData.getReceiveDate(), "yyyy-MM-dd HH:mm:ss"));
+
+ //灞傝鍒�
+ int cableZ = cableData.getCableZ();
+ int cableY = cableData.getCableY();
+ int cableX = cableData.getCableX();
+
+ //娓╁害闆嗗悎
+ String[] attr = grainData.getPoints().split(",");
+
+ //鏍瑰彿
+ int cableNum = 1, position = 0;
+ String curTemp;
+ List<KafkaGrainDataDetail1> temperature = new ArrayList<>();
+
+ int x = 0, y = 0, z = 0;
+ for (int i = 0; i < attr.length; i++) {
+ position = i;
+ z = i % cableZ + 1;
+ x = i / (cableZ * cableY);
+ y = x * (cableZ * cableY);
+ y = (i - y) / cableZ;
+ // 鍊掕浆X杞�
+ x = cableX - 1 - x;
+ //鏍瑰彿
+ cableNum = (i / cableZ) + 1;
+ curTemp = attr[i];
+
+
+ //濡傛灉鏄紓甯稿��,鎵ц璋冩暣鏁版嵁 TODO
+ if (Double.valueOf(curTemp) < -99.9) {
+
+ curTemp = grainData.getTempAve() + "";
+
+ } else {
+ //鍒ゆ柇鏈�澶�
+ if (curTemp.equals(result.getMaxTemperature())) {
+ result.setMaxX(x + "");
+ result.setMaxY(y + "");
+ result.setMaxZ(position + "");
+ }
+ //鍒ゆ柇鏈�灏�
+ if (curTemp.equals(result.getMinTemperature())) {
+ result.setMinX(x + "");
+ result.setMinY(y + "");
+ result.setMinZ(position + "");
+ }
+ }
+
+ temperature.add(new KafkaGrainDataDetail1(cableNum + "", z + "", curTemp, position + "", x + "", y + ""));
+ }
+
+ //绮俯淇℃伅
+ JSONObject trhInfo = new JSONObject();
+ // TRHInfo trhInfo = new TRHInfo();
+ trhInfo.put("temperature", temperature);
+
+
+ //浠撴俯搴︿俊鎭�
+ KafkaGrainTH grainTH = new KafkaGrainTH();
+ grainTH.setHumidity(grainData.getHumidityIn() + "");
+ grainTH.setTemperature(grainData.getTempIn() + "");
+ grainTH.setAirHumidity(grainData.getHumidityOut() + "");
+ grainTH.setAirTemperature(grainData.getTempOut() + "");
+
+ List<KafkaGrainTH> temperatureAndhumidity = new ArrayList<>();
+ temperatureAndhumidity.add(grainTH);
+
+ trhInfo.put("temperatureAndhumidity", temperatureAndhumidity);
+
+
+ JSONObject params = new JSONObject();
+ params.put("TRHInfo", trhInfo);
+
+ result.setParams(params);
+
+
+ resp.setData(JSONObject.toJSONString(result));
+
+ return resp;
+ }
+
+ /**
+ * 绛掍粨
+ *
+ * @param grainData
+ * @param device
+ * @param cableData
+ * @return
+ */
+ private BaseResp grainData2GatewayApiInfo2(Fz40Grain grainData, GatewayDevice device, GrainCableData cableData) {
+ BaseResp resp = new BaseResp();
+
+ KafaGrainData result = new KafaGrainData();
+
+ result.setMessageId(ScConstant.getMessageId());
+ result.setMessgeId(result.getMessageId());
+ result.setDeviceID(device.getDeviceId());
+ result.setAvgTemperature(grainData.getTempAve() + "");
+ result.setMinTemperature(grainData.getTempMin() + "");
+ result.setMaxTemperature(grainData.getTempMax() + "");
+ result.setCollectTime(DateFormatUtils.format(grainData.getReceiveDate(), "yyyy-MM-dd HH:mm:ss"));
+
+ //灞傝鍒�
+ int cableZ = cableData.getCableZ();
+
+ //娓╁害闆嗗悎
+ String[] attr = grainData.getPoints().split(",");
+
+ //鏍瑰彿
+ int cableNum = 1, position = 0;
+ String curTemp;
+ List<KafkaGrainDataDetail1> temperature = new ArrayList<>();
+
+
+ JSONObject totalCircle = new JSONObject();
+ totalCircle.put("totalCircle", cableData.getTotalCircle() + "");
+ totalCircle.put("smallCircle", cableData.getSmallCircle());
+ String totalCircleStr = totalCircle.toJSONString();
+
+
+ int x = 0, y = 0, z = 0, circle = 1;
+ for (int i = 0; i < attr.length; i++) {
+ position = i;
+ z = i % cableZ + 1;
+ //鏍瑰彿
+ cableNum = (i / cableZ) + 1;
+ curTemp = attr[i];
+
+ circle = this.getCirCle(position, cableNum, cableData);
+
+ y = 1;
+
+
+ //濡傛灉鏄紓甯稿��,鎵ц璋冩暣鏁版嵁 TODO
+ if (Double.valueOf(curTemp) < -99.9) {
+
+ curTemp = grainData.getTempAve() + "";
+
+ } else {
+ //鍒ゆ柇鏈�澶�
+ if (curTemp.equals(result.getMaxTemperature())) {
+ result.setMaxX(cableNum + "");
+ result.setMaxY(y + "");
+ result.setMaxZ(position + "");
+ }
+ //鍒ゆ柇鏈�灏�
+ if (curTemp.equals(result.getMinTemperature())) {
+ result.setMinX(cableNum + "");
+ result.setMinY(y + "");
+ result.setMinZ(position + "");
+ }
+ }
+
+ temperature.add(new KafkaGrainDataDetail1(cableNum + "", z + "", curTemp, position + "", null, null, circle + "", totalCircleStr));
+ }
+
+ //绮俯淇℃伅
+ JSONObject trhInfo = new JSONObject();
+ trhInfo.put("temperature", temperature);
+
+
+ //浠撴俯搴︿俊鎭�
+ KafkaGrainTH grainTH = new KafkaGrainTH();
+ grainTH.setHumidity(grainData.getHumidityIn() + "");
+ grainTH.setTemperature(grainData.getTempIn() + "");
+ grainTH.setAirHumidity(grainData.getHumidityOut() + "");
+ grainTH.setAirTemperature(grainData.getTempOut() + "");
+
+ List<KafkaGrainTH> temperatureAndhumidity = new ArrayList<>();
+ temperatureAndhumidity.add(grainTH);
+
+ trhInfo.put("temperatureAndhumidity", temperatureAndhumidity);
+
+ JSONObject params = new JSONObject();
+ params.put("TRHInfo", trhInfo);
+
+ result.setParams(params);
+
+
+ resp.setData(JSONObject.toJSONString(result));
+ return resp;
+ }
+
+ /**
+ * 鑾峰彇褰撶偣鎵�鍦ㄥ湀
+ *
+ * @param cableNum
+ * @param cableData
+ * @return
+ */
+ private int getCirCle(int position, int cableNum, GrainCableData cableData) {
+
+ int num1 = 1, num2 = 2;
+ String[] attCable = cableData.getCableRule().split("-");
+
+ if (cableData.getTotalCircle() == 1) return 1;
+
+ if (cableData.getTotalCircle() == 2) {
+ num1 = Integer.valueOf(attCable[0]);
+
+ if (cableNum <= num1) return 1;
+
+ return 2;
+ }
+
+ if (cableData.getTotalCircle() == 3) {
+ num1 = Integer.valueOf(attCable[0]);
+ num2 = num1 + Integer.valueOf(attCable[1]);
+ if (cableNum <= num1) return 1;
+
+ if (cableNum <= num2) return 2;
+
+ return 3;
+ }
+
+ if (cableData.getTotalCircle() == 4) {
+ num1 = Integer.valueOf(attCable[0]);
+ num2 = num1 + Integer.valueOf(attCable[1]);
+ if (cableNum <= num1) return 1;
+
+ if (cableNum <= num2) return 2;
+
+ num2 = num1 + Integer.valueOf(attCable[1]) + Integer.valueOf(attCable[2]);
+
+ if (cableNum <= num2) return 3;
+
+ return 4;
+ }
+
+ return 1;
+ }
+
+
+ /**
+ * 娌圭綈浠撶殑澶勭悊
+ * <p>
+ * 2024骞�1鏈�20鏃� 鏆傛椂鐢ㄧ殑骞虫埧浠撴姤鏂�
+ *
+ * @param grainData
+ * @param device
+ * @param cableData
+ * @return
+ */
+ private BaseResp grainData2GatewayApiInfo3(Fz40Grain grainData, GatewayDevice device, GrainCableData cableData) {
+
+ BaseResp resp = new BaseResp();
+
+
+ KafaGrainData result = new KafaGrainData();
+
+ result.setMessageId(ScConstant.getMessageId());
+ result.setMessgeId(result.getMessageId());
+ result.setDeviceID(device.getDeviceId());
+ result.setAvgTemperature(grainData.getTempAve() + "");
+ result.setMinTemperature(grainData.getTempMin() + "");
+ result.setMaxTemperature(grainData.getTempMax() + "");
+ result.setCollectTime(DateFormatUtils.format(grainData.getReceiveDate(), "yyyy-MM-dd HH:mm:ss"));
+
+ //灞傝鍒�
+ int cableZ = cableData.getCableZ();
+ int cableY = cableData.getCableY();
+ int cableX = cableData.getCableX();
+
+ //娓╁害闆嗗悎
+ String[] attr = grainData.getPoints().split(",");
+
+ //鏍瑰彿
+ int cableNum = 1, position = 0;
+ String curTemp;
+ List<KafkaGrainDataDetail1> temperature = new ArrayList<>();
+
+ int x = 0, y = 0, z = 0;
+ for (int i = 0; i < attr.length; i++) {
+ position = i;
+ z = i % cableZ + 1;
+ x = i / (cableZ * cableY);
+ y = x * (cableZ * cableY);
+ y = (i - y) / cableZ;
+ // 鍊掕浆X杞�
+ x = cableX - 1 - x;
+ //鏍瑰彿
+ cableNum = (i / cableZ) + 1;
+ curTemp = attr[i];
+
+
+ //濡傛灉鏄紓甯稿��,鎵ц璋冩暣鏁版嵁 TODO
+ if (Double.valueOf(curTemp) < -99.9) {
+
+ curTemp = grainData.getTempAve() + "";
+
+ } else {
+ //鍒ゆ柇鏈�澶�
+ if (curTemp.equals(result.getMaxTemperature())) {
+ result.setMaxX(x + "");
+ result.setMaxY(y + "");
+ result.setMaxZ(position + "");
+ }
+ //鍒ゆ柇鏈�灏�
+ if (curTemp.equals(result.getMinTemperature())) {
+ result.setMinX(x + "");
+ result.setMinY(y + "");
+ result.setMinZ(position + "");
+ }
+ }
+
+ temperature.add(new KafkaGrainDataDetail1(cableNum + "", z + "", curTemp, position + "", x + "", y + ""));
+ }
+
+ //绮俯淇℃伅
+ JSONObject trhInfo = new JSONObject();
+ // TRHInfo trhInfo = new TRHInfo();
+ trhInfo.put("temperature", temperature);
+
+
+ //浠撴俯搴︿俊鎭�
+ KafkaGrainTH grainTH = new KafkaGrainTH();
+ grainTH.setHumidity(grainData.getHumidityIn() + "");
+ grainTH.setTemperature(grainData.getTempIn() + "");
+ grainTH.setAirHumidity(grainData.getHumidityOut() + "");
+ grainTH.setAirTemperature(grainData.getTempOut() + "");
+
+ List<KafkaGrainTH> temperatureAndhumidity = new ArrayList<>();
+ temperatureAndhumidity.add(grainTH);
+
+ trhInfo.put("temperatureAndhumidity", temperatureAndhumidity);
+
+
+ JSONObject params = new JSONObject();
+ params.put("TRHInfo", trhInfo);
+
+ result.setParams(params);
+
+
+ resp.setData(JSONObject.toJSONString(result));
+
+ return resp;
+ }
+
+
+
+
+ // ----------------------------------------------------
+
+ @Override
+ public BaseResp grainData2GatewayApiInfoKafka(GrainData grainData, GatewayDevice device) {
+
+ BaseResp resp = new BaseResp();
+
+ GrainCableData cableData = GatewayUtils.getCableData(device);
+
+ if (null == device.getDepotType()) device.setDepotType(DepotType.TYPE_01.getCode());
+
+// //琛ㄧず绛掍粨
+// if (DepotType.TYPE_02.getCode().equals(device.getDepotType()) || DepotType.TYPE_04.getCode().equals(device.getDepotType())) {
+// return grainData2GatewayApiInfo2(grainData, device, cableData);
+// }
+//
+// //琛ㄧず涓虹瓛浠撳寘鎷补缃愪粨
+// if (DepotType.TYPE_03.getCode().equals(device.getDepotType())) {
+// return grainData2GatewayApiInfo3(grainData, device, cableData);
+// }
+ GrainOutPut output = JSONObject.parseObject(grainData.getOutput(),GrainOutPut.class);
+ KafaGrainData result = new KafaGrainData();
+ result.setMessageId(ScConstant.getMessageId());
+ result.setMessgeId(result.getMessageId());
+ result.setDeviceID(device.getDeviceId());
+ result.setAvgTemperature(output.getAvgTemperature());
+ result.setMinTemperature(output.getMinTemperature());
+ result.setMaxTemperature(output.getMaxTemperature() );
+ result.setCollectTime(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+
+ //灞傝鍒�
+ int cableZ = cableData.getCableZ();
+ int cableY = cableData.getCableY();
+ int cableX = cableData.getCableX();
+
+ //娓╁害闆嗗悎
+ List<GrainTemp> attr = output.getTemperature();
+
+ //鏍瑰彿
+ int cableNum = 1, position = 0;
+ String curTemp;
+ List<KafkaGrainDataDetail1> temperature = new ArrayList<>();
+
+ int x = 0, y = 0, z = 0;
+ for (int i = 0; i < attr.size(); i++) {
+ position = i;
+ z = i % cableZ + 1;
+ x = i / (cableZ * cableY);
+ y = x * (cableZ * cableY);
+ y = (i - y) / cableZ;
+ // 鍊掕浆X杞�
+ x = cableX - 1 - x;
+ //鏍瑰彿
+ cableNum = (i / cableZ) + 1;
+ curTemp = attr.get(i).getTemperature();
+
+
+ //濡傛灉鏄紓甯稿��,鎵ц璋冩暣鏁版嵁 TODO
+ if (Double.valueOf(curTemp) < -99.9) {
+
+ curTemp = output.getAvgTemperature();
+
+ } else {
+ //鍒ゆ柇鏈�澶�
+ if (curTemp.equals(result.getMaxTemperature())) {
+ result.setMaxX(x + "");
+ result.setMaxY(y + "");
+ result.setMaxZ(position + "");
+ }
+ //鍒ゆ柇鏈�灏�
+ if (curTemp.equals(result.getMinTemperature())) {
+ result.setMinX(x + "");
+ result.setMinY(y + "");
+ result.setMinZ(position + "");
+ }
+ }
+
+ temperature.add(new KafkaGrainDataDetail1(cableNum + "", z + "", curTemp, position + "", x + "", y + ""));
+ }
+
+ //绮俯淇℃伅
+ JSONObject trhInfo = new JSONObject();
+ // TRHInfo trhInfo = new TRHInfo();
+ trhInfo.put("temperature", temperature);
+
+
+ //浠撴俯搴︿俊鎭�
+ KafkaGrainTH grainTH = new KafkaGrainTH();
+ List<GrainTH> ths= output.getTemperatureAndhumidity();
+ grainTH.setHumidity(ths.get(0).getHumidity());
+ grainTH.setTemperature(ths.get(0).getTemperature() );
+
+ GrainWeather weather = JSON.parseObject(grainData.getWeatherStation(),GrainWeather.class);
+ grainTH.setAirHumidity(weather.getHumidity());
+ grainTH.setAirTemperature(weather.getTemperature() );
+
+ List<KafkaGrainTH> temperatureAndhumidity = new ArrayList<>();
+ temperatureAndhumidity.add(grainTH);
+
+ trhInfo.put("temperatureAndhumidity", temperatureAndhumidity);
+
+
+ JSONObject params = new JSONObject();
+ params.put("TRHInfo", trhInfo);
+
+ result.setParams(params);
+
+
+ resp.setData(JSONObject.toJSONString(result));
+
+ return resp;
+ }
+
+
+
+ /**
+ * 鑾峰彇褰撶偣鎵�鍦ㄥ湀
+ *
+ * @param cableNum
+ * @param cableData
+ * @return
+ */
+ private int getCirCleKafka(int position, int cableNum, GrainCableData cableData) {
+
+ int num1 = 1, num2 = 2;
+ String[] attCable = cableData.getCableRule().split("-");
+
+ if (cableData.getTotalCircle() == 1) return 1;
+
+ if (cableData.getTotalCircle() == 2) {
+ num1 = Integer.valueOf(attCable[0]);
+
+ if (cableNum <= num1) return 1;
+
+ return 2;
+ }
+
+ if (cableData.getTotalCircle() == 3) {
+ num1 = Integer.valueOf(attCable[0]);
+ num2 = num1 + Integer.valueOf(attCable[1]);
+ if (cableNum <= num1) return 1;
+
+ if (cableNum <= num2) return 2;
+
+ return 3;
+ }
+
+ if (cableData.getTotalCircle() == 4) {
+ num1 = Integer.valueOf(attCable[0]);
+ num2 = num1 + Integer.valueOf(attCable[1]);
+ if (cableNum <= num1) return 1;
+
+ if (cableNum <= num2) return 2;
+
+ num2 = num1 + Integer.valueOf(attCable[1]) + Integer.valueOf(attCable[2]);
+
+ if (cableNum <= num2) return 3;
+
+ return 4;
+ }
+
+ return 1;
+ }
+
+
}
--
Gitblit v1.9.3