From 1f5947ccb5b02817dbe5aaae943c0a7fcfc2cd62 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 09 十一月 2023 00:54:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java | 287 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 218 insertions(+), 69 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
index 67f8bdd..55c6cf2 100644
--- a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
+++ b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
@@ -1,8 +1,11 @@
package com.fzzy.gateway.service;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSONObject;
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.fzzy.api.data.GatewayDeviceType;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.DateUtil;
import com.fzzy.async.fzzy40.Fzzy40CommonService;
@@ -10,27 +13,28 @@
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.data.BaseResp;
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.*;
import com.fzzy.gateway.service.repository.GatewayDeviceRep;
+import com.fzzy.mqtt.MqttProviderConfig;
+import com.fzzy.mqtt.MqttPublishService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.RandomUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
@Slf4j
@Component
@@ -42,6 +46,10 @@
private Fzzy40CommonService fzzy40CommonService;
@Resource
private GatewayRemoteManager gatewayRemoteManager;
+ @Resource
+ private MqttPublishService mqttPublishService;
+ @Resource
+ private MqttProviderConfig providerClient;
/**
* gatewayDeviceService#listAll
@@ -57,28 +65,27 @@
/**
* gatewayDeviceService#updateSave
*
- * @param entity
+ * @param data
*/
@DataResolver
- public void updateSave(GatewayDevice entity) {
- GatewayDevice data = new GatewayDevice();
- BeanUtils.copyProperties(entity, data);
+ public void updateSave(GatewayDevice data) {
+ GatewayDevice data2 = new GatewayDevice();
+ BeanUtils.copyProperties(data, data2);
- if (null == data.getId()) {
- data.setId(ContextUtil.getUUID());
- }
-
-
- if (null == data.getDeviceSn()) {
- if (null != entity.getIp()) {
- data.setDeviceSn(entity.getIp());
+ if (null == data2.getDeviceSn()) {
+ if (null != data2.getIp()) {
+ data.setDeviceSn(data2.getIp());
} else {
- data.setDeviceSn(data.getDeviceId());
+ data.setDeviceSn(data2.getDeviceId());
}
}
- gatewayDeviceRep.save(data);
-
+ if (null == data2.getId()) {
+ data2.setId(ContextUtil.getUUID());
+ gatewayDeviceRep.save(data2);
+ } else {
+ gatewayDeviceRep.save(data2);
+ }
flushCache();
}
@@ -100,10 +107,6 @@
}
- /**
- * gatewayDeviceService#flushCache
- */
- @Expose
public void flushCache() {
List<GatewayDevice> list = listAll();
if (null == list || list.isEmpty()) return;
@@ -114,6 +117,109 @@
/**
+ * gatewayDeviceService#ajaxTestWeight
+ * 鍦扮鎺ㄩ�佹祴璇�
+ *
+ * @param parameter
+ * @return
+ */
+ @Expose
+ public String ajaxTestWeight() {
+ //double weigh = (double) parameter.getWeight();
+ double weigh = Math.random() * (35000 - 16000 + 1) + 16000;
+ List<GatewayDevice> devices = listAll();
+ if (devices == null || devices.size() <= 0) {
+ return "娌℃湁璁惧";
+ }
+ List<GatewayDevice> weights = devices.stream().filter(s -> (GatewayDeviceType.TYPE_01.getCode().equals(s.getType()))).collect(Collectors.toList());
+ if (weights == null || weights.size() <= 0) {
+ return "娌℃湁鑾峰彇鍒板湴纾呰澶�";
+ }
+ String topic = "/device/hx-weigh-big-01/91511424746940066Y001_91511424746940066Y0010000_002_004_002_001/message/property/report";
+
+ for (GatewayDevice device : weights) {
+
+ WebSocketPacket packet = new WebSocketPacket();
+
+ //productId鐨勫�煎湪webSocket鎵ц鍙戦�佹柟娉曚腑琛ュ厖
+ WebSocketPacketHeader header = new WebSocketPacketHeader();
+ header.setDeviceName(device.getDeviceName());
+ header.setProductId("hx-weigh-big-01");
+ //header.set
+ packet.setHeaders(header);
+ packet.setMessageType(ScConstant.MESSAGE_TYPE_REPORT_PROPERTY);
+ packet.setDeviceId(device.getDeviceId());
+
+ //璁剧疆淇℃伅涓讳綋
+ WeightInfo weightInfo = new WeightInfo();
+ weightInfo.setGrossWeight(weigh);
+ weightInfo.setNetWeight(weigh);
+ weightInfo.setNetWeight(weigh);
+ weightInfo.setWeightUnit("KG");
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("weightInfo", JSONObject.toJSONString(weightInfo));
+
+ packet.setProperties(jsonObject);
+
+ packet.setTimestamp(System.currentTimeMillis());
+
+ topic = "/device/" + header.getProductId() + "/" + device.getDeviceId() + "/message/property/report";
+ mqttPublishService.publishMsg(topic, JSON.toJSONString(packet));
+ }
+ return "SUCCESS";
+ }
+
+ /**
+ * gatewayDeviceService#ajaxTestLpr
+ * 鍦扮鎺ㄩ�佹祴璇�
+ *
+ * @return
+ */
+ @Expose
+ public String ajaxTestLpr() {
+ //String carNumber = parameter.getCarNumber();
+ String carNumber = "宸滱12345";
+ List<GatewayDevice> devices = listAll();
+ if (devices == null || devices.size() <= 0) {
+ return "娌℃湁璁惧";
+ }
+ List<GatewayDevice> weights = devices.stream().filter(s -> (GatewayDeviceType.TYPE_02.getCode().equals(s.getType()))).collect(Collectors.toList());
+ if (weights == null || weights.size() <= 0) {
+ return "娌℃湁鑾峰彇鍒拌澶�";
+ }
+ String topic = "/device/hx-weigh-big-01/91511424746940066Y001_91511424746940066Y0010000_002_004_002_001/message/property/report";
+
+ for (GatewayDevice device : weights) {
+
+ WebSocketPacket packet = new WebSocketPacket();
+
+ //productId鐨勫�煎湪webSocket鎵ц鍙戦�佹柟娉曚腑琛ュ厖
+ WebSocketPacketHeader header = new WebSocketPacketHeader();
+ header.setDeviceName(device.getDeviceName());
+ header.setProductId("hx-catch-01");
+ //header.set
+ packet.setHeaders(header);
+ packet.setMessageType(ScConstant.MESSAGE_TYPE_REPORT_PROPERTY);
+ packet.setDeviceId(device.getDeviceId());
+ packet.setMessageId(System.currentTimeMillis() + "");
+ //璁剧疆淇℃伅涓讳綋
+ LprData lpr = new LprData();
+ lpr.setDeviceId(device.getDeviceId());
+ lpr.setCarNumber(carNumber);
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("carNumber", carNumber);
+ jsonObject.put("position", "big");
+ packet.setProperties(jsonObject);
+
+ packet.setTimestamp(System.currentTimeMillis());
+
+ topic = "/device/" + header.getProductId() + "/" + device.getDeviceId() + "/message/property/report";
+ mqttPublishService.publishMsg(topic, JSON.toJSONString(packet));
+ }
+ return "SUCCESS";
+ }
+
+ /**
* gatewayDeviceService#ajaxTestGrain
* 绮儏鎺ㄩ�佹祴璇�
*
@@ -121,7 +227,7 @@
* @return
*/
@Expose
- public String ajaxTestGrain(Map<String,Object> parameter) {
+ public String ajaxTestGrain(GateWayTestParam parameter) {
//鑾峰彇璁惧閰嶇疆锛屽彧閽堝绮儏璁惧杩涜鎵ц
@@ -131,7 +237,7 @@
return "ERROR锛氫负鑾峰彇鍒扮郴缁熶腑璁惧閰嶇疆锛屽彇娑堟墽琛�";
}
- Date dayTime = (Date) parameter.get("dayTime");
+ Date dayTime = (Date) parameter.getDayTime();
if (null == dayTime) dayTime = new Date();
Date start = DateUtil.getCurZero(dayTime);
@@ -139,32 +245,35 @@
//濡傛灉閮ㄧ讲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,11 +302,12 @@
* @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());
+ result.setMessgeId(result.getMessageId());
+ result.setDeviceID(device.getDeviceId());
result.setAvgTemperature(lastData.getTempAve() + "");
result.setMinTemperature(lastData.getTempMin() + "");
result.setMaxTemperature(lastData.getTempMax() + "");
@@ -206,63 +316,102 @@
//灞�-琛�-鍒�
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<KafkaGrainDataDetail1> 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 KafkaGrainDataDetail1(cableNum + "", z + "", curTemp, position + "", x + "", y + ""));
}
- result.setTemperature(details);
+ //绮俯淇℃伅
+
+ JSONObject trhInfo = new JSONObject();
+ // TRHInfo trhInfo = new TRHInfo();
+ trhInfo.put("temperature", 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.put("temperatureAndhumidity", temperatureAndhumidity);
+ //trhInfo.put("temperatureAndhumidity",grainTH);
+
+ 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