xiuwei пре 3 година
родитељ
комит
972db565a8

+ 0 - 24
protocol-iec104/src/test/java/ClientTest.java

@@ -1,24 +0,0 @@
-import wei.yigulu.iec104.apdumodel.Apdu;
-import wei.yigulu.iec104.nettyconfig.Iec104HSMasterBuilder;
-import wei.yigulu.iec104.util.SendDataFrameHelper;
-
-
-/**
- * 客户端测试
- *
- * @author 修唯xiuwei
- * @create 2019-01-22 16:05
- * @Email 524710549@qq.com
- **/
-public class ClientTest {
-
-	public static void main(String[] args) throws Exception {
-		Iec104HSMasterBuilder iec104HSMasterBuilder = new Iec104HSMasterBuilder("192.168.1.206", 2405);
-				iec104HSMasterBuilder.createByUnBlock();
-		/*Apdu apdu=new Apdu();
-		iec104HSMasterBuilder.sendFrameToOpposite(apdu.encode());
-		SendDataFrameHelper.sendTotalSummonFrame(iec104HSMasterBuilder.getFuture().channel(),1,6,iec104HSMasterBuilder.getLog());
-		System.out.println(123);*/
-	}
-
-}

+ 0 - 34
protocol-iec104/src/test/java/MasterTest.java

@@ -1,34 +0,0 @@
-import io.netty.util.ResourceLeakDetector;
-import wei.yigulu.iec104.nettyconfig.Iec104HSMasterBuilder;
-import wei.yigulu.iec104.util.SendCommandHelper;
-
-/**
- * dad
- *
- * @author 修唯xiuwei
- * @create 2019-03-14 16:46
- * @Email 524710549@qq.com
- **/
-public class MasterTest {
-
-	public static void main(String[] args) throws Exception {
-		ResourceLeakDetector.setLevel(ResourceLeakDetector.Level.ADVANCED);
-		Iec104HSMasterBuilder masterBuilder = new Iec104HSMasterBuilder("127.0.0.1", 2409);
-
-		masterBuilder.createByUnBlock();
-		Thread.sleep(3000L);
-		SendCommandHelper.sendShortCommand(masterBuilder, 0, 1, 16385, 0.452f);
-
-	/*	//创建总召唤类型I帧
-		TotalSummonType totalSummonType = new TotalSummonType();
-		//反向生成asdu
-		Asdu asdu = totalSummonType.generateBack();
-		//配置总召唤发送原因
-		asdu.setNot(6);
-		//配置公共地址位
-		asdu.setCommonAddress(1);
-		Apdu apdu = new Apdu().setAsdu(asdu);
-		masterBuilder.sendFrameToOpposite(apdu.encode());*/
-
-	}
-}

+ 0 - 103
protocol-iec104/src/test/java/NettyClient.java

