upright
/
backend-duoji-monitor
mirror of https://gitlab.hzleaper.com:81/duoji/backend-duoji-monitor.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

增加光源继电器控制

Browse Source
赣州-富士康-rfid
LAPTOP-S9HJSOEB\昊天 2 years ago
parent 916e07a081
commit d96aaef28e
126 changed files with 644 additions and 501 deletions
Show Stats Download Patch File Download Diff File

5
web/src/main/java/com/zhehekeji/web/controller/StreetController.java
Unescape Escape View File

@ -1,6 +1,5 @@
package com.zhehekeji.web.controller;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo;
import com.zhehekeji.core.pojo.Result;
import com.zhehekeji.web.config.ConfigProperties;
@ -10,9 +9,7 @@ import com.zhehekeji.web.pojo.street.StreetSearch;
import com.zhehekeji.web.pojo.street.StreetVO;
import com.zhehekeji.web.service.LightSourceService;
import com.zhehekeji.web.service.StreetService;
import com.zhehekeji.web.service.damLightSource.JYDAMEquip;
import com.zhehekeji.web.service.damLightSource.JYDamHelper;
import com.zhehekeji.web.service.hikLightSource.HikControlSocket;
import com.zhehekeji.web.service.light.hikLightSource.HikControlSocket;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

9
web/src/main/java/com/zhehekeji/web/service/CronTab.java
Unescape Escape View File

@ -4,12 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zhehekeji.web.config.ConfigProperties;
import com.zhehekeji.web.entity.LightSource;
import com.zhehekeji.web.mapper.LightSourceMapper;
import com.zhehekeji.web.service.damLightSource.JYDAMEquip;
import com.zhehekeji.web.service.damLightSource.JYDamHelper;
import com.zhehekeji.web.service.hikLightSource.HikControlSocket;
import io.swagger.models.auth.In;
import com.zhehekeji.web.service.light.hikLightSource.HikControlSocket;
import lombok.extern.slf4j.Slf4j;
import net.sf.cglib.core.Local;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@ -26,9 +22,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
@Component
@EnableScheduling

12
web/src/main/java/com/zhehekeji/web/service/LightSourceService.java
Unescape Escape View File

@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zhehekeji.web.config.ConfigProperties;
import com.zhehekeji.web.entity.LightSource;
import com.zhehekeji.web.mapper.LightSourceMapper;
import com.zhehekeji.web.service.damLightSource.JYDAMEquip;
import com.zhehekeji.web.service.damLightSource.JYDamHelper;
import com.zhehekeji.web.service.hikLightSource.HikControlSocket;
import org.springframework.beans.factory.annotation.Autowired;
import com.zhehekeji.web.service.light.RelaySource;
import com.zhehekeji.web.service.light.damLightSource.JYDAMEquip;
import com.zhehekeji.web.service.light.damLightSource.JYDamHelper;
import com.zhehekeji.web.service.light.hikLightSource.HikControlSocket;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -38,9 +38,11 @@ public class LightSourceService {
equip.DisConnect();
}else if(lightSource.getType() == 2){
HikControlSocket.openLight(lightInfo.getIp(),lightInfo.getPort(),lightSource.getIndex(),stat);
HikControlSocket.lightController(lightInfo.getIp(),lightInfo.getPort(),lightSource.getIndex(),stat);
}else if (lightSource.getType() == 3){
LightSourceService.lightController(lightInfo.getIp(),lightInfo.getPort(),stat);
}else if (lightSource.getType() == 4){
RelaySource.lightController(lightInfo.getIp(),lightInfo.getPort(),stat);
}
}

28
web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java
Unescape Escape View File

