src/main/java/com/fzzy/gateway/hx2023/data/GateWayTestParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/fzzy/gateway/view/GatewayConf.view.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/fzzy/gateway/hx2023/data/GateWayTestParam.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,20 @@ package com.fzzy.gateway.hx2023.data; import lombok.Data; import java.util.Date; @Data public class GateWayTestParam { private Date start; private Date end; private Date dayTime; private Double weight; private String carNumber; } src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
@@ -127,9 +127,9 @@ * @return */ @Expose public String ajaxTestWeight() { //double weigh = (double) parameter.get("weight"); double weigh = Double.parseDouble("3500.0"); public String ajaxTestWeight(GateWayTestParam parameter) { double weigh = (double) parameter.getWeight(); //double weigh = Double.parseDouble("3500.0"); List<GatewayDevice> devices = listAll(); if(devices == null || devices.size()<= 0){ return "没æè®¾å¤"; @@ -166,13 +166,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 = "å·A12345"; 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()); //设置信æ¯ä¸»ä½ 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 @@ -182,7 +229,7 @@ * @return */ @Expose public String ajaxTestGrain(Map<String, Object> parameter) { public String ajaxTestGrain(GateWayTestParam parameter) { //è·å设å¤é ç½®ï¼åªé对粮æ 设å¤è¿è¡æ§è¡ @@ -192,7 +239,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); src/main/java/com/fzzy/gateway/view/GatewayConf.view.xml
@@ -83,18 +83,24 @@ </PropertyDef> </DataType> <DataType name="dtParam" parent="Map"> <Property name="creationType">com.fzzy.gateway.hx2023.data.GateWayTestParam</Property> <PropertyDef name="start"> <Property name="dataType">Date</Property> <Property name="dataType">DateTime</Property> </PropertyDef> <PropertyDef name="end"> <Property name="dataType">Date</Property> <Property name="dataType">DateTime</Property> </PropertyDef> <PropertyDef name="dayTime"> <Property name="dataType">Date</Property> <Property name="dataType">DateTime</Property> <Property name="label">éæ©æ¶é´</Property> </PropertyDef> <PropertyDef name="weight"> <Property name="label">éé</Property> <Property name="dataType">Double</Property> <Property name="defaultValue">0.0</Property> </PropertyDef> <PropertyDef name="carNumber"> <Property name="label">车ç</Property> </PropertyDef> </DataType> </Model> @@ -161,6 +167,12 @@ <ToolBarButton> <ClientEvent name="onClick">view.get("#dialogWeight").show();</ClientEvent> <Property name="caption">å°ç£ æ¨éæµè¯</Property> <Property name="iconClass">fa fa-search</Property> <Property name="exClassName">toolbar-button-push</Property> </ToolBarButton> <ToolBarButton> <ClientEvent name="onClick">view.get("#dialogLpr").show();</ClientEvent> <Property name="caption">è½¦çæ¨éæµè¯</Property> <Property name="iconClass">fa fa-search</Property> <Property name="exClassName">toolbar-button-push</Property> </ToolBarButton> @@ -353,7 +365,7 @@ <Buttons> <Button> <ClientEvent name="onClick">var data = view.get("#dsQuery.data");
 view.get("#ajaxTestGrain").set("parameter",data.toJSON()).execute(function(result){
 view.get("#ajaxTestGrain").set("parameter",data).execute(function(result){
 self.get("parent").hide();
 $alert(result);
 });</ClientEvent> @@ -392,7 +404,7 @@ <Buttons> <Button> <ClientEvent name="onClick">var data = view.get("#dsQuery.data");
 view.get("#ajaxTestWeight").set("parameter",data.get("weight")).execute(function(result){
 view.get("#ajaxTestWeight").set("parameter",data).execute(function(result){
 self.get("parent").hide();
 $alert(result);
 });</ClientEvent> @@ -420,5 +432,40 @@ <Property name="service">gatewayDeviceService#ajaxTestWeight</Property> <Property name="executingMessage">å¨åªåæ§è¡ä¸â¦â¦</Property> </AjaxAction> <Dialog id="dialogLpr"> <Property name="width">400</Property> <Property name="height">300</Property> <Property name="caption">è¾å ¥è½¦ç</Property> <Buttons> <Button> <ClientEvent name="onClick">var data = view.get("#dsQuery.data");
 view.get("#ajaxTestLpr").set("parameter",data).execute(function(result){
 self.get("parent").hide();
 $alert(result);
 });</ClientEvent> <Property name="caption">ç¡®å®æ§è¡</Property> </Button> <Button> <ClientEvent name="onClick">view.get("#dialogLpr").hide();</ClientEvent> <Property name="caption">åæ¶æ§è¡</Property> </Button> </Buttons> <Children> <AutoForm> <Property name="dataSet">dsQuery</Property> <Property name="cols">*</Property> <AutoFormElement> <Property name="name">carNumber</Property> <Property name="property">carNumber</Property> <Editor/> </AutoFormElement> </AutoForm> </Children> <Tools/> </Dialog> <AjaxAction id="ajaxTestLpr"> <Property name="service">gatewayDeviceService#ajaxTestLpr</Property> <Property name="executingMessage">å¨åªåæ§è¡ä¸â¦â¦</Property> </AjaxAction> </View> </ViewConfig>