From f9de63b6b72c97c4dfabe2a7b5aee3b8a4f11f0a Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期二, 07 十一月 2023 23:57:09 +0800
Subject: [PATCH] 增加地磅按钮
---
src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java | 91 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 74 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
index b3b59e9..438b8d3 100644
--- a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
+++ b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
@@ -4,6 +4,7 @@
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;
@@ -13,10 +14,8 @@
import com.fzzy.gateway.api.GatewayRemoteManager;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
-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.hx2023.data.*;
+import com.fzzy.gateway.hx2023.websocket.WebSocketDeviceReport;
import com.fzzy.gateway.service.repository.GatewayDeviceRep;
import lombok.extern.slf4j.Slf4j;
@@ -33,6 +32,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
@Slf4j
@Component
@@ -44,7 +44,8 @@
private Fzzy40CommonService fzzy40CommonService;
@Resource
private GatewayRemoteManager gatewayRemoteManager;
-
+ @Resource
+ private WebSocketDeviceReport webSocketDeviceReport;
/**
* gatewayDeviceService#listAll
*
@@ -113,6 +114,59 @@
GatewayUtils.add2Cache(device);
}
}
+
+
+
+ /**
+ * gatewayDeviceService#ajaxTestWeight
+ * 鍦扮鎺ㄩ�佹祴璇�
+ *
+ * @param parameter
+ * @return
+ */
+ @Expose
+ public String ajaxTestWeight(Map<String, Object> parameter) {
+ double weigh = (double) parameter.get("weight");
+ 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 "娌℃湁鑾峰彇鍒板湴纾呰澶�";
+ }
+ 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());
+
+
+ webSocketDeviceReport.sendByPacket(packet);
+ }
+ return "SUCCESS";
+ }
+
/**
@@ -199,6 +253,7 @@
KafaGrainData result = new KafaGrainData();
result.setMessageId(ScConstant.getMessageId());
+ result.setMessgeId(result.getMessageId());
result.setDeviceID(device.getDeviceId());
result.setAvgTemperature(lastData.getTempAve() + "");
result.setMinTemperature(lastData.getTempMin() + "");
@@ -225,7 +280,7 @@
int cableNum = 1, position = 0;
String curTemp;
- List<KafkaGrainDataDetail> temperature = new ArrayList<>();
+ List<KafkaGrainDataDetail1> temperature = new ArrayList<>();
int x = 0, y = 0, z = 0;
for (int i = 0; i < attr.length; i++) {
@@ -248,25 +303,27 @@
//鍒ゆ柇鏈�澶�
if (curTemp.equals(result.getMaxTemperature())) {
- result.setMaxX(x);
- result.setMaxY(y);
- result.setMaxZ(position);
+ result.setMaxX(x+"");
+ result.setMaxY(y+"");
+ result.setMaxZ(position+"");
}
//鍒ゆ柇鏈�灏�
if (curTemp.equals(result.getMinTemperature())) {
- result.setMinX(x);
- result.setMinY(y);
- result.setMinZ(position);
+ result.setMinX(x+"");
+ result.setMinY(y+"");
+ result.setMinZ(position+"");
}
- temperature.add(new KafkaGrainDataDetail(cableNum + "", z + "", curTemp, position + "", x, y));
+ temperature.add(new KafkaGrainDataDetail1(cableNum + "", z + "", curTemp, position + "", x+"", y+""));
}
//绮俯淇℃伅
- TRHInfo trhInfo = new TRHInfo();
- trhInfo.setTemperature(temperature);
+
+ JSONObject trhInfo = new JSONObject();
+ // TRHInfo trhInfo = new TRHInfo();
+ trhInfo.put("temperature",temperature);
//浠撴俯搴︿俊鎭�
@@ -279,8 +336,8 @@
List<KafkaGrainTH> temperatureAndhumidity = new ArrayList<>();
temperatureAndhumidity.add(grainTH);
- trhInfo.setTemperatureAndhumidity(temperatureAndhumidity);
-
+ trhInfo.put("temperatureAndhumidity",temperatureAndhumidity);
+ //trhInfo.put("temperatureAndhumidity",grainTH);
JSONObject params = new JSONObject();
params.put("TRHInfo", trhInfo);
--
Gitblit v1.9.3