@@ -1,103 +0,0 @@
-import io.netty.bootstrap.Bootstrap;
-import io.netty.channel.*;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.nio.NioSocketChannel;
-import io.netty.handler.codec.string.StringDecoder;
-import io.netty.handler.codec.string.StringEncoder;
-
-/**
- * 测试客户端
- *
- * @author 修唯xiuwei
- * @create 2018-02-05 15:56
- * @Email 524710549@qq.com
- **/
-public class NettyClient {
-	public static void main(String[] args) {
-		EventLoopGroup group = new NioEventLoopGroup();
-		try {
-			Bootstrap sb = new Bootstrap();
-			// 绑定线程池
-			sb.group(group)
-					// 指定使用的channel
-					.channel(NioSocketChannel.class)
-					// 绑定监听端口
-					// 绑定客户端连接时候触发操作
-					.handler(new ChannelInitializer<NioSocketChannel>() {
-						@Override
-						protected void initChannel(NioSocketChannel ch) throws Exception {
-							ch.pipeline().addLast(new StringDecoder());
-							//字符串编码器
-							ch.pipeline().addLast(new StringEncoder());
-							//处理类
-							ch.pipeline().addLast(new ClientHandler4());
-						}
-					});
-			// 服务器异步创建绑定
-			ChannelFuture cf = sb.bind("127.0.0.1", 2404);
-			System.out.println("1" + cf.isSuccess());
-			cf.sync();
-			System.out.println("2" + cf.isSuccess());
-
-			System.out.println("4" + cf.isDone());
-			System.out.println(cf.getClass().getSimpleName());
-			// 关闭服务器通道
-			ChannelFuture ff = cf.channel().closeFuture();
-			System.out.println(ff.getClass().getSimpleName());
-			System.out.println(ff.sync());
-			System.out.println("is==" + (cf == ff));
-			System.out.println(cf.isDone());
-			System.out.println("3" + cf.isSuccess());
-
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		} finally {
-			try {
-				// 释放线程池资源
-				group.shutdownGracefully().sync();
-			} catch (InterruptedException e) {
-				e.printStackTrace();
-			}
-		}
-
-		//worker负责读写数据
-
-	}
-
-}
-
-class ClientHandler4 extends SimpleChannelInboundHandler<String> {
-
-	//接受服务端发来的消息
-	@Override
-	protected void channelRead0(ChannelHandlerContext ctx, String msg) throws Exception {
-		System.out.println("server response : " + msg);
-	}
-
-	//与服务器建立连接
-	@Override
-	public void channelActive(ChannelHandlerContext ctx) throws Exception {
-		//给服务器发消息
-		ctx.channel().writeAndFlush("i am client !\n");
-
-		System.out.println("channelActive");
-	}
-
-	//与服务器断开连接
-	@Override
-	public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-		System.out.println("channelInactive");
-	}
-
-	//异常
-	@Override
-	public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-		//关闭管道
-		ctx.channel().close();
-		//打印异常信息
-		cause.printStackTrace();
-	}
-}
-
-
-

+ 0 - 92
protocol-iec104/src/test/java/ReadFile.java

@@ -1,92 +0,0 @@
-import io.netty.buffer.Unpooled;
-import wei.yigulu.iec104.apdumodel.Apdu;
-import wei.yigulu.iec104.apdumodel.Asdu;
-import wei.yigulu.iec104.asdudataframe.ShortFloatType;
-import wei.yigulu.iec104.asdudataframe.qualitydescription.IeMeasuredQuality;
-
-import java.io.*;
-import java.util.Map;
-
-/**
- * @author: xiuwei
- * @version:
- */
-public class ReadFile {
-
-
-	public static void main(String[] args) throws Exception {
-		BufferedWriter out = new BufferedWriter(new FileWriter("C:\\Users\\Administrator\\Desktop\\星能3-4.15解析.txt"));
-
-
-		File file = new File("C:\\Users\\Administrator\\Desktop\\104m_04_20210415.log");//定义一个file对象,用来初始化FileReader
-		FileReader reader = new FileReader(file);//定义一个fileReader对象,用来初始化BufferedReader
-		BufferedReader bReader = new BufferedReader(reader);//new一个BufferedReader对象,将文件内容读取到缓存
-		StringBuilder sb = new StringBuilder();//定义一个字符串缓存,将字符串存放缓存中
-		String s = "";
-		while ((s = bReader.readLine()) != null) {//逐行读取文件内容,不读取换行符和末尾的空格
-			if (s.contains("recv :") && !s.contains("-")) {
-				String f = "";
-				f += s.substring(0, 15) + "\r";
-				Apdu a = new Apdu().loadByteBuf(Unpooled.copiedBuffer(Hex2Bytes(s.substring(23).replaceAll(" ", ""))));
-				Asdu asdu = a.getAsdu();
-				if (asdu != null && asdu.getDataFrame() instanceof ShortFloatType) {
-					ShortFloatType ss = (ShortFloatType) asdu.getDataFrame();
-					if (ss.getAddresses().size() == 1) {
-						int j = 0;
-						for (Map.Entry<IeMeasuredQuality, Float> e : ss.getDatas().entrySet()) {
-							f += dayin(ss.getAddresses().get(0).getAddress() + j, e.getValue());
-							j++;
-						}
-					} else {
-						int f1 = 0;
-						for (Map.Entry<IeMeasuredQuality, Float> i : ss.getDatas().entrySet()) {
-							f += dayin(ss.getAddresses().get(f1++).getAddress(), i.getValue());
-						}
-					}
-				}
-				if (f.length() > 16) {
-					System.out.println(f);
-					out.write(f);
-				}
-			}
-		}
-		bReader.close();
-		out.close();
-		String str = sb.toString();
-		System.out.println(str);
-
-
-	}
-
-
-	public static byte[] Hex2Bytes(String hexString) {
-		byte[] arrB = hexString.getBytes();
-		int iLen = arrB.length;
-		byte[] arrOut = new byte[iLen / 2];
-		String strTmp = null;
-		for (int i = 0; i < iLen; i += 2) {
-			strTmp = new String(arrB, i, 2);
-			arrOut[(i / 2)] = ((byte) Integer.parseInt(strTmp, 16));
-		}
-		return arrOut;
-	}
-
-
-	public static String dayin(int key, Float value) {
-		String s = "";
-		int i;
-		if (key == 16385) {
-			s += "                  实际功率 : " + value + "\r";
-		}
-		if (key > 16421 && key < 16921 && (key - 16422) % 6 == 0) {
-			i = (key - 16422) / 6 + 1;
-			if (i == 9 || i == 16 || i == 31 || i == 44 || i == 48 || i == 59) {
-				s += "                  样" + i + " : " + value + "\r";
-			} else {
-				s += "                  " + i + " : " + value + "\r";
-			}
-
-		}
-		return s;
-	}
-}