@ -15,6 +15,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
import java.nio.charset.Charset;
import java.util.Set;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
@ -157,27 +158,16 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder {
}
} else if (Cmd.D.name().equals(ksecInfo.getType())) {
//柳州去掉告警
// String code = dataInfo.getCmdName();
// if(code.equals(Cmd.D1.name())){
// log.info("plcId:{},warn start",plcCmdInfo.getPlcId());
// //根据告警code转动camera
// String warnCode = dataInfo.getWarnCode();
// if(!StringUtils.isEmpty(warnCode)){
// String warnCode0 = Cmd.D1.name()+"-"+warnCode.split(",")[0];
// plcService.warnAction(plcCmdInfo,warnCode0);
// }
// plcService.warnStart(plcCmdInfo.getPlcId(),dataInfo.getWarnCode());
// }else if(code.equals(Cmd.D2.name())){
// log.info("plcId:{},warn stop",plcCmdInfo.getPlcId());
// plcService.warnStop(plcCmdInfo.getPlcId());
// }else {
// log.info("other D code :{}",code);
// }
} else if (Cmd.E.name().equals(ksecInfo.getType())) {
//智能盘点
//rfid盘点
plcService.check(plcCmdInfo, dataInfo);
String code = dataInfo.getCmdName();
if("E1".equals(code)){
plcService.RFIDCheck(plcCmdInfo);
}else {
Set<String> set = plcService.RFIDStop(plcCmdInfo);
}
}
//找到该货位的最后一张照片与现在的照片比照

5
web/src/main/java/com/zhehekeji/web/service/light/LightControllerInter.java
Unescape Escape View File

@ -0,0 +1,5 @@
package com.zhehekeji.web.service.light;
public interface LightControllerInter {
int lightController(String ip, int port, int index, int bool);
}

160
web/src/main/java/com/zhehekeji/web/service/light/RelaySource.java
Unescape Escape View File

@ -0,0 +1,160 @@
package com.zhehekeji.web.service.light;
import lombok.extern.slf4j.Slf4j;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.math.BigInteger;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
@Slf4j
public class RelaySource{
public static void main(String[] args) {
RelaySource relaySource = new RelaySource();
relaySource.lightController("192.168.1.108",1030,0);
}
private static void convertStringToHex(String str) {
byte[] getBytesFromString = str.getBytes(StandardCharsets.UTF_8);
BigInteger bigInteger = new BigInteger(1, getBytesFromString);
String convertedResult = String.format("%x", bigInteger);
System.out.println("Converted Hex from String: " + convertedResult);
}
public static int lightController(String ip, int port, int bool) {
Socket socket = new Socket();
int status = 0;
OutputStream os = null;
InputStream is = null;
try {
socket.connect(new InetSocketAddress(ip, port), 3000);
//socket.setSoTimeout(10000);
os = socket.getOutputStream();
Thread.sleep(100);
controlCmd(os, bool);
//is = socket.getInputStream();
//String s = read(socket.getInputStream());
//log.info("hik receieve:{}",s);
socket.close();
} catch (IOException e) {
log.error("hik contro time out,ip:{},info:{}", ip, e);
} finally {
if (os != null) {
try {
os.close();
} catch (IOException e) {
e.printStackTrace();
}
}
if (is != null) {
try {
is.close();
} catch (IOException e) {
e.printStackTrace();
}
}
try {
socket.close();
} catch (IOException e) {
e.printStackTrace();
}
return status;
}
}
/**
* num
*
* @param os
* @param bool 1：打开光源 0：关闭光源
* @throws IOException
*/
private static void controlCmd(OutputStream os, int bool) throws IOException {
byte b ;
if(bool == 1){
b = 0X01;
}else {
b = 0X00;
}
byte[] bytes = {0x01,0x05,0x00,0x00, (byte) 0xFF,b};
log.info("Relay contro light:{}", bool==1?"open":"close");
os.write(bytes);
}
private static String read(InputStream inStream) throws IOException {
StringBuffer sb = new StringBuffer();
int start = -1;
int end = -1;
do {
int count = inStream.available();
if (count > 0) {
byte[] buffer = new byte[count];
inStream.read(buffer);
String s = new String(buffer, Charset.forName("utf-8"));
sb.append(s);
if (start < 0) {
start = sb.indexOf("<");
}
if (end <= start) {
end = sb.indexOf(">");
}
}
} while (start < 0 || end <= start);
return sb.substring(start, end + 1);
}
/**
* 一个字节包含位的数量 8
*/
private static final int BITS_OF_BYTE = 8;
/**
* 多项式
*/
private static final int POLYNOMIAL = 0xA001;
/**
* 初始值
*/
private static final int INITIAL_VALUE = 0xFFFF;
/**
* CRC16 编码
*
* @param bytes 编码内容
* @return 编码结果
*/
public static int crc16(int[] bytes) {
int res = INITIAL_VALUE;
for (int data : bytes) {
res = res ^ data;
for (int i = 0; i < BITS_OF_BYTE; i++) {
res = (res & 0x0001) == 1 ? (res >> 1) ^ POLYNOMIAL : res >> 1;
}
}
return revert(res);
}
/**
* 翻转16位的高八位和低八位字节
*
* @param src 翻转数字
* @return 翻转结果
*/
private static int revert(int src) {
int lowByte = (src & 0xFF00) >> 8;
int highByte = (src & 0x00FF) << 8;
return lowByte | highByte;
}
}

