Merge remote-tracking branch 'orgin/igds-api-gateway' into igds-api-gateway

vince

2023-11-08 96f7af2f3bf9a36dd48e0e6bf4f8a8ca1e31ed7d

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

@@ -1,9 +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;
@@ -16,6 +18,7 @@
import com.fzzy.gateway.hx2023.data.*;
import com.fzzy.gateway.service.repository.GatewayDeviceRep;

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

import org.apache.commons.lang.StringUtils;
@@ -30,6 +33,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

@Slf4j
@Component
@@ -41,7 +45,8 @@
    private Fzzy40CommonService fzzy40CommonService;
    @Resource
    private GatewayRemoteManager gatewayRemoteManager;

    @Resource
    private MqttPublishService mqttPublishService;
    /**
     * gatewayDeviceService#listAll
     *
@@ -56,28 +61,27 @@
    /**
     * gatewayDeviceService#updateSave
     *
     * @param entity
     * @param data
     */
    @DataResolver
    public void updateSave(GatewayDevice entity) {
        GatewayDevice data = new GatewayDevice();
        BeanUtils.copyProperties(entity, data);

        if (null == data.getId()) {
            data.setId(ContextUtil.getUUID());
        }


        if (null == data.getDeviceSn()) {
            if (null != entity.getIp()) {
                data.setDeviceSn(entity.getIp());
    public void updateSave(GatewayDevice data) {
        GatewayDevice data2 = new GatewayDevice();
        BeanUtils.copyProperties(data, data2);
        
        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();
    }

@@ -99,10 +103,6 @@
    }


    /**
     * gatewayDeviceService#flushCache
     */
    @Expose
    public void flushCache() {
        List<GatewayDevice> list = listAll();
        if (null == list || list.isEmpty()) return;
@@ -112,6 +112,112 @@
    }






    /**
     * gatewayDeviceService#ajaxTestWeight
     * 地磅推送测试
     *
     * @param parameter
     * @return
     */
    @Expose
    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 "没有设备";
        }
        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 = "川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
     * 粮情推送测试
@@ -120,7 +226,7 @@
     * @return
     */
    @Expose
    public String ajaxTestGrain(Map<String, Object> parameter) {
    public String ajaxTestGrain(GateWayTestParam parameter) {

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

@@ -130,7 +236,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);