From 29bd44e8648aa2df488f94e7a947ed6839a33877 Mon Sep 17 00:00:00 2001 From: vince <757871790@qq.com> Date: 星期四, 09 十一月 2023 00:02:18 +0800 Subject: [PATCH] 手动测试 --- src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java | 66 ++++++++++++++++++++++++++++---- 1 files changed, 57 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java index 2fc86ac..fb28b86 100644 --- a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java +++ b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java @@ -22,6 +22,7 @@ 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.data.domain.Sort; @@ -29,10 +30,7 @@ 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 @@ -113,6 +111,9 @@ + + + /** * gatewayDeviceService#ajaxTestWeight * 鍦扮鎺ㄩ�佹祴璇� @@ -122,8 +123,8 @@ */ @Expose public String ajaxTestWeight() { - //double weigh = (double) parameter.get("weight"); - double weigh = Double.parseDouble("3500.0"); + //double weigh = (double) parameter.getWeight(); + double weigh = Math.random() * (35000 - 16000 + 1) + 16000; List<GatewayDevice> devices = listAll(); if(devices == null || devices.size()<= 0){ return "娌℃湁璁惧"; @@ -160,13 +161,60 @@ packet.setTimestamp(System.currentTimeMillis()); - topic = "/device/hx-weigh-big-01/"+device.getDeviceId()+"/message/property/report"; + 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 @@ -176,7 +224,7 @@ * @return */ @Expose - public String ajaxTestGrain(Map<String, Object> parameter) { + public String ajaxTestGrain(GateWayTestParam parameter) { //鑾峰彇璁惧閰嶇疆锛屽彧閽堝绮儏璁惧杩涜鎵ц @@ -186,7 +234,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); -- Gitblit v1.9.3