13
web/src/main/java/com/zhehekeji/web/service/damLightSource/JYDAMEquip.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/JYDAMEquip.java
Unescape Escape View File

@ -1,12 +1,13 @@
package com.zhehekeji.web.service.damLightSource;
package com.zhehekeji.web.service.light.damLightSource;
import java.net.InetAddress;
import com.zhehekeji.web.service.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.damLightSource.lib.modbus.procimg.InputRegister;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.BitVector;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusRTUTCPTransaction;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.RTUTCPMasterConnection;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.InputRegister;
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;
@Slf4j

4
web/src/main/java/com/zhehekeji/web/service/damLightSource/JYDamHelper.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/JYDamHelper.java
Unescape Escape View File

@ -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;
@Slf4j

2
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/Modbus.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/Modbus.java
Unescape Escape View File

@ -14,7 +14,7 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus;
/**
* Interface defining all constants related to the

8
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusCoupler.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/ModbusCoupler.java
Unescape Escape View File

@ -14,11 +14,11 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.DefaultProcessImageFactory;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImage;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImageFactory;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.DefaultProcessImageFactory;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.ProcessImage;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.ProcessImageFactory;
/**
* Class implemented following a Singleton pattern,

2
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusException.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/ModbusException.java
Unescape Escape View File

@ -14,7 +14,7 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus;
/**
* Superclass of all specialised exceptions in

2
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusIOException.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/ModbusIOException.java
Unescape Escape View File

@ -14,7 +14,7 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus;
/**
* Class that implements a <tt>ModbusIOException</tt>.

2
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusSlaveException.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/ModbusSlaveException.java
Unescape Escape View File

@ -14,7 +14,7 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus;
/**
* Class that implements a <tt>ModbusSlaveException</tt>.

22
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/AIAOTest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/AIAOTest.java
Unescape Escape View File

@ -14,17 +14,17 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTCPTransaction;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTransaction;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputRegistersRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputRegistersResponse;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.WriteSingleRegisterRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.TCPMasterConnection;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.SimpleRegister;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.cmd;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusTCPTransaction;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusTransaction;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ReadInputRegistersRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ReadInputRegistersResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.WriteSingleRegisterRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.TCPMasterConnection;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.SimpleRegister;
import java.net.InetAddress;

18
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/AITest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/AITest.java
Unescape Escape View File

@ -14,15 +14,15 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTCPTransaction;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTransaction;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputRegistersRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputRegistersResponse;
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.TCPMasterConnection;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.cmd;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusTCPTransaction;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusTransaction;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ReadInputRegistersRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ReadInputRegistersResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.TCPMasterConnection;
import java.net.InetAddress;

18
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/AOTest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/AOTest.java
Unescape Escape View File

@ -14,15 +14,15 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTCPTransaction;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTransaction;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.WriteSingleRegisterRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.TCPMasterConnection;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.SimpleRegister;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.cmd;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusTCPTransaction;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusTransaction;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.WriteSingleRegisterRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.TCPMasterConnection;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.SimpleRegister;
import java.net.InetAddress;

18
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/DIDOTest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/DIDOTest.java
Unescape Escape View File

@ -14,15 +14,15 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTCPTransaction;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesResponse;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.WriteCoilRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.TCPMasterConnection;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.cmd;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusTCPTransaction;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ReadInputDiscretesRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ReadInputDiscretesResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.WriteCoilRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.TCPMasterConnection;
import java.net.InetAddress;

12
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/DITest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/DITest.java
Unescape Escape View File

@ -14,13 +14,13 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.cmd;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTCPTransaction;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesResponse;
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.TCPMasterConnection;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusTCPTransaction;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ReadInputDiscretesRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ReadInputDiscretesResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.TCPMasterConnection;
import java.net.InetAddress;

16
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/DOTest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/DOTest.java
Unescape Escape View File

@ -14,14 +14,14 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTCPTransaction;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTransaction;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.WriteCoilRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.TCPMasterConnection;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.cmd;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusTCPTransaction;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusTransaction;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.WriteCoilRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.TCPMasterConnection;
import java.net.InetAddress;

18
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialAITest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/SerialAITest.java
Unescape Escape View File

@ -14,15 +14,15 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusSerialTransaction;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputRegistersRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputRegistersResponse;
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.SerialConnection;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.SerialParameters;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.cmd;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusSerialTransaction;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ReadInputRegistersRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ReadInputRegistersResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.SerialConnection;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.SerialParameters;
/**
* Class that implements a simple commandline

20
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialDITest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/SerialDITest.java
Unescape Escape View File

@ -14,16 +14,16 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusSerialTransaction;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesResponse;
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.SerialConnection;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.BitVector;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.SerialParameters;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.cmd;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusSerialTransaction;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ReadInputDiscretesRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ReadInputDiscretesResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.SerialConnection;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.BitVector;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.SerialParameters;
/**
* Class that implements a simple commandline

20
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialFacadeTest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/SerialFacadeTest.java
Unescape Escape View File

@ -36,16 +36,16 @@
//
//////////////////////////////////////////////////////////////////////////
package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.facade.ModbusSerialMaster;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.InputRegister;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.Register;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.BitVector;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.ModbusUtil;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.SerialParameters;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.cmd;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.facade.ModbusSerialMaster;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.InputRegister;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.Register;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.BitVector;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.ModbusUtil;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.SerialParameters;
public class SerialFacadeTest {

12
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialSlaveTest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/SerialSlaveTest.java
Unescape Escape View File

@ -14,13 +14,13 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.cmd;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.ModbusSerialListener;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.*;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.SerialParameters;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.ModbusSerialListener;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.SerialParameters;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.*;
/**

10
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/TCPSlaveTest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/TCPSlaveTest.java
Unescape Escape View File

@ -14,12 +14,12 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.cmd;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.ModbusTCPListener;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.*;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.ModbusTCPListener;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.*;
/**

12
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/UDPDITest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/UDPDITest.java
Unescape Escape View File

@ -14,13 +14,13 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.cmd;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusUDPTransaction;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesResponse;
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.UDPMasterConnection;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusUDPTransaction;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ReadInputDiscretesRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ReadInputDiscretesResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.UDPMasterConnection;
import java.net.InetAddress;

10
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/UDPDOTest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/UDPDOTest.java
Unescape Escape View File

@ -14,12 +14,12 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.cmd;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusUDPTransaction;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.WriteCoilRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.UDPMasterConnection;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusUDPTransaction;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.WriteCoilRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.UDPMasterConnection;
import java.net.InetAddress;

10
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/UDPSlaveTest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/UDPSlaveTest.java
Unescape Escape View File

@ -14,12 +14,12 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.cmd;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.ModbusUDPListener;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.*;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.ModbusUDPListener;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.*;
/**
* Class implementing a simple Modbus/UDP slave.

0
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/package.html → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/package.html
Unescape Escape View File

20
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/ModbusSerialMaster.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/facade/ModbusSerialMaster.java
Unescape Escape View File

@ -14,17 +14,17 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.facade;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.facade;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusSerialTransaction;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.*;
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.SerialConnection;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.InputRegister;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.Register;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.BitVector;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.SerialParameters;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusSerialTransaction;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.*;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.SerialConnection;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.InputRegister;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.Register;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.BitVector;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.SerialParameters;
/**
* Modbus/Serial Master facade.

16
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/ModbusTCPMaster.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/facade/ModbusTCPMaster.java
Unescape Escape View File

@ -14,15 +14,15 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.facade;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.facade;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTCPTransaction;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.*;
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.TCPMasterConnection;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.InputRegister;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.Register;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.BitVector;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusTCPTransaction;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.*;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.TCPMasterConnection;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.InputRegister;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.Register;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.BitVector;
import java.net.InetAddress;
import java.net.UnknownHostException;

16
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/ModbusUDPMaster.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/facade/ModbusUDPMaster.java
Unescape Escape View File

@ -14,15 +14,15 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.facade;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.facade;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusUDPTransaction;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.*;
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.UDPMasterConnection;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.InputRegister;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.Register;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.BitVector;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusUDPTransaction;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.*;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.UDPMasterConnection;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.InputRegister;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.Register;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.BitVector;
import java.net.InetAddress;
import java.net.UnknownHostException;

0
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/package.html → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/facade/package.html
Unescape Escape View File

4
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ASCIIInputStream.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ASCIIInputStream.java
Unescape Escape View File

@ -14,9 +14,9 @@
* limitations under the License.
***/
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 java.io.FilterInputStream;
import java.io.IOException;

