diff --git a/web/src/main/java/com/zhehekeji/web/controller/StreetController.java b/web/src/main/java/com/zhehekeji/web/controller/StreetController.java index 7d67a5a..c67d915 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/StreetController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/StreetController.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/CronTab.java b/web/src/main/java/com/zhehekeji/web/service/CronTab.java index 126f799..a857b82 100644 --- a/web/src/main/java/com/zhehekeji/web/service/CronTab.java +++ b/web/src/main/java/com/zhehekeji/web/service/CronTab.java @@ -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 diff --git a/web/src/main/java/com/zhehekeji/web/service/LightSourceService.java b/web/src/main/java/com/zhehekeji/web/service/LightSourceService.java index c615cf0..f7a6292 100644 --- a/web/src/main/java/com/zhehekeji/web/service/LightSourceService.java +++ b/web/src/main/java/com/zhehekeji/web/service/LightSourceService.java @@ -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); } } diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java index 454862d..9fdc634 100644 --- a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java +++ b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java @@ -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 set = plcService.RFIDStop(plcCmdInfo); + } } //找到该货位的最后一张照片与现在的照片比照 diff --git a/web/src/main/java/com/zhehekeji/web/service/light/LightControllerInter.java b/web/src/main/java/com/zhehekeji/web/service/light/LightControllerInter.java new file mode 100644 index 0000000..31f8551 --- /dev/null +++ b/web/src/main/java/com/zhehekeji/web/service/light/LightControllerInter.java @@ -0,0 +1,5 @@ +package com.zhehekeji.web.service.light; + +public interface LightControllerInter { + int lightController(String ip, int port, int index, int bool); +} diff --git a/web/src/main/java/com/zhehekeji/web/service/light/RelaySource.java b/web/src/main/java/com/zhehekeji/web/service/light/RelaySource.java new file mode 100644 index 0000000..74b86b4 --- /dev/null +++ b/web/src/main/java/com/zhehekeji/web/service/light/RelaySource.java @@ -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; + } +} + diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/JYDAMEquip.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/JYDAMEquip.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/JYDAMEquip.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/JYDAMEquip.java index 3646709..607079e 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/JYDAMEquip.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/JYDAMEquip.java @@ -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 diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/JYDamHelper.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/JYDamHelper.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/JYDamHelper.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/JYDamHelper.java index 98c73e4..da625e9 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/JYDamHelper.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/JYDamHelper.java @@ -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 diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/Modbus.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/Modbus.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/Modbus.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/Modbus.java index f8ff42d..f0a7e19 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/Modbus.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/Modbus.java @@ -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 diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusCoupler.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/ModbusCoupler.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusCoupler.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/ModbusCoupler.java index 8889fab..383d476 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusCoupler.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/ModbusCoupler.java @@ -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, diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusException.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/ModbusException.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusException.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/ModbusException.java index 1f3ecfe..0f8f784 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusException.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/ModbusException.java @@ -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 diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusIOException.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/ModbusIOException.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusIOException.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/ModbusIOException.java index fe1ebee..15f8dbc 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusIOException.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/ModbusIOException.java @@ -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 ModbusIOException. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusSlaveException.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/ModbusSlaveException.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusSlaveException.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/ModbusSlaveException.java index c082288..8b15e81 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusSlaveException.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/ModbusSlaveException.java @@ -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 ModbusSlaveException. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/AIAOTest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/AIAOTest.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/AIAOTest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/AIAOTest.java index 530e6a1..5be2ade 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/AIAOTest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/AIAOTest.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/AITest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/AITest.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/AITest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/AITest.java index e503c08..f092914 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/AITest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/AITest.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/AOTest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/AOTest.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/AOTest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/AOTest.java index f66d742..29af756 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/AOTest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/AOTest.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/DIDOTest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/DIDOTest.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/DIDOTest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/DIDOTest.java index c7587cd..eccd940 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/DIDOTest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/DIDOTest.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/DITest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/DITest.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/DITest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/DITest.java index 0051c34..7446167 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/DITest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/DITest.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/DOTest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/DOTest.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/DOTest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/DOTest.java index 9c5faaf..903b512 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/DOTest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/DOTest.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialAITest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/SerialAITest.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialAITest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/SerialAITest.java index 8a3955d..22298d6 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialAITest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/SerialAITest.java @@ -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 diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialDITest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/SerialDITest.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialDITest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/SerialDITest.java index 2fedd64..8470be3 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialDITest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/SerialDITest.java @@ -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 diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialFacadeTest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/SerialFacadeTest.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialFacadeTest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/SerialFacadeTest.java index a2d9685..f713b54 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialFacadeTest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/SerialFacadeTest.java @@ -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 { diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialSlaveTest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/SerialSlaveTest.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialSlaveTest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/SerialSlaveTest.java index 553ded0..936730b 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialSlaveTest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/SerialSlaveTest.java @@ -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.*; /** diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/TCPSlaveTest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/TCPSlaveTest.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/TCPSlaveTest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/TCPSlaveTest.java index 317ac0c..7b0d979 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/TCPSlaveTest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/TCPSlaveTest.java @@ -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.*; /** diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/UDPDITest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/UDPDITest.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/UDPDITest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/UDPDITest.java index e04a105..aa805b5 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/UDPDITest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/UDPDITest.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/UDPDOTest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/UDPDOTest.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/UDPDOTest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/UDPDOTest.java index 55104f1..bab0f3c 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/UDPDOTest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/UDPDOTest.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/UDPSlaveTest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/UDPSlaveTest.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/UDPSlaveTest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/UDPSlaveTest.java index c168ae3..94d8647 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/UDPSlaveTest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/UDPSlaveTest.java @@ -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. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/package.html b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/package.html similarity index 100% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/package.html rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/cmd/package.html diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/ModbusSerialMaster.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/facade/ModbusSerialMaster.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/ModbusSerialMaster.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/facade/ModbusSerialMaster.java index 23dcd87..b0422b7 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/ModbusSerialMaster.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/facade/ModbusSerialMaster.java @@ -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. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/ModbusTCPMaster.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/facade/ModbusTCPMaster.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/ModbusTCPMaster.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/facade/ModbusTCPMaster.java index eb2107f..431ed0e 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/ModbusTCPMaster.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/facade/ModbusTCPMaster.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/ModbusUDPMaster.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/facade/ModbusUDPMaster.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/ModbusUDPMaster.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/facade/ModbusUDPMaster.java index 855523c..b0a0915 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/ModbusUDPMaster.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/facade/ModbusUDPMaster.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/package.html b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/facade/package.html similarity index 100% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/package.html rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/facade/package.html diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ASCIIInputStream.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ASCIIInputStream.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ASCIIInputStream.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ASCIIInputStream.java index 754cb80..881c9e6 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ASCIIInputStream.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ASCIIInputStream.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ASCIIOutputStream.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ASCIIOutputStream.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ASCIIOutputStream.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ASCIIOutputStream.java index 9c0afd7..da1ed37 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ASCIIOutputStream.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ASCIIOutputStream.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BINInputStream.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/BINInputStream.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BINInputStream.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/BINInputStream.java index 981cc5f..fabab29 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BINInputStream.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/BINInputStream.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BINOutputStream.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/BINOutputStream.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BINOutputStream.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/BINOutputStream.java index 143d86e..2be4f23 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BINOutputStream.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/BINOutputStream.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BytesInputStream.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/BytesInputStream.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BytesInputStream.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/BytesInputStream.java index 59828d6..3e0289e 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BytesInputStream.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/BytesInputStream.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BytesOutputStream.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/BytesOutputStream.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BytesOutputStream.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/BytesOutputStream.java index 1a44e5c..af79209 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BytesOutputStream.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/BytesOutputStream.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/FastByteArrayInputStream.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/FastByteArrayInputStream.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/FastByteArrayInputStream.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/FastByteArrayInputStream.java index d18edac..acc2f6b 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/FastByteArrayInputStream.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/FastByteArrayInputStream.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/FastByteArrayOutputStream.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/FastByteArrayOutputStream.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/FastByteArrayOutputStream.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/FastByteArrayOutputStream.java index 1e935ad..ad18059 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/FastByteArrayOutputStream.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/FastByteArrayOutputStream.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusASCIITransport.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusASCIITransport.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusASCIITransport.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusASCIITransport.java index cee5592..d489e74 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusASCIITransport.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusASCIITransport.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusBINTransport.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusBINTransport.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusBINTransport.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusBINTransport.java index 40f34f4..dba1c55 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusBINTransport.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusBINTransport.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusRTUTCPTransaction.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusRTUTCPTransaction.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusRTUTCPTransaction.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusRTUTCPTransaction.java index e271c73..199c6e1 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusRTUTCPTransaction.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusRTUTCPTransaction.java @@ -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 diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusRTUTCPTransport.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusRTUTCPTransport.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusRTUTCPTransport.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusRTUTCPTransport.java index 83dda5e..d043521 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusRTUTCPTransport.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusRTUTCPTransport.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusRTUTransport.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusRTUTransport.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusRTUTransport.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusRTUTransport.java index 6a2d03a..be97d21 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusRTUTransport.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusRTUTransport.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusSerialTransaction.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusSerialTransaction.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusSerialTransaction.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusSerialTransaction.java index 4a20986..9b579d2 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusSerialTransaction.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusSerialTransaction.java @@ -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 ModbusTransaction diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusSerialTransport.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusSerialTransport.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusSerialTransport.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusSerialTransport.java index 2d22795..6eab517 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusSerialTransport.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusSerialTransport.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTCPTransaction.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusTCPTransaction.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTCPTransaction.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusTCPTransaction.java index b8a51b2..b666002 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTCPTransaction.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusTCPTransaction.java @@ -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 ModbusTransaction diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTCPTransport.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusTCPTransport.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTCPTransport.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusTCPTransport.java index 0e75c25..4a20ae4 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTCPTransport.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusTCPTransport.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTransaction.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusTransaction.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTransaction.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusTransaction.java index 54b2057..fe9cd15 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTransaction.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusTransaction.java @@ -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. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTransport.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusTransport.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTransport.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusTransport.java index 654c838..d2f1c5b 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTransport.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusTransport.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusUDPTransaction.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusUDPTransaction.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusUDPTransaction.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusUDPTransaction.java index cbe0457..8fe2af0 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusUDPTransaction.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusUDPTransaction.java @@ -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 ModbusTransaction diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusUDPTransport.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusUDPTransport.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusUDPTransport.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusUDPTransport.java index a649a00..7bf9e2b 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusUDPTransport.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/ModbusUDPTransport.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/NonWordDataHandler.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/NonWordDataHandler.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/NonWordDataHandler.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/NonWordDataHandler.java index 8f89fcd..94282db 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/NonWordDataHandler.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/NonWordDataHandler.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/Transportable.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/Transportable.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/Transportable.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/Transportable.java index 04e20e7..24a7a8b 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/Transportable.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/Transportable.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/package.html b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/package.html similarity index 100% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/package.html rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/io/package.html diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ExceptionResponse.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ExceptionResponse.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ExceptionResponse.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ExceptionResponse.java index 77cfcf1..f8a2d39 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ExceptionResponse.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ExceptionResponse.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/IllegalFunctionRequest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/IllegalFunctionRequest.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/IllegalFunctionRequest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/IllegalFunctionRequest.java index 53e05d1..afc5ab2 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/IllegalFunctionRequest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/IllegalFunctionRequest.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusMessage.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ModbusMessage.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusMessage.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ModbusMessage.java index 3490315..ee1fc34 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusMessage.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ModbusMessage.java @@ -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. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusMessageImpl.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ModbusMessageImpl.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusMessageImpl.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ModbusMessageImpl.java index bc10226..f3b0565 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusMessageImpl.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ModbusMessageImpl.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusRequest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ModbusRequest.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusRequest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ModbusRequest.java index 2807a9a..d8d3026 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusRequest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ModbusRequest.java @@ -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 ModbusRequest. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusResponse.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ModbusResponse.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusResponse.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ModbusResponse.java index 1bfbbd0..6c3bace 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusResponse.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ModbusResponse.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadCoilsRequest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadCoilsRequest.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadCoilsRequest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadCoilsRequest.java index a361543..fdeeb72 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadCoilsRequest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadCoilsRequest.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadCoilsResponse.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadCoilsResponse.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadCoilsResponse.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadCoilsResponse.java index 404f7d0..36373bf 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadCoilsResponse.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadCoilsResponse.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputDiscretesRequest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadInputDiscretesRequest.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputDiscretesRequest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadInputDiscretesRequest.java index 89d3db3..b422d47 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputDiscretesRequest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadInputDiscretesRequest.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputDiscretesResponse.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadInputDiscretesResponse.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputDiscretesResponse.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadInputDiscretesResponse.java index b2b3759..b8fc3ce 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputDiscretesResponse.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadInputDiscretesResponse.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputRegistersRequest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadInputRegistersRequest.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputRegistersRequest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadInputRegistersRequest.java index a250fb8..069e268 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputRegistersRequest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadInputRegistersRequest.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputRegistersResponse.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadInputRegistersResponse.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputRegistersResponse.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadInputRegistersResponse.java index a991f1c..e4c006c 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputRegistersResponse.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadInputRegistersResponse.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadMultipleRegistersRequest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadMultipleRegistersRequest.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadMultipleRegistersRequest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadMultipleRegistersRequest.java index f4fa088..e98433e 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadMultipleRegistersRequest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadMultipleRegistersRequest.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadMultipleRegistersResponse.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadMultipleRegistersResponse.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadMultipleRegistersResponse.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadMultipleRegistersResponse.java index 495557a..a761a6d 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadMultipleRegistersResponse.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/ReadMultipleRegistersResponse.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteCoilRequest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteCoilRequest.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteCoilRequest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteCoilRequest.java index 745ebdb..8925e31 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteCoilRequest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteCoilRequest.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteCoilResponse.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteCoilResponse.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteCoilResponse.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteCoilResponse.java index b7bb783..637b6a5 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteCoilResponse.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteCoilResponse.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleCoilsRequest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteMultipleCoilsRequest.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleCoilsRequest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteMultipleCoilsRequest.java index 4671dd3..19acdc9 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleCoilsRequest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteMultipleCoilsRequest.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleCoilsResponse.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteMultipleCoilsResponse.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleCoilsResponse.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteMultipleCoilsResponse.java index 393120c..e743703 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleCoilsResponse.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteMultipleCoilsResponse.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleRegistersRequest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteMultipleRegistersRequest.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleRegistersRequest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteMultipleRegistersRequest.java index 2b5aa9d..3a942e0 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleRegistersRequest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteMultipleRegistersRequest.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleRegistersResponse.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteMultipleRegistersResponse.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleRegistersResponse.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteMultipleRegistersResponse.java index 552cdf8..9a36aad 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleRegistersResponse.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteMultipleRegistersResponse.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteSingleRegisterRequest.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteSingleRegisterRequest.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteSingleRegisterRequest.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteSingleRegisterRequest.java index aa0afaf..1542626 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteSingleRegisterRequest.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteSingleRegisterRequest.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteSingleRegisterResponse.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteSingleRegisterResponse.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteSingleRegisterResponse.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteSingleRegisterResponse.java index efa07f4..f5783af 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteSingleRegisterResponse.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/WriteSingleRegisterResponse.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/package.html b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/package.html similarity index 100% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/package.html rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/msg/package.html diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/MasterConnection.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/MasterConnection.java similarity index 79% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/MasterConnection.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/MasterConnection.java index cae9966..76b0929 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/MasterConnection.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/MasterConnection.java @@ -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) diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/ModbusSerialListener.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/ModbusSerialListener.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/ModbusSerialListener.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/ModbusSerialListener.java index 7bf13b0..0d5be16 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/ModbusSerialListener.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/ModbusSerialListener.java @@ -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.
diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/ModbusTCPListener.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/ModbusTCPListener.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/ModbusTCPListener.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/ModbusTCPListener.java index 6031e89..87b9fe0 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/ModbusTCPListener.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/ModbusTCPListener.java @@ -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.*; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/ModbusUDPListener.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/ModbusUDPListener.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/ModbusUDPListener.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/ModbusUDPListener.java index cb69bbd..91d5f45 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/ModbusUDPListener.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/ModbusUDPListener.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/RTUTCPMasterConnection.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/RTUTCPMasterConnection.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/RTUTCPMasterConnection.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/RTUTCPMasterConnection.java index 45fec47..f1aa100 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/RTUTCPMasterConnection.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/RTUTCPMasterConnection.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/SerialConnection.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/SerialConnection.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/SerialConnection.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/SerialConnection.java index 7eda732..22f829f 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/SerialConnection.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/SerialConnection.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/SerialMasterConnection.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/SerialMasterConnection.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/SerialMasterConnection.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/SerialMasterConnection.java index fb9257b..c0bfa93 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/SerialMasterConnection.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/SerialMasterConnection.java @@ -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; /** * diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/TCPConnectionHandler.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/TCPConnectionHandler.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/TCPConnectionHandler.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/TCPConnectionHandler.java index 480197a..940aec9 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/TCPConnectionHandler.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/TCPConnectionHandler.java @@ -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. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/TCPMasterConnection.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/TCPMasterConnection.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/TCPMasterConnection.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/TCPMasterConnection.java index d7dfa56..4c5826a 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/TCPMasterConnection.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/TCPMasterConnection.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/TCPSlaveConnection.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/TCPSlaveConnection.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/TCPSlaveConnection.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/TCPSlaveConnection.java index 1054a03..44ef82e 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/TCPSlaveConnection.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/TCPSlaveConnection.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPMasterConnection.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/UDPMasterConnection.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPMasterConnection.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/UDPMasterConnection.java index 2d401c4..9522acc 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPMasterConnection.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/UDPMasterConnection.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPMasterTerminal.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/UDPMasterTerminal.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPMasterTerminal.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/UDPMasterTerminal.java index bc051e6..369eaad 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPMasterTerminal.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/UDPMasterTerminal.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPSlaveTerminal.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/UDPSlaveTerminal.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPSlaveTerminal.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/UDPSlaveTerminal.java index 9679dfb..48cd70e 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPSlaveTerminal.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/UDPSlaveTerminal.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPTerminal.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/UDPTerminal.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPTerminal.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/UDPTerminal.java index 1011f13..462f40c 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPTerminal.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/UDPTerminal.java @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/package.html b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/package.html similarity index 100% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/package.html rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/net/package.html diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/package.html b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/package.html similarity index 100% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/package.html rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/package.html diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/AbstractRegister.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/AbstractRegister.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/AbstractRegister.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/AbstractRegister.java index ba17baf..be540c3 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/AbstractRegister.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/AbstractRegister.java @@ -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. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/DefaultProcessImageFactory.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/DefaultProcessImageFactory.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/DefaultProcessImageFactory.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/DefaultProcessImageFactory.java index bbfc030..51175d7 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/DefaultProcessImageFactory.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/DefaultProcessImageFactory.java @@ -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. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/DigitalIn.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/DigitalIn.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/DigitalIn.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/DigitalIn.java index fb5a502..a45ffac 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/DigitalIn.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/DigitalIn.java @@ -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. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/DigitalOut.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/DigitalOut.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/DigitalOut.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/DigitalOut.java index 6bd5726..35688d4 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/DigitalOut.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/DigitalOut.java @@ -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. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/IllegalAddressException.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/IllegalAddressException.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/IllegalAddressException.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/IllegalAddressException.java index aff1fc7..dbd0454 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/IllegalAddressException.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/IllegalAddressException.java @@ -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 IllegalAddressException. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/InputRegister.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/InputRegister.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/InputRegister.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/InputRegister.java index b14422e..409494b 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/InputRegister.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/InputRegister.java @@ -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 an input register. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ObservableDigitalOut.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/ObservableDigitalOut.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ObservableDigitalOut.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/ObservableDigitalOut.java index 11ba2ff..ae9b703 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ObservableDigitalOut.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/ObservableDigitalOut.java @@ -14,9 +14,9 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg; +package com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.Observable; +import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.Observable; /** diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ObservableRegister.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/ObservableRegister.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ObservableRegister.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/ObservableRegister.java index ebc88dc..4411cd2 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ObservableRegister.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/ObservableRegister.java @@ -14,9 +14,9 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg; +package com.zhehekeji.web.service.light.damLightSource.lib.modbus.procimg; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.Observable; +import com.zhehekeji.web.service.light.damLightSource.lib.modbus.util.Observable; /** diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ProcessImage.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/ProcessImage.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ProcessImage.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/ProcessImage.java index f9b2841..3ea0efd 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ProcessImage.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/ProcessImage.java @@ -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 process image diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ProcessImageFactory.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/ProcessImageFactory.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ProcessImageFactory.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/ProcessImageFactory.java index d98e695..d8c9454 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ProcessImageFactory.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/ProcessImageFactory.java @@ -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 the factory methods for diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ProcessImageImplementation.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/ProcessImageImplementation.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ProcessImageImplementation.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/ProcessImageImplementation.java index 493877c..2630ebb 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ProcessImageImplementation.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/ProcessImageImplementation.java @@ -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 implementation specific diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/Register.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/Register.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/Register.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/Register.java index e8ef3cf..e53327e 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/Register.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/Register.java @@ -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 register. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleDigitalIn.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/SimpleDigitalIn.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleDigitalIn.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/SimpleDigitalIn.java index 174c17e..90eee08 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleDigitalIn.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/SimpleDigitalIn.java @@ -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 a simple DigitalIn. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleDigitalOut.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/SimpleDigitalOut.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleDigitalOut.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/SimpleDigitalOut.java index c90ed3e..11b0428 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleDigitalOut.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/SimpleDigitalOut.java @@ -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 a simple DigitalOut. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleInputRegister.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/SimpleInputRegister.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleInputRegister.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/SimpleInputRegister.java index b83c5db..da96c1b 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleInputRegister.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/SimpleInputRegister.java @@ -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 a simple InputRegister. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleProcessImage.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/SimpleProcessImage.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleProcessImage.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/SimpleProcessImage.java index 20ec9a7..9067fbc 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleProcessImage.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/SimpleProcessImage.java @@ -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; import java.util.Vector; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleRegister.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/SimpleRegister.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleRegister.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/SimpleRegister.java index f9be956..96275e3 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleRegister.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/SimpleRegister.java @@ -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 a simple Register. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SynchronizedAbstractRegister.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/SynchronizedAbstractRegister.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SynchronizedAbstractRegister.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/SynchronizedAbstractRegister.java index ca39ff5..af00c33 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SynchronizedAbstractRegister.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/SynchronizedAbstractRegister.java @@ -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 with synchronized diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/package.html b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/package.html similarity index 100% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/package.html rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/procimg/package.html diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/AtomicCounter.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/AtomicCounter.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/AtomicCounter.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/AtomicCounter.java index bef7cbc..a92c5a5 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/AtomicCounter.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/AtomicCounter.java @@ -14,9 +14,9 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.util; +package com.zhehekeji.web.service.light.damLightSource.lib.modbus.util; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; +import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus; /** * Provides an atomic integer. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/BitVector.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/BitVector.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/BitVector.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/BitVector.java index 340a9c7..2bb4445 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/BitVector.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/BitVector.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.util; +package com.zhehekeji.web.service.light.damLightSource.lib.modbus.util; /** diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/LinkedNode.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/LinkedNode.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/LinkedNode.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/LinkedNode.java index dff22cb..605f1ff 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/LinkedNode.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/LinkedNode.java @@ -19,7 +19,7 @@ * Lea, Doug: "Concurrent Programming in Java: Design Principles and Patterns", * Second Edition, Addison-Wesley, ISBN 0-201-31009-0, November 1999 ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.util; +package com.zhehekeji.web.service.light.damLightSource.lib.modbus.util; /** * Class defining a linked node element. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/LinkedQueue.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/LinkedQueue.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/LinkedQueue.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/LinkedQueue.java index 481ddc3..21f3246 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/LinkedQueue.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/LinkedQueue.java @@ -19,7 +19,7 @@ * Lea, Doug: "Concurrent Programming in Java: Design Principles and Patterns", * Second Edition, Addison-Wesley, ISBN 0-201-31009-0, November 1999 ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.util; +package com.zhehekeji.web.service.light.damLightSource.lib.modbus.util; public class LinkedQueue { diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/ModbusUtil.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/ModbusUtil.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/ModbusUtil.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/ModbusUtil.java index 16bbd6d..ca1bbac 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/ModbusUtil.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/ModbusUtil.java @@ -14,11 +14,11 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.util; +package com.zhehekeji.web.service.light.damLightSource.lib.modbus.util; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.BytesOutputStream; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusMessage; +import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus; +import com.zhehekeji.web.service.light.damLightSource.lib.modbus.io.BytesOutputStream; +import com.zhehekeji.web.service.light.damLightSource.lib.modbus.msg.ModbusMessage; import java.io.IOException; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/Mutex.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/Mutex.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/Mutex.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/Mutex.java index 58e8fa2..7474ef5 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/Mutex.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/Mutex.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.util; +package com.zhehekeji.web.service.light.damLightSource.lib.modbus.util; /** * A simple non-reentrant mutual exclusion lock. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/Observable.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/Observable.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/Observable.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/Observable.java index 4431291..cb9b980 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/Observable.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/Observable.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.util; +package com.zhehekeji.web.service.light.damLightSource.lib.modbus.util; import java.util.Vector; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/Observer.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/Observer.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/Observer.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/Observer.java index 96674fb..701c33e 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/Observer.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/Observer.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.util; +package com.zhehekeji.web.service.light.damLightSource.lib.modbus.util; /** * A cleanroom implementation of the Observer interface diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/SerialParameters.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/SerialParameters.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/SerialParameters.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/SerialParameters.java index 92c184c..a8e812b 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/SerialParameters.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/SerialParameters.java @@ -14,9 +14,9 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.util; +package com.zhehekeji.web.service.light.damLightSource.lib.modbus.util; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; +import com.zhehekeji.web.service.light.damLightSource.lib.modbus.Modbus; import gnu.io.SerialPort; import java.util.Properties; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/ThreadPool.java b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/ThreadPool.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/ThreadPool.java rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/ThreadPool.java index 312abff..99d49cf 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/ThreadPool.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/ThreadPool.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.util; +package com.zhehekeji.web.service.light.damLightSource.lib.modbus.util; /** * Class implementing a simple thread pool. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/package.html b/web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/package.html similarity index 100% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/package.html rename to web/src/main/java/com/zhehekeji/web/service/light/damLightSource/lib/modbus/util/package.html diff --git a/web/src/main/java/com/zhehekeji/web/service/hikLightSource/HikControlSocket.java b/web/src/main/java/com/zhehekeji/web/service/light/hikLightSource/HikControlSocket.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/service/hikLightSource/HikControlSocket.java rename to web/src/main/java/com/zhehekeji/web/service/light/hikLightSource/HikControlSocket.java index 17c3313..0ca542f 100644 --- a/web/src/main/java/com/zhehekeji/web/service/hikLightSource/HikControlSocket.java +++ b/web/src/main/java/com/zhehekeji/web/service/light/hikLightSource/HikControlSocket.java @@ -1,8 +1,11 @@ -package com.zhehekeji.web.service.hikLightSource; +package com.zhehekeji.web.service.light.hikLightSource; +import com.zhehekeji.web.service.light.LightControllerInter; import lombok.extern.slf4j.Slf4j; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.net.InetSocketAddress; import java.net.Socket; import java.nio.charset.Charset; @@ -14,16 +17,8 @@ import java.nio.charset.StandardCharsets; @Slf4j public class HikControlSocket { - /** - * - * <${端口号},${开关状态（0：关 1：开）},${get\post}> - */ - public static void main(String[] args) { - int code = openLight("172.16.0.72", 9000,2,0); - - } - public static int openLight(String ip,int port,int index,int bool){ + public static int lightController(String ip,int port,int index,int bool){ Socket socket = new Socket(); int status = 0; OutputStream os = null;