From 9934bdd6043c55155fea761d0dd687c443849b4b Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 31 十月 2023 17:53:57 +0800
Subject: [PATCH] 四川省网关接口相关13
---
src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java | 127 +++++++++++++++++++++++++++--------------
1 files changed, 83 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
index 1135ee6..b3b59e9 100644
--- a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
+++ b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
@@ -1,5 +1,6 @@
package com.fzzy.gateway.service;
+import com.alibaba.fastjson2.JSONObject;
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
@@ -10,11 +11,12 @@
import com.fzzy.gateway.GatewayUtils;
import com.fzzy.gateway.api.DeviceReportService;
import com.fzzy.gateway.api.GatewayRemoteManager;
-import com.fzzy.gateway.data.QueryParam;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
-import com.fzzy.gateway.hx2023.data.GrainData;
-import com.fzzy.gateway.hx2023.data.GrainDataDetail;
+import com.fzzy.gateway.hx2023.data.KafaGrainData;
+import com.fzzy.gateway.hx2023.data.KafkaGrainDataDetail;
+import com.fzzy.gateway.hx2023.data.KafkaGrainTH;
+import com.fzzy.gateway.hx2023.data.TRHInfo;
import com.fzzy.gateway.service.repository.GatewayDeviceRep;
import lombok.extern.slf4j.Slf4j;
@@ -121,7 +123,7 @@
* @return
*/
@Expose
- public String ajaxTestGrain(Map<String,Object> parameter) {
+ public String ajaxTestGrain(Map<String, Object> parameter) {
//鑾峰彇璁惧閰嶇疆锛屽彧閽堝绮儏璁惧杩涜鎵ц
@@ -139,32 +141,32 @@
//濡傛灉閮ㄧ讲FZZY-IGDS-V40鐗堟湰绯荤粺
- return this.pushByV40(list, start,end);
+ return this.pushByV40(list, start, end);
}
- private String pushByV40(List<GatewayDevice> list, Date start,Date end) {
+ private String pushByV40(List<GatewayDevice> list, Date start, Date end) {
String depotIdSys;
List<Fz40Grain> listGrain;
Fz40Grain lastData;
- GrainData pushData;
+ KafaGrainData pushData;
DeviceReportService deviceReportService = null;
for (GatewayDevice device : list) {
depotIdSys = device.getDepotIdSys();
if (StringUtils.isEmpty(depotIdSys)) {
- log.info("--------璁惧--{}-鏈厤缃郴缁熺浉鍏充粨搴撶紪鐮侊紝鏃犳硶鎵ц褰撳墠鎿嶄綔",device.getDeviceName());
+ log.info("--------璁惧--{}-鏈厤缃郴缁熺浉鍏充粨搴撶紪鐮侊紝鏃犳硶鎵ц褰撳墠鎿嶄綔", device.getDeviceName());
continue;
}
listGrain = fzzy40CommonService.listGrain(depotIdSys, start, end);
if (null == listGrain || listGrain.isEmpty()) {
- log.info("---------璁惧---{}--鏈悓姝ュ埌绮儏淇℃伅锛岃纭褰撳墠鏉′欢涓嬫槸鍚︽湁鏁版嵁",device.getDeviceName());
+ log.info("---------璁惧---{}--鏈悓姝ュ埌绮儏淇℃伅锛岃纭褰撳墠鏉′欢涓嬫槸鍚︽湁鏁版嵁", device.getDeviceName());
continue;
}
@@ -193,8 +195,8 @@
* @param lastData
* @return
*/
- private GrainData lastData2PushData(Fz40Grain lastData, GatewayDevice device) {
- GrainData result = new GrainData();
+ private KafaGrainData lastData2PushData(Fz40Grain lastData, GatewayDevice device) {
+ KafaGrainData result = new KafaGrainData();
result.setMessageId(ScConstant.getMessageId());
result.setDeviceID(device.getDeviceId());
@@ -206,63 +208,100 @@
//灞�-琛�-鍒�
String[] attrCable = lastData.getCable().split("-");
- //灞傞厤缃�
- int layMax = Integer.valueOf(attrCable[0]);
- //閽堝绛掍粨閰嶇疆
- String[] cableCirAtt = new String[0];
if (StringUtils.isNotEmpty(lastData.getCableCir())) {
- cableCirAtt = lastData.getCableCir().split("-");
+ return lastData2PushData2(lastData, device);
}
+
+ //灞傝鍒�
+ int cableZ = Integer.valueOf(attrCable[0]);
+ int cableY = Integer.valueOf(attrCable[1]);
+ int cableX = Integer.valueOf(attrCable[2]);
//娓╁害闆嗗悎
String[] attr = lastData.getPoints().split(",");
//鏍瑰彿
- int cableNum = 1, layerNumber = 1, position = 0;
+ int cableNum = 1, position = 0;
- int curCir = 1;//鎵�鍦ㄥ湀
- int cirLay = 1;//褰撳墠鍦堢殑灞�
String curTemp;
- List<GrainDataDetail> details = new ArrayList<>();
+ List<KafkaGrainDataDetail> temperature = new ArrayList<>();
+
+ int x = 0, y = 0, z = 0;
for (int i = 0; i < attr.length; i++) {
+
position = i;
- curTemp = attr[i];
+
+ z = i % cableZ + 1;
+ x = i / (cableZ * cableY);
+ y = x * (cableZ * cableY);
+ y = (i - y) / cableZ;
+
+ // 鍊掕浆X杞�
+ x = cableX - 1 - x;
+
//鏍瑰彿
- cableNum = (i / layMax) + 1;
- layerNumber = (i % layMax) + 1;
+ cableNum = (i / cableZ) + 1;
- if (cableCirAtt.length > 0) {
- curCir = getCurCir(cableNum, attrCable);
- cirLay = Integer.valueOf(cableCirAtt[curCir - 1]);
-
- details.add(new GrainDataDetail(cableNum, cirLay, position, curTemp));
- } else {
-
- //鍒ゆ柇鏈�澶� TODO 寰呬紭鍖�
- if (curTemp.equals(result.getMaxTemperature())) {
- result.setMaxX(cableNum + "");
- result.setMaxZ(curTemp);
- }
+ curTemp = attr[i];
- //鍒ゆ柇鏈�灏� TODO 寰呬紭鍖�
- if (curTemp.equals(result.getMinTemperature())) {
- result.setMinX(cableNum + "");
- result.setMinZ(curTemp);
- }
-
-
- details.add(new GrainDataDetail(cableNum, layerNumber, position, curTemp));
+ //鍒ゆ柇鏈�澶�
+ 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 KafkaGrainDataDetail(cableNum + "", z + "", curTemp, position + "", x, y));
}
- result.setTemperature(details);
+ //绮俯淇℃伅
+ TRHInfo trhInfo = new TRHInfo();
+ trhInfo.setTemperature(temperature);
+
+
+ //浠撴俯搴︿俊鎭�
+ KafkaGrainTH grainTH = new KafkaGrainTH();
+ grainTH.setHumidity(lastData.getHumidityIn() + "");
+ grainTH.setTemperature(lastData.getTempIn() + "");
+ grainTH.setAirHumidity(lastData.getHumidityOut() + "");
+ grainTH.setAirTemperature(lastData.getTempOut() + "");
+
+ List<KafkaGrainTH> temperatureAndhumidity = new ArrayList<>();
+ temperatureAndhumidity.add(grainTH);
+
+ trhInfo.setTemperatureAndhumidity(temperatureAndhumidity);
+
+
+ JSONObject params = new JSONObject();
+ params.put("TRHInfo", trhInfo);
+
+ result.setParams(params);
return result;
}
+ /**
+ * 閽堝绛掍粨 TODO -----
+ *
+ * @param lastData
+ * @param device
+ * @return
+ */
+ private KafaGrainData lastData2PushData2(Fz40Grain lastData, GatewayDevice device) {
+
+ return null;
+ }
+
private int getCurCir(int curRoot, String[] cableRuleAtt) {
int sum = 0;
--
Gitblit v1.9.3