4
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ASCIIOutputStream.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ASCIIOutputStream.java
Unescape Escape View File

@ -14,9 +14,9 @@
* limitations under the License.
***/
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.util.ModbusUtil;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.ModbusUtil;
import java.io.FilterOutputStream;
import java.io.IOException;

2
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BINInputStream.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/BINInputStream.java
Unescape Escape View File

@ -14,7 +14,7 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.io;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.io;
import java.io.FilterInputStream;
import java.io.IOException;

2
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BINOutputStream.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/BINOutputStream.java
Unescape Escape View File

@ -14,7 +14,7 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.io;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.io;
import java.io.FilterOutputStream;
import java.io.IOException;

2
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BytesInputStream.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/BytesInputStream.java
Unescape Escape View File

@ -14,7 +14,7 @@
* limitations under the License.
***/
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.DataInputStream;

2
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BytesOutputStream.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/BytesOutputStream.java
Unescape Escape View File

@ -14,7 +14,7 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.io;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.io;
import java.io.DataOutput;
import java.io.DataOutputStream;

2
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/FastByteArrayInputStream.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/FastByteArrayInputStream.java
Unescape Escape View File

@ -14,7 +14,7 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.io;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.io;
import java.io.IOException;
import java.io.InputStream;

2
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/FastByteArrayOutputStream.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/FastByteArrayOutputStream.java
Unescape Escape View File

