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,8 +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;
@@ -10,13 +13,12 @@
import com.fzzy.gateway.GatewayUtils;
import com.fzzy.gateway.api.DeviceReportService;
import com.fzzy.gateway.api.GatewayRemoteManager;
import com.fzzy.gateway.data.QueryParam;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
import com.fzzy.gateway.hx2023.data.GrainData;
import com.fzzy.gateway.hx2023.data.GrainDataDetail;
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;
@@ -31,6 +33,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

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

    @Resource
    private MqttPublishService mqttPublishService;
    /**
     * gatewayDeviceService#listAll
     *
@@ -57,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();
    }

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


    /**
     * gatewayDeviceService#flushCache
     */
    @Expose
    public void flushCache() {
        List<GatewayDevice> list = listAll();
        if (null == list || list.isEmpty()) return;
@@ -113,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
     * 粮情推送测试
@@ -121,7 +226,7 @@
     * @return
     */
    @Expose
    public String ajaxTestGrain(Map<String,Object> parameter) {
    public String ajaxTestGrain(GateWayTestParam parameter) {

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

@@ -131,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);
@@ -139,32 +244,32 @@


        //如果部署FZZY-IGDS-V40版本系统
        return this.pushByV40(list, start,end);
        return this.pushByV40(list, start, end);

    }

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

        String depotIdSys;
        List<Fz40Grain> listGrain;

        Fz40Grain lastData;

        GrainData pushData;
        KafaGrainData pushData;

        DeviceReportService deviceReportService = null;
        for (GatewayDevice device : list) {
            depotIdSys = device.getDepotIdSys();

            if (StringUtils.isEmpty(depotIdSys)) {
                log.info("--------设备--{}-未配置系统相关仓库编码，无法执行当前操作",device.getDeviceName());
                log.info("--------设备--{}-未配置系统相关仓库编码，无法执行当前操作", device.getDeviceName());
                continue;
            }

            listGrain = fzzy40CommonService.listGrain(depotIdSys, start, end);

            if (null == listGrain || listGrain.isEmpty()) {
                log.info("---------设备---{}--未同步到粮情信息，请确认当前条件下是否有数据",device.getDeviceName());
                log.info("---------设备---{}--未同步到粮情信息，请确认当前条件下是否有数据", device.getDeviceName());
                continue;
            }

@@ -193,10 +298,11 @@
     * @param lastData
     * @return
     */
    private GrainData lastData2PushData(Fz40Grain lastData, GatewayDevice device) {
        GrainData result = new GrainData();
    private KafaGrainData lastData2PushData(Fz40Grain lastData, GatewayDevice device) {
        KafaGrainData result = new KafaGrainData();

        result.setMessageId(ScConstant.getMessageId());
        result.setMessgeId(result.getMessageId());
        result.setDeviceID(device.getDeviceId());
        result.setAvgTemperature(lastData.getTempAve() + "");
        result.setMinTemperature(lastData.getTempMin() + "");
@@ -206,63 +312,102 @@
        //层-行-列
        String[] attrCable = lastData.getCable().split("-");

        //层配置
        int layMax = Integer.valueOf(attrCable[0]);

        //针对筒仓配置
        String[] cableCirAtt = new String[0];
        if (StringUtils.isNotEmpty(lastData.getCableCir())) {
            cableCirAtt = lastData.getCableCir().split("-");
            return lastData2PushData2(lastData, device);
        }

        //层行列
        int cableZ = Integer.valueOf(attrCable[0]);
        int cableY = Integer.valueOf(attrCable[1]);
        int cableX = Integer.valueOf(attrCable[2]);

        //温度集合
        String[] attr = lastData.getPoints().split(",");

        //根号
        int cableNum = 1, layerNumber = 1, position = 0;
        int cableNum = 1, position = 0;

        int curCir = 1;//所在圈
        int cirLay = 1;//当前圈的层
        String curTemp;
        List<GrainDataDetail> details = new ArrayList<>();
        List<KafkaGrainDataDetail1> temperature = new ArrayList<>();

        int x = 0, y = 0, z = 0;
        for (int i = 0; i < attr.length; i++) {

            position = i;
            curTemp = attr[i];

            z = i % cableZ + 1;
            x = i / (cableZ * cableY);
            y = x * (cableZ * cableY);
            y = (i - y) / cableZ;

            // 倒转X轴
            x = cableX - 1 - x;

            //根号
            cableNum = (i / layMax) + 1;
            layerNumber = (i % layMax) + 1;
            cableNum = (i / cableZ) + 1;

            if (cableCirAtt.length > 0) {
                curCir = getCurCir(cableNum, attrCable);
                cirLay = Integer.valueOf(cableCirAtt[curCir - 1]);

                details.add(new GrainDataDetail(cableNum, cirLay, position, curTemp));
            } else {

                //判断最大 TODO 待优化
                if (curTemp.equals(result.getMaxTemperature())) {
                    result.setMaxX(cableNum + "");
                    result.setMaxZ(curTemp);
                }
            curTemp = attr[i];


                //判断最小 TODO 待优化
                if (curTemp.equals(result.getMinTemperature())) {
                    result.setMinX(cableNum + "");
                    result.setMinZ(curTemp);
                }


                details.add(new GrainDataDetail(cableNum, layerNumber, position, curTemp));
            //判断最大
            if (curTemp.equals(result.getMaxTemperature())) {
                result.setMaxX(x+"");
                result.setMaxY(y+"");
                result.setMaxZ(position+"");
            }


            //判断最小
            if (curTemp.equals(result.getMinTemperature())) {
                result.setMinX(x+"");
                result.setMinY(y+"");
                result.setMinZ(position+"");
            }

            temperature.add(new KafkaGrainDataDetail1(cableNum + "", z + "", curTemp, position + "", x+"", y+""));
        }

        result.setTemperature(details);
        //粮温信息

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


        //仓温度信息
        KafkaGrainTH grainTH = new KafkaGrainTH();
        grainTH.setHumidity(lastData.getHumidityIn() + "");
        grainTH.setTemperature(lastData.getTempIn() + "");
        grainTH.setAirHumidity(lastData.getHumidityOut() + "");
        grainTH.setAirTemperature(lastData.getTempOut() + "");

        List<KafkaGrainTH> temperatureAndhumidity = new ArrayList<>();
        temperatureAndhumidity.add(grainTH);

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

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

        result.setParams(params);

        return result;
    }

    /**
     * 针对筒仓  TODO -----
     *
     * @param lastData
     * @param device
     * @return
     */
    private KafaGrainData lastData2PushData2(Fz40Grain lastData, GatewayDevice device) {

        return null;
    }

    private int getCurCir(int curRoot, String[] cableRuleAtt) {

        int sum = 0;