更新MODBUS-TCP协议，添加GasModus的配置

jiazx0107@163.com

2023-08-25 73f74cbf665a431b0db474be129a03c655e2338a

 igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemoteControlServiceImpl.java

@@ -11,11 +11,14 @@
import com.ld.igds.io.request.ExeDevice;
import com.ld.igds.io.request.TempControlRequest;
import com.ld.igds.io.response.DeviceControlResponse;
import com.ld.igds.modbus.service.HModbusService;
import com.ld.igds.models.Device;
import com.ld.igds.protocol.modbus.ModbusUtil;
import com.ld.igds.models.DeviceModbus;
import com.ld.igds.protocol.modbus.ModbusUtil2;
import com.ld.igds.protocol.modbus.ServerUtil;
import com.ld.igds.protocol.modbus.data.ModbusTcp;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
@@ -35,16 +38,16 @@
    public static final String BEAN_ID = "modbus.remoteControlService";

    @Resource
    private CoreDeviceService deviceService;
    private CoreDeviceService coreDeviceService;
    @Resource
    private HModbusService deviceModbusService;
    @Resource
    private AnalysisService analysisService;
    @Resource
    private ModbusUtil modbusUtil;


    @Override
    public String getProtocol() {
        return ProtocolEnum.MODBUS_TCP.getCode();
        return ProtocolEnum.TCP_MODBUS.getCode();
    }

    @Override