+ 0 - 31
protocol-iec104/src/test/java/SendCommand.java

@@ -1,31 +0,0 @@
-import wei.yigulu.iec104.nettyconfig.Iec104MasterBuilder;
-import wei.yigulu.iec104.util.SendCommandHelper;
-
-import java.util.Random;
-
-/**
- * @author: xiuwei
- * @version:
- */
-public class SendCommand {
-
-	public static void main(String[] args) throws Exception {
-		sendAp();
-	}
-
-	public static void sendAp() throws Exception {
-		Random random = new Random();
-		Iec104MasterBuilder builder = new Iec104MasterBuilder("127.0.0.1", 2404);
-		builder.createByUnBlock();
-		while (true) {
-			Thread.sleep(30000L);
-			try {
-				SendCommandHelper.sendShortCommand(builder, 0, 0, 1, (float) (40 + 10 * random.nextDouble()));
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-	}
-
-
-}

+ 0 - 101
protocol-iec104/src/test/java/Server4.java

@@ -1,101 +0,0 @@
-import io.netty.bootstrap.ServerBootstrap;
-import io.netty.channel.*;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.netty.handler.codec.string.StringDecoder;
-import io.netty.handler.codec.string.StringEncoder;
-
-/**
- * 测试客户端
- *
- * @author 修唯xiuwei
- * @create 2018-02-05 15:56
- * @Email 524710549@qq.com
- **/
-
-public class Server4 {
-	public static void main(String[] args) {
-		EventLoopGroup boss = new NioEventLoopGroup();
-		EventLoopGroup worker = new NioEventLoopGroup();
-
-		try {
-			//辅助启动类
-			ServerBootstrap bootstrap = new ServerBootstrap();
-			//设置线程池
-			bootstrap.group(boss, worker);
-
-			//设置socket工厂
-			bootstrap.channel(NioServerSocketChannel.class);
-
-			//设置管道工厂
-			bootstrap.childHandler(new ChannelInitializer<SocketChannel>() {
-				@Override
-				protected void initChannel(SocketChannel socketChannel) throws Exception {
-					//获取管道
-					ChannelPipeline pipeline = socketChannel.pipeline();
-					//字符串解码器
-					pipeline.addLast(new StringDecoder());
-					//字符串编码器
-					pipeline.addLast(new StringEncoder());
-					//处理类
-					pipeline.addLast(new ServerHandler4());
-				}
-			});
-
-			//设置TCP参数
-			//1.链接缓冲池的大小(ServerSocketChannel的设置)
-			bootstrap.option(ChannelOption.SO_BACKLOG, 1024);
-			//维持链接的活跃,清除死链接(SocketChannel的设置)
-			bootstrap.childOption(ChannelOption.SO_KEEPALIVE, true);
-			//关闭延迟发送
-			bootstrap.childOption(ChannelOption.TCP_NODELAY, true);
-
-			//绑定端口
-			ChannelFuture future = bootstrap.bind(9001).sync();
-			System.out.println("server start ...... ");
-
-			//等待服务端监听端口关闭
-			future.channel().closeFuture().sync();
-
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		} finally {
-			//优雅退出,释放线程池资源
-			boss.shutdownGracefully();
-			worker.shutdownGracefully();
-		}
-	}
-
-}
-
-
-class ServerHandler4 extends SimpleChannelInboundHandler<String> {
-
-	//读取客户端发送的数据
-	@Override
-	protected void channelRead0(ChannelHandlerContext ctx, String msg) throws Exception {
-		System.out.println("client response :" + msg);
-	}
-
-	//新客户端接入
-	@Override
-	public void channelActive(ChannelHandlerContext ctx) throws Exception {
-		System.out.println("channelActive");
-	}
-
-	//客户端断开
-	@Override
-	public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-		System.out.println("channelInactive");
-	}
-
-	//异常
-	@Override
-	public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-		//关闭通道
-		ctx.channel().close();
-		//打印异常
-		cause.printStackTrace();
-	}
-}

+ 0 - 30
protocol-iec104/src/test/java/SlaveTest.java

@@ -1,30 +0,0 @@
-import wei.yigulu.iec104.nettyconfig.Iec104SlaverBuilder;
-
-import java.net.InetSocketAddress;
-
-/**
- * @author: xiuwei
- * @version:
- */
-public class SlaveTest {
-
-	public static void main(String[] args) throws Exception {
-		Iec104SlaverBuilder slaverBuilder = new Iec104SlaverBuilder(2404);
-		/*slaverBuilder.getConnectFilterManager().appendFilter((c) -> {
-			if (slaverBuilder.getChannels().size() >= 1) {
-				return -1;
-			}
-			InetSocketAddress ipSocket = (InetSocketAddress) c.remoteAddress();
-			String clientIp = ipSocket.getAddress().getHostAddress();
-			Integer clientPort = ipSocket.getPort();
-			if (clientPort > 30000) {
-				return -1;
-			} else {
-				return 1;
-			}
-		});*/
-		slaverBuilder.create();
-	}
-
-
-}

+ 0 - 27
protocol-iec104/src/test/java/TestTotalS.java

@@ -1,27 +0,0 @@
-/**
- * @author: xiuwei
- * @version:
- */
-
-import wei.yigulu.iec104.annotation.AsduType;
-import wei.yigulu.iec104.apdumodel.Apdu;
-import wei.yigulu.iec104.asdudataframe.TotalSummonType;
-import wei.yigulu.iec104.util.SendDataFrameHelper;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@AsduType
-public class TestTotalS extends TotalSummonType {
-
-	@Override
-	public byte[][] handleAndAnswer(Apdu apdu) throws Exception {
-		Map<Integer, Boolean> booleans = new HashMap<>();
-		for (int i = 0; i < 100; i++) {
-			booleans.put(i, true);
-		}
-		SendDataFrameHelper.sendYxDataFrame(apdu.getChannel(), booleans, 1, 20, null);
-		return null;
-	}
-
-}

+ 0 - 35
protocol-modbus/src/test/java/Test.java

@@ -1,35 +0,0 @@
-import wei.yigulu.modbus.domain.datatype.numeric.*;
-
-/**
- * @author: xiuwei
- * @version:
- */
-public class Test {
-	public static void main(String[] args) throws InterruptedException {
-	/*	ModbusTcpMasterBuilder master = new ModbusTcpMasterBuilder("127.0.0.1", 5002);
-		master.createByUnBlock();
-		Thread.sleep(30000L);
-		System.out.println("重启");
-		master.stop();
-		master.createByUnBlock();*/
-		//43 b0 ca ed
-/*		byte[] bs = new byte[]{(byte) 0x00, (byte) 0x30, (byte) 0x00, (byte) 0x18};
-		System.out.println("ABCD:" + new ABCD().decode(bs, 0).getValue());
-		System.out.println("CDAB:" + new CDAB().decode(bs, 0).getValue());
-		System.out.println("DCBA:" + new DCBA().decode(bs, 0).getValue());
-		System.out.println("BADC:" + new BADC().decode(bs, 0).getValue());
-		System.out.println("P_ABCD:" + new P_ABCD().decode(bs, 0).getValue());
-		System.out.println("P_CDAB:" + new P_CDAB().decode(bs, 0).getValue());
-		System.out.println("AB:" + new PM_AB().decode(bs, 1).getValue());
-		System.out.println("BA:" + new PM_BA().decode(bs, 1).getValue());*/
-		int b=130;
-		b=b&127;
-		System.out.println(b);
-		b=b>>2;
-		System.out.println((byte)b);
-
-
-
-
-	}
-}

