增加光源继电器控制
parent
916e07a081
commit
d96aaef28e
@ -0,0 +1,5 @@
|
|||||||
|
package com.zhehekeji.web.service.light;
|
||||||
|
|
||||||
|
public interface LightControllerInter {
|
||||||
|
int lightController(String ip, int port, int index, int bool);
|
||||||
|
}
|
||||||
@ -1,12 +1,13 @@
|
|||||||
package com.zhehekeji.web.service.damLightSource;
|
package com.zhehekeji.web.service.light.damLightSource;
|
||||||
|
|
||||||
import java.net.InetAddress;
|
import java.net.InetAddress;
|
||||||
|
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusRTUTCPTransaction;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusRTUTCPTransaction;
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.*;
|
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.RTUTCPMasterConnection;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.RTUTCPMasterConnection;
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.InputRegister;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.InputRegister;
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.BitVector;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.BitVector;
|
||||||
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.*;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.zhehekeji.web.service.damLightSource;
|
package com.zhehekeji.web.service.light.damLightSource;
|
||||||
|
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.BitVector;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.BitVector;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@ -1,18 +1,18 @@
|
|||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
package com.zhehekeji.web.service.damLightSource.lib.modbus.io;
|
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.io;
|
||||||
|
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusException;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusException;
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusIOException;
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusSlaveException;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusSlaveException;
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ExceptionResponse;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ExceptionResponse;
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusRequest;
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusResponse;
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.RTUTCPMasterConnection;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.RTUTCPMasterConnection;
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.AtomicCounter;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.AtomicCounter;
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.Mutex;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.Mutex;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author bonino
|
* @author bonino
|
||||||
@ -1,14 +1,14 @@
|
|||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
package com.zhehekeji.web.service.damLightSource.lib.modbus.io;
|
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.io;
|
||||||
|
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusIOException;
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusMessage;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusMessage;
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusRequest;
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusResponse;
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.ModbusUtil;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.ModbusUtil;
|
||||||
|
|
||||||
import java.io.DataInputStream;
|
import java.io.DataInputStream;
|
||||||
import java.io.DataOutputStream;
|
import java.io.DataOutputStream;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.zhehekeji.web.service.damLightSource.lib.modbus.io;
|
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.io;
|
||||||
|
|
||||||
import java.io.DataInput;
|
import java.io.DataInput;
|
||||||
import java.io.DataOutput;
|
import java.io.DataOutput;
|
||||||
@ -1,7 +1,7 @@
|
|||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
package com.zhehekeji.web.service.damLightSource.lib.modbus.net;
|
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.net;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A common interface for master connections (not strictly covering serial connections)
|
* A common interface for master connections (not strictly covering serial connections)
|
||||||
@ -1,11 +1,11 @@
|
|||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
package com.zhehekeji.web.service.damLightSource.lib.modbus.net;
|
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.net;
|
||||||
|
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusRTUTCPTransport;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusRTUTCPTransport;
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTransport;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusTransport;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.InetAddress;
|
import java.net.InetAddress;
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.zhehekeji.web.service.damLightSource.lib.modbus.net;
|
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.net;
|
||||||
|
|
||||||
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.SerialParameters;
|
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.SerialParameters;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue