From 814b453961763bf1b60af85f9f3bdc4682659ae8 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 15 一月 2024 20:28:54 +0800
Subject: [PATCH] 添加手动推送粮情接口，以便第三方接口调用
---
src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java | 125 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 119 insertions(+), 6 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 41bc49a..b21e3ff 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
@@ -2,24 +2,25 @@
import com.alibaba.fastjson2.JSONObject;
import com.fzzy.api.data.PushProtocol;
+import com.fzzy.async.fzzy40.entity.Fz40Grain;
import com.fzzy.data.ConfigData;
import com.fzzy.gateway.api.GatewayDeviceReportService;
import com.fzzy.gateway.data.BaseReqData;
import com.fzzy.gateway.data.BaseResp;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
-import com.fzzy.gateway.hx2023.data.LprData;
-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 jdk.nashorn.internal.runtime.regexp.joni.Config;
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.List;
@Slf4j
@Component
@@ -144,8 +145,9 @@
}
@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) {
@@ -159,4 +161,115 @@
kafkaDeviceReportService.publishWithTopic(reqData.getData(), topic);
return new BaseResp();
}
+
+ @Override
+ public BaseResp grainData2GatewayApiInfo(Fz40Grain grainData, GatewayDevice device) {
+
+ 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"));
+
+ //灞�-琛�-鍒�
+ String[] attrCable = grainData.getCable().split("-");
+ if (StringUtils.isNotEmpty(grainData.getCableCir())) {
+ return grainData2GatewayApiInfo2(grainData, device);
+ }
+
+ //灞傝鍒�
+ int cableZ = Integer.valueOf(attrCable[0]);
+ int cableY = Integer.valueOf(attrCable[1]);
+ int cableX = Integer.valueOf(attrCable[2]);
+
+ //娓╁害闆嗗悎
+ 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);
+ //trhInfo.put("temperatureAndhumidity",grainTH);
+
+ JSONObject params = new JSONObject();
+ params.put("TRHInfo", trhInfo);
+
+ result.setParams(params);
+
+
+ //resp.setObj(result);
+
+ resp.setData(JSONObject.toJSONString(result));
+
+ return resp;
+ }
+
+ private BaseResp grainData2GatewayApiInfo2(Fz40Grain grainData, GatewayDevice device) {
+ BaseResp resp = new BaseResp();
+ resp.setCode(BaseResp.CODE_500);
+ resp.setMsg("绛掍粨瑙ｆ瀽鏆傛湭瀹炵幇");
+ return resp;
+ }
+
}
--
Gitblit v1.9.3