+ 0 - 51
protocol-modbus/src/test/java/TestMaster.java

@@ -1,51 +0,0 @@
-import lombok.extern.slf4j.Slf4j;
-import wei.yigulu.modbus.domain.FunctionCode;
-import wei.yigulu.modbus.domain.Obj4RequestRegister;
-import wei.yigulu.modbus.domain.datatype.IModbusDataType;
-import wei.yigulu.modbus.domain.datatype.ModbusDataTypeEnum;
-import wei.yigulu.modbus.domain.datatype.NumericModbusData;
-import wei.yigulu.modbus.domain.synchronouswaitingroom.TcpSynchronousWaitingRoom;
-import wei.yigulu.modbus.exceptiom.ModbusException;
-import wei.yigulu.modbus.netty.ModbusTcpMasterBuilder;
-import wei.yigulu.modbus.utils.ModbusRequestDataUtils;
-
-import java.util.*;
-
-/**
- * @author: xiuwei
- * @version:
- */
-@Slf4j
-public class TestMaster {
-	public static void main(String[] args) throws InterruptedException, ModbusException {
-		ModbusTcpMasterBuilder master = new ModbusTcpMasterBuilder("127.0.0.1", 5001);
-		master.createByUnBlock();
-		TcpSynchronousWaitingRoom.waitTime = 5000L;
-		Thread.sleep(3000L);
-		Map<Integer, ModbusDataTypeEnum> map = new HashMap<>();
-		for (int i = 0; i <= 90; i++) {
-			map.put(i, ModbusDataTypeEnum.P_AB);
-		}
-		List<Obj4RequestRegister> ll = ModbusRequestDataUtils.splitModbusRequest(map, 1, FunctionCode.READ_HOLDING_REGISTERS);
-
-		for (; ; ) {
-			try {
-				Map<Integer, IModbusDataType> map1 = ModbusRequestDataUtils.getRegisterData(master, ll);
-				ArrayList<Integer> lll = new ArrayList<Integer>(map1.keySet());
-				Collections.sort(lll);
-				for (Integer i : lll) {
-					if (map1.get(i) instanceof NumericModbusData) {
-						//System.out.println(i + " ============ " + ((NumericModbusData) map1.get(i)).getValue());
-					} else {
-						//System.out.println(i + " ============ " + JSON.toJSONString(((BooleanModbusDataInRegister) map1.get(i)).getValues()));
-					}
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			Thread.sleep(30L);
-		}
-
-
-	}
-}

+ 0 - 48
protocol-modbus/src/test/java/TestMasterCoil.java

@@ -1,48 +0,0 @@
-import lombok.extern.slf4j.Slf4j;
-import wei.yigulu.modbus.domain.FunctionCode;
-import wei.yigulu.modbus.domain.Obj4RequestCoil;
-import wei.yigulu.modbus.exceptiom.ModbusException;
-import wei.yigulu.modbus.netty.ModbusTcpMasterBuilder;
-import wei.yigulu.modbus.utils.ModbusRequestDataUtils;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author: xiuwei
- * @version:
- */
-@Slf4j
-public class TestMasterCoil {
-	public static void main(String[] args) throws InterruptedException, ModbusException {
-
-
-		ModbusTcpMasterBuilder master = new ModbusTcpMasterBuilder("127.0.0.1", 502);
-		master.createByUnBlock();
-		Thread.sleep(3000L);
-		List<Integer> list = new ArrayList<>();
-		for (int i = 0; i <= 7; i++) {
-			list.add(i);
-		}
-		list.add(30);
-		List<Obj4RequestCoil> ll = ModbusRequestDataUtils.splitModbusRequest(list, 1, FunctionCode.READ_COILS);
-
-		for (; ; ) {
-			try {
-				Map<Integer, Boolean> map1 = ModbusRequestDataUtils.getCoilData(master, ll);
-				ArrayList<Integer> lll = new ArrayList<Integer>(map1.keySet());
-				Collections.sort(lll);
-				for (Integer i : lll) {
-					System.out.println(i + " ============ " + map1.get(i));
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			Thread.sleep(3000L);
-		}
-
-
-	}
-}

+ 0 - 43
protocol-modbus/src/test/java/TestRtuCommandMaster.java

@@ -1,43 +0,0 @@
-import lombok.extern.slf4j.Slf4j;
-import wei.yigulu.modbus.domain.datatype.RegisterValue;
-import wei.yigulu.modbus.domain.datatype.numeric.P_AB;
-import wei.yigulu.modbus.domain.synchronouswaitingroom.TcpSynchronousWaitingRoom;
-import wei.yigulu.modbus.exceptiom.ModbusException;
-import wei.yigulu.modbus.netty.ModbusRtuMasterBuilder;
-import wei.yigulu.modbus.utils.ModbusCommandDataUtils;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-/**
- * @author: xiuwei
- * @version:
- */
-@Slf4j
-public class TestRtuCommandMaster {
-	public static void main(String[] args) throws InterruptedException, ModbusException {
-		ModbusRtuMasterBuilder master = new ModbusRtuMasterBuilder("COM1");
-		master.createByUnBlock();
-		TcpSynchronousWaitingRoom.waitTime = 5000L;
-		Thread.sleep(3000L);
-		Random random = new Random();
-		BigDecimal val;
-		BigDecimal val1;
-		for (; ; ) {
-			val = BigDecimal.valueOf(random.nextInt(100));
-			System.out.println("数据个数:" + val);
-			List<RegisterValue> list = new ArrayList<>();
-			for (int i = 0; i <= val.intValue(); i++) {
-				val1 = BigDecimal.valueOf(random.nextInt(11));
-				System.out.println("数据值:" + val1);
-				list.add(new P_AB().setValue(val1));
-			}
-			System.out.println(ModbusCommandDataUtils.commandRegister(master, 1, 0, list));
-			Thread.sleep(60000L);
-		}
-	}
-
-
-}

+ 0 - 53
protocol-modbus/src/test/java/TestRtuMaster.java

@@ -1,53 +0,0 @@
-import lombok.extern.slf4j.Slf4j;
-import wei.yigulu.modbus.domain.FunctionCode;
-import wei.yigulu.modbus.domain.Obj4RequestRegister;
-import wei.yigulu.modbus.domain.datatype.IModbusDataType;
-import wei.yigulu.modbus.domain.datatype.ModbusDataTypeEnum;
-import wei.yigulu.modbus.domain.datatype.NumericModbusData;
-import wei.yigulu.modbus.exceptiom.ModbusException;
-import wei.yigulu.modbus.netty.ModbusRtuMasterBuilder;
-import wei.yigulu.modbus.utils.ModbusRequestDataUtils;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author: xiuwei
- * @version:
- */
-@Slf4j
-public class TestRtuMaster {
-	public static void main(String[] args) throws InterruptedException, ModbusException {
-		ModbusRtuMasterBuilder master = new ModbusRtuMasterBuilder("COM1");
-		master.setBaudRate(9600);
-		master.createByUnBlock();
-/*
-		ModbusRtuMasterBuilder master1 = new ModbusRtuMasterBuilder("COM3");
-		master1.createByUnBlock();
-		ModbusRtuMasterBuilder master2 = new ModbusRtuMasterBuilder("COM5");
-		master2.createByUnBlock();
-		ModbusRtuMasterBuilder master3 = new ModbusRtuMasterBuilder("COM7");
-		master3.createByUnBlock();*/
-		Thread.sleep(5000L);
-		Map<Integer, ModbusDataTypeEnum> map = new HashMap<>();
-		for (int i = 0; i < 60; i += 2) {
-			map.put(i, ModbusDataTypeEnum.CDAB);
-		}
-		List<Obj4RequestRegister> ll = ModbusRequestDataUtils.splitModbusRequest(map, 1, FunctionCode.READ_HOLDING_REGISTERS);
-
-		for (; ; ) {
-			try {
-				Map<Integer, IModbusDataType> map1 = ModbusRequestDataUtils.getRegisterData(master, ll);
-				for (Integer i : map1.keySet()) {
-					System.out.println(i + " ============ " + ((NumericModbusData) map1.get(i)).getValue());
-				}
-			} catch (ModbusException e) {
-				System.out.println(e.getMsg());
-			}
-			Thread.sleep(1000L);
-		}
-
-
-	}
-}

+ 0 - 32
protocol-modbus/src/test/java/TestRtuSlave.java

@@ -1,32 +0,0 @@
-import lombok.extern.slf4j.Slf4j;
-import wei.yigulu.modbus.domain.datatype.numeric.P_ABCD;
-import wei.yigulu.modbus.exceptiom.ModbusException;
-import wei.yigulu.modbus.netty.ModbusRtuSlaverBuilder;
-
-import java.math.BigDecimal;
-import java.util.Random;
-
-/**
- * @author: xiuwei
- * @version:
- */
-@Slf4j
-public class TestRtuSlave {
-	public static void main(String[] args) throws InterruptedException, ModbusException {
-		ModbusRtuSlaverBuilder slaver = new ModbusRtuSlaverBuilder("COM1");
-		slaver.createByUnBlock();
-		Thread.sleep(3000L);
-		Random random = new Random();
-		double d;
-		for (; ; ) {
-			for (int i = 0; i < 10; i++) {
-				d = (0.5 - random.nextDouble()) * 100;
-				System.out.println(d);
-				//slaver.getModbusSlaveDataContainer().setRegister(1, i * 2, new P_ABCD(BigDecimal.valueOf(d)));
-			}
-			Thread.sleep(1000000L);
-		}
-
-
-	}
-}

+ 0 - 28
protocol-modbus/src/test/java/TestSlaver.java

@@ -1,28 +0,0 @@
-import wei.yigulu.modbus.domain.datatype.numeric.BADC;
-import wei.yigulu.modbus.netty.ModbusTcpSlaverBuilder;
-
-import java.math.BigDecimal;
-import java.util.Random;
-
-/**
- * @author: xiuwei
- * @version:
- */
-public class TestSlaver {
-	public static void main(String[] args) throws InterruptedException {
-		ModbusTcpSlaverBuilder slaverBuilder = new ModbusTcpSlaverBuilder(502);
-		slaverBuilder.createByUnBlock();
-
-		Random random = new Random();
-		boolean f;
-		for (; ; ) {
-			for (int i = 0; i < 10; i++) {
-				slaverBuilder.getModbusSlaveDataContainer().setRegister(1, i, new BADC(BigDecimal.valueOf(random.nextFloat())));
-				/*f = random.nextBoolean();
-				System.out.println(i + ":" + f);
-				slaverBuilder.getModbusSlaveDataContainer().setCoil(1, i, f);*/
-			}
-			Thread.sleep(2000L);
-		}
-	}
-}

+ 0 - 43
protocol-modbus/src/test/java/TestTcpCommandMaster.java

@@ -1,43 +0,0 @@
-import lombok.extern.slf4j.Slf4j;
-import wei.yigulu.modbus.domain.datatype.RegisterValue;
-import wei.yigulu.modbus.domain.datatype.numeric.P_AB;
-import wei.yigulu.modbus.domain.synchronouswaitingroom.TcpSynchronousWaitingRoom;
-import wei.yigulu.modbus.exceptiom.ModbusException;
-import wei.yigulu.modbus.netty.ModbusTcpMasterBuilder;
-import wei.yigulu.modbus.utils.ModbusCommandDataUtils;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-/**
- * @author: xiuwei
- * @version:
- */
-@Slf4j
-public class TestTcpCommandMaster {
-	public static void main(String[] args) throws InterruptedException, ModbusException {
-		ModbusTcpMasterBuilder master = new ModbusTcpMasterBuilder("127.0.0.1", 5002);
-		master.createByUnBlock();
-		TcpSynchronousWaitingRoom.waitTime = 5000L;
-		Thread.sleep(5000L);
-		Random random = new Random();
-		BigDecimal val;
-		BigDecimal val1;
-		for (; ; ) {
-			val = BigDecimal.valueOf(random.nextInt(100));
-			System.out.println("数据个数:" + val);
-			List<RegisterValue> list = new ArrayList<>();
-			for (int i = 0; i <= val.intValue(); i++) {
-				val1 = BigDecimal.valueOf(random.nextInt(11));
-				System.out.println("数据值:" + val1);
-				list.add(new P_AB().setValue(val1));
-			}
-			System.out.println(ModbusCommandDataUtils.commandRegister(master, 1, 0, list));
-			Thread.sleep(60000L);
-		}
-	}
-
-
-}