@ -14,7 +14,7 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.io;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.io;
import java.io.IOException;

18
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusASCIITransport.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusASCIITransport.java
Unescape Escape View File

@ -14,15 +14,15 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.io;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusMessage;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.ModbusUtil;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.io;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusMessage;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.ModbusUtil;
import java.io.DataInputStream;
import java.io.IOException;

18
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusBINTransport.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusBINTransport.java
Unescape Escape View File

@ -14,15 +14,15 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.io;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusMessage;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.ModbusUtil;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.io;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusMessage;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.ModbusUtil;
import java.io.DataInputStream;
import java.io.IOException;

22
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusRTUTCPTransaction.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusRTUTCPTransaction.java
Unescape Escape View File

@ -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.damLightSource.lib.modbus.ModbusException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusSlaveException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ExceptionResponse;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.RTUTCPMasterConnection;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.AtomicCounter;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.Mutex;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusSlaveException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ExceptionResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.RTUTCPMasterConnection;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.AtomicCounter;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.Mutex;
/**
* @author bonino

14
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusRTUTCPTransport.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusRTUTCPTransport.java
Unescape Escape View File

@ -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.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusMessage;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.ModbusUtil;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusMessage;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.ModbusUtil;
import java.io.DataInputStream;
import java.io.DataOutputStream;

14
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusRTUTransport.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusRTUTransport.java
Unescape Escape View File

@ -14,14 +14,14 @@
* limitations under the License.
***/
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.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusMessage;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.ModbusUtil;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusMessage;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.ModbusUtil;
import java.io.IOException;
import java.io.InputStream;

24
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusSerialTransaction.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusSerialTransaction.java
Unescape Escape View File

@ -14,18 +14,18 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.io;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusSlaveException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ExceptionResponse;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.SerialConnection;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.AtomicCounter;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.Mutex;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.io;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusSlaveException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ExceptionResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.SerialConnection;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.AtomicCounter;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.Mutex;
/**
* Class implementing the <tt>ModbusTransaction</tt>

14
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusSerialTransport.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusSerialTransport.java
Unescape Escape View File

@ -14,14 +14,14 @@
* limitations under the License.
***/
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.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusMessage;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.ModbusUtil;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusMessage;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.ModbusUtil;
import gnu.io.CommPort;
import gnu.io.UnsupportedCommOperationException;

