测试调整筒仓的逻辑

jiazx0107@163.com

2024-01-20 fbcbe6c975554786683c38798ce8527d27993543

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

@@ -3,34 +3,23 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiCommonDevice;
import com.fzzy.api.data.DepotType;
import com.fzzy.api.data.GatewayDeviceType;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.DateUtil;
import com.fzzy.async.fzzy40.Fzzy40CommonService;
import com.fzzy.async.fzzy40.entity.Fz40Grain;
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.service.repository.GatewayDeviceRep;

import lombok.extern.slf4j.Slf4j;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
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;

@Slf4j
@Component
@@ -38,10 +27,6 @@

    @Resource
    private GatewayDeviceRep gatewayDeviceRep;
    @Resource
    private Fzzy40CommonService fzzy40CommonService;
    @Resource
    private GatewayRemoteManager gatewayRemoteManager;

    /**
     * gatewayDeviceService#listAll
@@ -51,36 +36,77 @@
    @DataProvider
    public List<GatewayDevice> listAll() {
        Sort sort = new Sort(Sort.Direction.ASC, "deviceId");
        return gatewayDeviceRep.findAll(sort);


        List<GatewayDevice> list = gatewayDeviceRep.findAll(sort);

        if (null == list || list.isEmpty()) return list;

        List<GatewayDevice> result = new ArrayList<>();

        ApiCommonDevice commonDevice;
        for (GatewayDevice device : list) {
            commonDevice = Constant.getCommonDeviceCache(device.getDeviceSn());
            if (null != commonDevice) {
                device.setIp(commonDevice.getIp());
                device.setPort(commonDevice.getPort());
                device.setStatus(commonDevice.getStatus());
                device.setOnlineTime(commonDevice.getOnlineTime());
            }
            result.add(device);
        }
        return result;
    }

    /**
     * gatewayDeviceService#updateSave
     *
     * @param entity
     * @param data
     */
    @DataResolver
    public void updateSave(GatewayDevice entity) {
        GatewayDevice data = new GatewayDevice();
        BeanUtils.copyProperties(entity, data);
    public void updateSave(GatewayDevice data) {
        GatewayDevice data2 = new GatewayDevice();
        BeanUtils.copyProperties(data, data2);

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

        if (null == data2.getStatus()) {
            data.setStatus(Constant.YN_Y);

            if (GatewayDeviceType.TYPE_07.equals(data2.getType())) {
                data.setStatus(Constant.YN_N);
            }

        }


        if (null == data.getDeviceSn()) {
            if (null != entity.getIp()) {
                data.setDeviceSn(entity.getIp());
        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.getDepotType()) {
            data2.setDepotType(DepotType.TYPE_01.getCode());
        }

        if (null == data2.getId()) {
            data2.setId(ContextUtil.getUUID());
            gatewayDeviceRep.save(data2);
        } else {
            gatewayDeviceRep.save(data2);
        }
        flushCache();
    }

    public void updateData(GatewayDevice device) {
        device.setStatus(Constant.YN_Y);

        gatewayDeviceRep.save(device);

        flushCacheOne(device);
    }


    /**
     * gatewayDeviceService#delData
@@ -99,11 +125,6 @@
        return null;
    }


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


    /**
     * gatewayDeviceService#ajaxTestGrain
     * 粮情推送测试
     *
     * @param parameter
     * @return
     */
    @Expose
    public String ajaxTestGrain(Map<String,Object> parameter) {

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

        List<GatewayDevice> list = this.listAll();

        if (null == list || list.isEmpty()) {
            return "ERROR：为获取到系统中设备配置，取消执行";
        }

        Date dayTime = (Date) parameter.get("dayTime");
        if (null == dayTime) dayTime = new Date();

        Date start = DateUtil.getCurZero(dayTime);
        Date end = DateUtil.getNextZero(dayTime);


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

    private void flushCacheOne(GatewayDevice device) {
        GatewayUtils.add2Cache(device);
    }

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

        String depotIdSys;
        List<Fz40Grain> listGrain;

        Fz40Grain lastData;

        GrainData pushData;

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

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

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

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


            //获取最后一条粮情作为当前数据
            lastData = listGrain.get(listGrain.size() - 1);

            pushData = this.lastData2PushData(lastData, device);


            if (null == deviceReportService) {
                deviceReportService = gatewayRemoteManager.getDeviceReportService(device.getProvinceProtocol());
            }


            deviceReportService.pushGrainData2Cloud(pushData);

        }

    @Expose
    public String test() {
        log.info("-----------test-------------------");
        return "SUCCESS";
    }

    /**
     * 将粮情数据转换为推送需要的数据格式
     * 根据实际通讯分机设置，当前分机在线
     *
     * @param lastData
     * @return
     * @param commonDevice 实际通讯设备
     */
    private GrainData lastData2PushData(Fz40Grain lastData, GatewayDevice device) {
        GrainData result = new GrainData();
    public void onlineByCommonDevice(ApiCommonDevice commonDevice) {
        List<GatewayDevice> list = GatewayUtils.getCacheByDeviceSn2(commonDevice.getSn());
        if (null == list || list.isEmpty()) return;

        result.setMessageId(ScConstant.getMessageId());
        result.setDeviceId(device.getDeviceId());
        result.setAvgTemperature(lastData.getTempAve() + "");
        result.setMinTemperature(lastData.getTempMin() + "");
        result.setMaxTemperature(lastData.getTempMax() + "");
        result.setCollectTime(DateFormatUtils.format(lastData.getReceiveDate(), "yyyy-MM-dd HH:mm:ss"));
        for (GatewayDevice device : list) {
            device.setIp(commonDevice.getIp());
            device.setPort(commonDevice.getPort());
            device.setOnlineTime(new Date());
            device.setStatus(Constant.YN_Y);

        //层-行-列
        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("-");
            GatewayUtils.add2Cache(device);
        }

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

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

        int curCir = 1;//所在圈
        int cirLay = 1;//当前圈的层
        String curTemp;
        List<GrainDataDetail> details = new ArrayList<>();
        for (int i = 0; i < attr.length; i++) {
            position = i;
            curTemp = attr[i];
            //根号
            cableNum = (i / layMax) + 1;
            layerNumber = (i % layMax) + 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);
                }


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



                details.add(new GrainDataDetail(cableNum, layerNumber, position, curTemp));
            }

        }

        result.setTemperature(details);

        return result;
    }

    private int getCurCir(int curRoot, String[] cableRuleAtt) {
    public void OfflineByCommonDevice(ApiCommonDevice commonDevice) {
        List<GatewayDevice> list = GatewayUtils.getCacheByDeviceSn2(commonDevice.getSn());
        if (null == list || list.isEmpty()) return;

        int sum = 0;
        for (int i = 0; i < cableRuleAtt.length; i++) {
            sum += Integer.valueOf(cableRuleAtt[i]);
            if (curRoot <= sum) return i + 1;
        for (GatewayDevice device : list) {
            device.setIp(commonDevice.getIp());
            device.setPort(commonDevice.getPort());
            device.setStatus(Constant.YN_N);
            GatewayUtils.add2Cache(device);
        }

        return 1;
    }


}