@@ -56,109 +59,104 @@
        }

        try {
            Device device;
            DeviceModbus deviceModbus;
            ModbusTcp modbusTcp;
            ModbusTcp modbusTcpLink = null;
            String temp = Constant.YN_N;
            int addrExe = 65535;
            for (ExeDevice exeDevice : deviceList) {
                device = deviceService.getCacheDeviceById(exeDevice.getCompanyId(), exeDevice.getId());
                deviceModbus = deviceModbusService.getCacheDeviceModbus(request.getCompanyId(), exeDevice.getPassCode() + "");

                if (null == device) continue;
                if (null == deviceModbus) {
                    log.error("当前设备---{}{},为获取到配置的MODBUS信息", exeDevice.getSerId(), exeDevice.getName());
                    continue;
                }

                if (null == device.getModbus()) continue;

                modbusTcp = new ModbusTcp(device.getModbus());
                modbusTcp = new ModbusTcp(deviceModbus);
                modbusTcp.setIp(request.getIp());
                modbusTcp.setPort(request.getPort());
                modbusTcp.setDeviceCode(device.getPassCode() + "");
                modbusTcp.setDeviceCode(exeDevice.getPassCode() + "");
                modbusTcp.setSerId(request.getSerId());
                modbusTcp.setCompanyId(request.getCompanyId());

                if (null != device.getLinkModbus()) {
                    modbusTcpLink = new ModbusTcp(device.getLinkModbus());
                    modbusTcpLink.setIp(request.getIp());
                    modbusTcpLink.setPort(request.getPort());
                    modbusTcpLink.setDeviceCode(device.getLink());
                    modbusTcpLink.setSerId(request.getSerId());
                    modbusTcpLink.setCompanyId(request.getCompanyId());
                }

                //根据设备目标目标状态，选择需要执行的通道
                if (DeviceStatus.CLOSE.getCode().equals(device.getTargetStatus())) {
                    temp = modbusTcp.getAddrClose();
                if (DeviceStatus.CLOSE.getCode().equals(exeDevice.getTargetStatus())) {
                    temp = modbusTcp.getDeviceModbus().getClose();
                }

                if (DeviceStatus.OPEN.getCode().equals(device.getTargetStatus())) {
                    temp = modbusTcp.getAddrOpen();
                if (DeviceStatus.OPEN.getCode().equals(exeDevice.getTargetStatus())) {
                    temp = modbusTcp.getDeviceModbus().getOpen();
                }

                if (null == modbusTcpLink) {
                if (StringUtils.isBlank(exeDevice.getLink()) || "null".equals(exeDevice.getLink())) {
                    //根据设备目标状态，调用MODBUS执行
                    addrExe = Integer.valueOf(temp) - 1;
                    modbusTcp.setAddrExe(addrExe);
                    doExe(modbusTcp, device.getTargetStatus());
                    modbusTcp.setAddrExe(this.getAddrExe(temp));
                    doWriteExe(modbusTcp, exeDevice.getTargetStatus());

                    continue;
                }


                deviceModbus = deviceModbusService.getCacheDeviceModbus(request.getCompanyId(), exeDevice.getLink());
                if (null == deviceModbus) continue;
                modbusTcpLink = new ModbusTcp(deviceModbus);
                modbusTcpLink.setIp(request.getIp());
                modbusTcpLink.setPort(request.getPort());
                modbusTcpLink.setDeviceCode(exeDevice.getLink());
                modbusTcpLink.setSerId(request.getSerId());
                modbusTcpLink.setCompanyId(request.getCompanyId());


                //如果是开风机
                if (DeviceStatus.F_OPEN.getCode().equals(device.getTargetStatus())) {
                if (DeviceStatus.F_OPEN.getCode().equals(exeDevice.getTargetStatus())) {

                    //先开窗口
                    temp = modbusTcp.getAddrOpen();
                    addrExe = Integer.valueOf(temp) - 1;
                    modbusTcp.setAddrExe(addrExe);
                    temp = modbusTcp.getDeviceModbus().getOpen();
                    modbusTcp.setAddrExe(this.getAddrExe(temp));

                    doExe(modbusTcp, DeviceStatus.OPEN.getCode());
                    doWriteExe(modbusTcp, DeviceStatus.OPEN.getCode());


                    Thread.sleep(300);

                    //再开风机
                    temp = modbusTcpLink.getAddrOpen();
                    addrExe = Integer.valueOf(temp) - 1;
                    modbusTcpLink.setAddrExe(addrExe);
                    temp = modbusTcpLink.getDeviceModbus().getOpen();
                    modbusTcpLink.setAddrExe(this.getAddrExe(temp));

                    doExe(modbusTcpLink, DeviceStatus.OPEN.getCode());
                    doWriteExe(modbusTcpLink, DeviceStatus.OPEN.getCode());
                }

                //如果关风机
                if(DeviceStatus.F_CLOSE.equals(device.getTargetStatus())){
                    temp = modbusTcpLink.getAddrClose();
                    addrExe = Integer.valueOf(temp) - 1;
                    modbusTcpLink.setAddrExe(addrExe);
                if (DeviceStatus.F_CLOSE.equals(exeDevice.getTargetStatus())) {
                    temp = modbusTcpLink.getDeviceModbus().getStop();
                    modbusTcpLink.setAddrExe(this.getAddrExe(temp));

                    doExe(modbusTcpLink, DeviceStatus.CLOSE.getCode());
                    doWriteExe(modbusTcpLink, DeviceStatus.CLOSE.getCode());
                }


                //如果开窗
                if(DeviceStatus.W_OPEN.equals(device.getTargetStatus())){
                    temp = modbusTcp.getAddrOpen();
                    addrExe = Integer.valueOf(temp) - 1;
                    modbusTcp.setAddrExe(addrExe);
                if (DeviceStatus.W_OPEN.equals(exeDevice.getTargetStatus())) {
                    temp = modbusTcp.getDeviceModbus().getOpen();
                    modbusTcp.setAddrExe(this.getAddrExe(temp));

                    doExe(modbusTcp, device.getTargetStatus());
                    doWriteExe(modbusTcp, exeDevice.getTargetStatus());
                }

                //如果是关窗户
                if(DeviceStatus.W_CLOSE.equals(device.getTargetStatus())){
                if (DeviceStatus.W_CLOSE.equals(exeDevice.getTargetStatus())) {

                    //先关风机
                    temp = modbusTcpLink.getAddrClose();
                    addrExe = Integer.valueOf(temp) - 1;
                    modbusTcpLink.setAddrExe(addrExe);
                    doExe(modbusTcpLink, DeviceStatus.CLOSE.getCode());
                    temp = modbusTcpLink.getDeviceModbus().getStop();
                    modbusTcpLink.setAddrExe(this.getAddrExe(temp));
                    doWriteExe(modbusTcpLink, DeviceStatus.CLOSE.getCode());

                    Thread.sleep(300);

                    //在关窗户
                    temp = modbusTcp.getAddrClose();
                    addrExe = Integer.valueOf(temp) - 1;
                    modbusTcp.setAddrExe(addrExe);
                    temp = modbusTcp.getDeviceModbus().getOpen();
                    modbusTcp.setAddrExe(this.getAddrExe(temp));

                    doExe(modbusTcp, DeviceStatus.CLOSE.getCode());
                    doWriteExe(modbusTcp, DeviceStatus.CLOSE.getCode());
                }

            }
@@ -170,9 +168,18 @@
        return new DeviceControlResponse(OrderRespEnum.ORDER_SUCCESS);
    }

    private void doExe(ModbusTcp modbusTcp, String targetStatus) throws Exception {
        boolean exeResult = modbusUtil.writeValue05(modbusTcp.getIp(), modbusTcp.getPort(), modbusTcp.getAddrExe(), true);
    private int getAddrExe(String temp) {
        if (Constant.YN_N.equals(temp)) return 65535;
        if (temp.length() > 4) {
            temp = temp.substring(temp.length() - 4);
        }
        return Integer.valueOf(temp) - 1;
    }

    private void doWriteExe(ModbusTcp modbusTcp, String targetStatus) throws Exception {
        boolean exeResult = ModbusUtil2.writeCoilStatus(modbusTcp.getIp(), modbusTcp.getPort(), modbusTcp.getAddrExe(), true);
        if (exeResult) {
            log.debug("--------写入值---{}-{}-{}", modbusTcp.getSerId(), modbusTcp.getDeviceCode(), targetStatus);
            ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getDeviceCode(), targetStatus);
        }
    }
@@ -186,48 +193,56 @@
    @Override
    public DeviceControlResponse queryStatus(DeviceControlRequest request) {
        try {
            List<Device> list = deviceService.getCacheDeviceBySerId(request.getCompanyId(), request.getSerId());
            List<Device> list = coreDeviceService.getCacheDeviceBySerId(request.getCompanyId(), request.getSerId());

            if (null == list || list.isEmpty()) {
                return new DeviceControlResponse(OrderRespEnum.ORDER_ERROR.getCode(), "未获取到设备列表信息");
            }

            DeviceModbus deviceModbus;
            ModbusTcp modbusTcp;
            ModbusTcp modbusTcpLink;
            int addrStart;
            boolean[] result;
            for (Device device : list) {
                if (null == device.getModbus()) continue;
                modbusTcp = new ModbusTcp(device.getModbus());
                deviceModbus = deviceModbusService.getCacheDeviceModbus(request.getCompanyId(), device.getPassCode() + "");

                if (null == deviceModbus) {
                    log.error("当前设备---{}{},为获取到配置的MODBUS信息", device.getSerId(), device.getName());
                    continue;
                }

                if (Constant.YN_N.equals(deviceModbus.getOpen())) continue;

                modbusTcp = new ModbusTcp(deviceModbus);
                modbusTcp.setIp(request.getIp());
                modbusTcp.setPort(request.getPort());
                modbusTcp.setDeviceCode(device.getPassCode() + "");
                modbusTcp.setSerId(request.getSerId());
                modbusTcp.setSerId(device.getSerId());
                modbusTcp.setCompanyId(device.getCompanyId());

                addrStart = Integer.valueOf(modbusTcp.getAddrOpenEnd()) - 1;
                doReadStatus(modbusTcp);

                result = modbusUtil.readStatus02(modbusTcp.getIp(), modbusTcp.getPort(), addrStart, 2);
                log.debug("---------读取状态------{}--{}", modbusTcp.getDeviceCode(), result.toString());
                analysisResult(device.getCompanyId(), device.getSerId(), modbusTcp.getDeviceCode(), result);
                if (StringUtils.isBlank(device.getLink()) || "null".equals(device.getLink())) continue;

                if (null != device.getLinkModbus()) {
                    Thread.sleep(300);
                    modbusTcpLink = new ModbusTcp(device.getModbus());
                    modbusTcpLink.setIp(request.getIp());
                    modbusTcpLink.setPort(request.getPort());
                    modbusTcpLink.setSerId(request.getSerId());
                    modbusTcpLink.setDeviceCode(device.getLink());
                    addrStart = Integer.valueOf(modbusTcpLink.getAddrOpenEnd()) - 1;
                    result = modbusUtil.readStatus02(modbusTcpLink.getIp(), modbusTcpLink.getPort(), addrStart, 2);
                    log.debug("---------读取状态-LINK------{}--{}", modbusTcpLink.getDeviceCode(), result.toString());
                Thread.sleep(300);

                    analysisResult(device.getCompanyId(), device.getSerId(), modbusTcpLink.getDeviceCode(), result);
                }
                deviceModbus = deviceModbusService.getCacheDeviceModbus(request.getCompanyId(), device.getLink());

                if (null == deviceModbus) continue;

                modbusTcpLink = new ModbusTcp(deviceModbus);
                modbusTcpLink.setIp(request.getIp());
                modbusTcpLink.setPort(request.getPort());
                modbusTcpLink.setSerId(device.getSerId());
                modbusTcpLink.setDeviceCode(device.getLink());
                modbusTcpLink.setCompanyId(device.getCompanyId());

                modbusTcpLink.setAddrExe(this.getAddrExe(modbusTcp.getDeviceModbus().getOpenEnd()));

                doReadStatus(modbusTcpLink);
            }

        } catch (Exception e) {
            log.error("调用MODBUS-TCP执行异常：{}", e);
            return new DeviceControlResponse(OrderRespEnum.ORDER_ERROR.getCode(), "后台执行异常：" + e.getMessage());
            return new DeviceControlResponse(OrderRespEnum.ORDER_ERROR.getCode(), "后台执行异常：" + e.getLocalizedMessage());
        }

        analysisService.analysisDevice(request, 3000);
@@ -236,17 +251,31 @@
    }

    /**
     * 返回两位，第一位是开到位，第二位是关到位，根据这两个标记确认当前设备的状态
     * 读取状态，同时读取开状态和关闭状态
     *
     * @param deviceCode
     * @param result
     * @param modbusTcp
     * @throws Exception
     */
    private void analysisResult(String companyId, String serId, String deviceCode, boolean[] result) {
        if (result[0]) {
            ServerUtil.add2StatusMap(companyId, serId, deviceCode, DeviceStatus.OPEN.getCode());
    private void doReadStatus(ModbusTcp modbusTcp) throws Exception {

        if (Constant.YN_N.equals(modbusTcp.getDeviceModbus().getOpen())) return;

        int addrExe = getAddrExe(modbusTcp.getDeviceModbus().getOpenEnd());

        boolean result = ModbusUtil2.readInputStatus(modbusTcp.getIp(), modbusTcp.getPort(), addrExe);
        log.debug("---------读开到位状态------{}-{}-{}", modbusTcp.getDeviceCode(), addrExe, result);

        if (result) {
            ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getDeviceCode(), DeviceStatus.OPEN.getCode());
        }
        if (result[1]) {
            ServerUtil.add2StatusMap(companyId, serId, deviceCode, DeviceStatus.CLOSE.getCode());


        addrExe = getAddrExe(modbusTcp.getDeviceModbus().getCloseEnd());
        result = ModbusUtil2.readInputStatus(modbusTcp.getIp(), modbusTcp.getPort(), addrExe);
        log.debug("---------读关到位状态------{}-{}-{}", modbusTcp.getDeviceCode(), addrExe, result);

        if (result) {
            ServerUtil.add2StatusMap(modbusTcp.getCompanyId(), modbusTcp.getSerId(), modbusTcp.getDeviceCode(), DeviceStatus.CLOSE.getCode());
        }
    }