24
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTCPTransaction.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusTCPTransaction.java
Unescape Escape View File

@ -14,18 +14,18 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.io;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusSlaveException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ExceptionResponse;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.TCPMasterConnection;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.AtomicCounter;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.Mutex;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.io;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusSlaveException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ExceptionResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.TCPMasterConnection;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.AtomicCounter;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.Mutex;
/**
* Class implementing the <tt>ModbusTransaction</tt>

16
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTCPTransport.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusTCPTransport.java
Unescape Escape View File

@ -14,14 +14,14 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.io;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusMessage;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.ModbusUtil;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.io;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusMessage;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.ModbusUtil;
import java.io.*;
import java.net.Socket;

8
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTransaction.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusTransaction.java
Unescape Escape View File

@ -14,11 +14,11 @@
* limitations under the License.
***/
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.ModbusException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusResponse;
/**
* Interface defining a ModbusTransaction.

10
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTransport.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusTransport.java
Unescape Escape View File

@ -14,12 +14,12 @@
* limitations under the License.
***/
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.ModbusIOException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusMessage;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusMessage;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusResponse;
import java.io.IOException;

26
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusUDPTransaction.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusUDPTransaction.java
Unescape Escape View File

@ -14,19 +14,19 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.io;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusSlaveException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ExceptionResponse;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.UDPMasterConnection;
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.UDPTerminal;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.AtomicCounter;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.Mutex;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.io;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusSlaveException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ExceptionResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.UDPMasterConnection;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.UDPTerminal;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.AtomicCounter;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.Mutex;
/**
* Class implementing the <tt>ModbusTransaction</tt>

14
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusUDPTransport.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusUDPTransport.java
Unescape Escape View File

@ -14,14 +14,14 @@
* limitations under the License.
***/
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.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusMessage;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.damLightSource.lib.modbus.net.UDPTerminal;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusMessage;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.net.UDPTerminal;
import java.io.DataOutput;
import java.io.IOException;

2
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/NonWordDataHandler.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/NonWordDataHandler.java
Unescape Escape View File

@ -14,7 +14,7 @@
* limitations under the License.
***/
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.EOFException;

2
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/Transportable.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/Transportable.java
Unescape Escape View File

@ -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.DataOutput;

0
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/package.html → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/package.html
Unescape Escape View File

4
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ExceptionResponse.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ExceptionResponse.java
Unescape Escape View File

@ -14,9 +14,9 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.msg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import java.io.DataInput;
import java.io.DataOutput;

4
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/IllegalFunctionRequest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/IllegalFunctionRequest.java
Unescape Escape View File

@ -14,9 +14,9 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.msg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import java.io.DataInput;
import java.io.DataOutput;

6
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusMessage.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ModbusMessage.java
Unescape Escape View File

