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

jiazx0107@163.com

2023-11-09 1f5947ccb5b02817dbe5aaae943c0a7fcfc2cd62

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

@@ -13,26 +13,27 @@
import com.fzzy.gateway.GatewayUtils;
import com.fzzy.gateway.api.DeviceReportService;
import com.fzzy.gateway.api.GatewayRemoteManager;
import com.fzzy.gateway.data.BaseResp;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
import com.fzzy.gateway.hx2023.data.*;
import com.fzzy.gateway.service.repository.GatewayDeviceRep;

import com.fzzy.mqtt.MqttProviderConfig;
import com.fzzy.mqtt.MqttPublishService;
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.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Component;

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
@@ -47,6 +48,9 @@
    private GatewayRemoteManager gatewayRemoteManager;
    @Resource
    private MqttPublishService mqttPublishService;
    @Resource
    private MqttProviderConfig providerClient;

    /**
     * gatewayDeviceService#listAll
     *
@@ -67,7 +71,7 @@
    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());
@@ -77,10 +81,10 @@
        }

        if (null == data2.getId()) {
           data2.setId(ContextUtil.getUUID());
            data2.setId(ContextUtil.getUUID());
            gatewayDeviceRep.save(data2);
        }else{
           gatewayDeviceRep.save(data2);
        } else {
            gatewayDeviceRep.save(data2);
        }
        flushCache();
    }
@@ -112,7 +116,6 @@
    }



    /**
     * gatewayDeviceService#ajaxTestWeight
     * 地磅推送测试
@@ -122,19 +125,19 @@
     */
    @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){
        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 "没有获取到地磅设备";
       }
        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) {
        for (GatewayDevice device : weights) {

            WebSocketPacket packet = new WebSocketPacket();

@@ -160,13 +163,61 @@

            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());
            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 +227,7 @@
     * @return
     */
    @Expose
    public String ajaxTestGrain(Map<String, Object> parameter) {
    public String ajaxTestGrain(GateWayTestParam parameter) {

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

@@ -186,7 +237,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);
@@ -197,6 +248,9 @@
        return this.pushByV40(list, start, end);

    }




    private String pushByV40(List<GatewayDevice> list, Date start, Date end) {

@@ -302,27 +356,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 KafkaGrainDataDetail1(cableNum + "", z + "", curTemp, position + "", x+"", y+""));
            temperature.add(new KafkaGrainDataDetail1(cableNum + "", z + "", curTemp, position + "", x + "", y + ""));
        }

        //粮温信息

        JSONObject trhInfo = new JSONObject();
       // TRHInfo trhInfo = new TRHInfo();
        trhInfo.put("temperature",temperature);
        // TRHInfo trhInfo = new TRHInfo();
        trhInfo.put("temperature", temperature);


        //仓温度信息
@@ -335,7 +389,7 @@
        List<KafkaGrainTH> temperatureAndhumidity = new ArrayList<>();
        temperatureAndhumidity.add(grainTH);

        trhInfo.put("temperatureAndhumidity",temperatureAndhumidity);
        trhInfo.put("temperatureAndhumidity", temperatureAndhumidity);
        //trhInfo.put("temperatureAndhumidity",grainTH);

        JSONObject params = new JSONObject();