手动测试

vince

2023-11-08 c62275188c4b8fd34fdfd3555fe634571f8044a4

 src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java

@@ -1,5 +1,6 @@
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;
@@ -18,6 +19,7 @@
import com.fzzy.gateway.hx2023.websocket.WebSocketDeviceReport;
import com.fzzy.gateway.service.repository.GatewayDeviceRep;

import com.fzzy.mqtt.MqttPublishService;
import lombok.extern.slf4j.Slf4j;

import org.apache.commons.lang.StringUtils;
@@ -45,7 +47,7 @@
    @Resource
    private GatewayRemoteManager gatewayRemoteManager;
    @Resource
    private WebSocketDeviceReport webSocketDeviceReport;
    private MqttPublishService mqttPublishService;
    /**
     * gatewayDeviceService#listAll
     *
@@ -125,8 +127,9 @@
     * @return
     */
    @Expose
    public String ajaxTestWeight(Map<String, Object> parameter) {
        double weigh = (double) parameter.get("weight");
    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 "没有设备";
@@ -135,6 +138,8 @@
       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();
@@ -161,13 +166,60 @@

            packet.setTimestamp(System.currentTimeMillis());


            webSocketDeviceReport.sendByPacket(packet);
            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
@@ -177,7 +229,7 @@
     * @return
     */
    @Expose
    public String ajaxTestGrain(Map<String, Object> parameter) {
    public String ajaxTestGrain(GateWayTestParam parameter) {

        //获取设备配置，只针对粮情设备进行执行

@@ -187,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);