@ -14,10 +14,10 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.msg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.Transportable;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.Transportable;
/**
* Interface defining a Modbus Message.

6
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusMessageImpl.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ModbusMessageImpl.java
Unescape Escape View File

@ -14,10 +14,10 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.msg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.ModbusUtil;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.ModbusUtil;
import java.io.DataInput;
import java.io.DataOutput;

4
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusRequest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ModbusRequest.java
Unescape Escape View File

@ -14,9 +14,9 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.msg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
/**
* Abstract class implementing a <tt>ModbusRequest</tt>.

4
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusResponse.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ModbusResponse.java
Unescape Escape View File

@ -14,9 +14,9 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.msg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;

12
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadCoilsRequest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadCoilsRequest.java
Unescape Escape View File

@ -14,13 +14,13 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.msg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.DigitalOut;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImage;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.DigitalOut;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.IllegalAddressException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.ProcessImage;
import java.io.DataInput;
import java.io.DataOutput;

6
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadCoilsResponse.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadCoilsResponse.java
Unescape Escape View File

@ -14,10 +14,10 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.msg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.BitVector;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.BitVector;
import java.io.DataInput;
import java.io.DataOutput;

12
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputDiscretesRequest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadInputDiscretesRequest.java
Unescape Escape View File

@ -14,13 +14,13 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.msg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.DigitalIn;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImage;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.DigitalIn;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.IllegalAddressException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.ProcessImage;
import java.io.DataInput;
import java.io.DataOutput;

6
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputDiscretesResponse.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadInputDiscretesResponse.java
Unescape Escape View File

@ -14,10 +14,10 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.msg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.BitVector;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.BitVector;
import java.io.DataInput;
import java.io.DataOutput;

12
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputRegistersRequest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadInputRegistersRequest.java
Unescape Escape View File

@ -14,13 +14,13 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.msg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.InputRegister;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImage;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.IllegalAddressException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.InputRegister;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.ProcessImage;
import java.io.DataInput;
import java.io.DataOutput;

10
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputRegistersResponse.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadInputRegistersResponse.java
Unescape Escape View File

@ -14,12 +14,12 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.msg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.InputRegister;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImageFactory;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.InputRegister;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.ProcessImageFactory;
import java.io.DataInput;
import java.io.DataOutput;

12
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadMultipleRegistersRequest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadMultipleRegistersRequest.java
Unescape Escape View File

@ -14,13 +14,13 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.msg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImage;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.Register;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.IllegalAddressException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.ProcessImage;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.Register;
import java.io.DataInput;
import java.io.DataOutput;

10
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadMultipleRegistersResponse.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadMultipleRegistersResponse.java
Unescape Escape View File

@ -14,12 +14,12 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.msg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImageFactory;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.Register;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.ProcessImageFactory;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.Register;
import java.io.DataInput;
import java.io.DataOutput;

12
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteCoilRequest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteCoilRequest.java
Unescape Escape View File

@ -14,13 +14,13 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.msg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.DigitalOut;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImage;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.DigitalOut;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.IllegalAddressException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.ProcessImage;
import java.io.DataInput;
import java.io.DataOutput;

4
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteCoilResponse.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteCoilResponse.java
Unescape Escape View File

@ -14,9 +14,9 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.msg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import java.io.DataInput;
import java.io.DataOutput;

16
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleCoilsRequest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteMultipleCoilsRequest.java
Unescape Escape View File

@ -14,14 +14,14 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.msg;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.DigitalOut;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImage;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.BitVector;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.DigitalOut;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.IllegalAddressException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.ProcessImage;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.BitVector;
import java.io.DataInput;
import java.io.DataOutput;

4
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleCoilsResponse.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteMultipleCoilsResponse.java
Unescape Escape View File

@ -14,9 +14,9 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.msg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import java.io.DataInput;
import java.io.DataOutput;

16
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleRegistersRequest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteMultipleRegistersRequest.java
Unescape Escape View File

@ -14,15 +14,15 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.msg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.NonWordDataHandler;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImage;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImageFactory;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.Register;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.NonWordDataHandler;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.IllegalAddressException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.ProcessImage;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.ProcessImageFactory;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.Register;
import java.io.DataInput;
import java.io.DataOutput;

2
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleRegistersResponse.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteMultipleRegistersResponse.java
Unescape Escape View File

@ -14,7 +14,7 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.msg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg;
import java.io.DataInput;
import java.io.DataOutput;

12
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteSingleRegisterRequest.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteSingleRegisterRequest.java
Unescape Escape View File

@ -14,13 +14,13 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.msg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImage;
import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.Register;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.IllegalAddressException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.ProcessImage;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg.Register;
import java.io.DataInput;
import java.io.DataOutput;

2
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteSingleRegisterResponse.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteSingleRegisterResponse.java
Unescape Escape View File

@ -14,7 +14,7 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.msg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg;
import java.io.DataInput;
import java.io.DataOutput;

0
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/package.html → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/package.html
Unescape Escape View File

2
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/MasterConnection.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/MasterConnection.java
Unescape Escape View File

@ -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)

16
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/ModbusSerialListener.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/ModbusSerialListener.java
Unescape Escape View File

@ -14,15 +14,15 @@
* limitations under the License.
***/
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.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTransport;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.SerialParameters;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusTransport;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.SerialParameters;
/**
* Class that implements a ModbusTCPListener.<br>

6
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/ModbusTCPListener.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/ModbusTCPListener.java
Unescape Escape View File

@ -14,10 +14,10 @@
* limitations under the License.
***/
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.damLightSource.lib.modbus.util.ThreadPool;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.ThreadPool;
import java.io.IOException;
import java.net.*;

16
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/ModbusUDPListener.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/ModbusUDPListener.java
Unescape Escape View File

@ -14,14 +14,14 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.net;
import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusUDPTransport;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.net;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusUDPTransport;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusResponse;
import java.net.InetAddress;

8
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/RTUTCPMasterConnection.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/RTUTCPMasterConnection.java
Unescape Escape View File

@ -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.damLightSource.lib.modbus.io.ModbusRTUTCPTransport;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTransport;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusRTUTCPTransport;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusTransport;
import java.io.IOException;
import java.net.InetAddress;

8
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/SerialConnection.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/SerialConnection.java
Unescape Escape View File

@ -14,11 +14,11 @@
* limitations under the License.
***/
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.damLightSource.lib.modbus.io.*;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.SerialParameters;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.*;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.SerialParameters;
import gnu.io.*;
import java.io.IOException;

4
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/SerialMasterConnection.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/SerialMasterConnection.java
Unescape Escape View File

@ -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;
/**
*

14
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/TCPConnectionHandler.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/TCPConnectionHandler.java
Unescape Escape View File

@ -14,14 +14,14 @@
* limitations under the License.
***/
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.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTransport;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusCoupler;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.ModbusIOException;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusTransport;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusRequest;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusResponse;
/**
* Class implementing a handler for incoming Modbus/TCP requests.

8
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/TCPMasterConnection.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/TCPMasterConnection.java
Unescape Escape View File

@ -14,11 +14,11 @@
* limitations under the License.
***/
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.damLightSource.lib.modbus.io.ModbusTCPTransport;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTransport;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusTCPTransport;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusTransport;
import java.io.IOException;
import java.net.InetAddress;

8
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/TCPSlaveConnection.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/TCPSlaveConnection.java
Unescape Escape View File

@ -14,11 +14,11 @@
* limitations under the License.
***/
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.damLightSource.lib.modbus.io.ModbusTCPTransport;
import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTransport;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusTCPTransport;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusTransport;
import java.io.IOException;
import java.net.InetAddress;

6
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPMasterConnection.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/UDPMasterConnection.java
Unescape Escape View File

@ -14,10 +14,10 @@
* limitations under the License.
***/
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.damLightSource.lib.modbus.io.ModbusTransport;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusTransport;
import java.net.InetAddress;

6
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPMasterTerminal.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/UDPMasterTerminal.java
Unescape Escape View File

@ -14,10 +14,10 @@
* limitations under the License.
***/
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.damLightSource.lib.modbus.io.ModbusUDPTransport;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusUDPTransport;
import java.net.DatagramPacket;
import java.net.DatagramSocket;

10
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPSlaveTerminal.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/UDPSlaveTerminal.java
Unescape Escape View File

@ -14,12 +14,12 @@
* limitations under the License.
***/
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.damLightSource.lib.modbus.io.ModbusUDPTransport;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.LinkedQueue;
import com.zhehekeji.web.service.damLightSource.lib.modbus.util.ModbusUtil;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusUDPTransport;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.LinkedQueue;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.ModbusUtil;
import java.net.DatagramPacket;
import java.net.DatagramSocket;

4
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPTerminal.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/UDPTerminal.java
Unescape Escape View File

@ -14,9 +14,9 @@
* limitations under the License.
***/
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.io.ModbusUDPTransport;
import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.ModbusUDPTransport;
import java.net.InetAddress;

0
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/package.html → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/package.html
Unescape Escape View File

0
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/package.html → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/package.html
Unescape Escape View File

2
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/AbstractRegister.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/AbstractRegister.java
Unescape Escape View File

@ -14,7 +14,7 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg;
/**
* Abstract class for a register.

2
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/DefaultProcessImageFactory.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/DefaultProcessImageFactory.java
Unescape Escape View File

@ -14,7 +14,7 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg;
/**
* The default ProcessImageFactory.

2
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/DigitalIn.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/DigitalIn.java
Unescape Escape View File

@ -14,7 +14,7 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg;
/**
* Interface defining a digital input.

2
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/DigitalOut.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/DigitalOut.java
Unescape Escape View File

@ -14,7 +14,7 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg;
/**
* Interface defining a digital output.

2
web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/IllegalAddressException.java → web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/IllegalAddressException.java
Unescape Escape View File

@ -14,7 +14,7 @@
* limitations under the License.
***/
package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg;
package com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg;
/**
* Class implementing an <tt>IllegalAddressException</tt>.

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save