数据库改成本地test和prod环境

platform-iec/src/main/java/com/platform/iec/master/MasterSysDataHandler.java

@@ -24,8 +24,8 @@ public class MasterSysDataHandler implements DataHandler {
 			} catch (InterruptedException e) {
 				e.printStackTrace();
 			}
-			System.err.println("___________________________");
-			ctx.writeAndFlush(BasicInstruction104.getGeneralCallRuleDetail104());
+			System.err.println("1___________________________");
+			// ctx.writeAndFlush(BasicInstruction104.getGeneralCallRuleDetail104());
 		};
 		CachedThreadPool.getCachedThreadPool().execute(runnable);
 //		ctx.writeAndFlush(BasicInstruction104.getEndGeneralCallRuleDetail104());

platform-iec/src/main/java/com/ydl/iec/iec104/common/BasicInstruction104.java

@@ -47,16 +47,6 @@ public class BasicInstruction104 {
 	 */
 	public static final byte[] STOPDT_YES = new byte[] {0x68, 0x04, 0x23, 0x00, 0x00, 0x00};
 
-	/**
-	 * 发送总召唤
-	 */
-	public static final byte[] CALL_ALL = new byte[] {0x68, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x64, 0x01, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x14};
-
-	/**
-	 * 发送电度总召唤
-	 */
-	public static final byte[] CALL_ALL_DEGREE = new byte[] {0x68, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x65, 0x01, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x45};
-
 	/**
 	 * 
 	* @Title: getGeneralCallRuleDetail104  
@@ -85,10 +75,10 @@ public class BasicInstruction104 {
 		int messageAddress = 0;
 		QualifiersEnum qualifiers = QualifiersEnum.generalCallGroupingQualifiers;
 		List<MessageInfo> messages = new ArrayList<>();
-//		MessageInfo message = new MessageInfo();
-//		message.setQualifiersType(qualifiers);
-//		message.setMessageInfos(new byte[] {});
-//		messages.add(message);
+		MessageInfo message = new MessageInfo();
+		message.setQualifiersType(qualifiers);
+		message.setMessageInfos(new byte[] {});
+		messages.add(message);
 		MessageDetail ruleDetail104 = new MessageDetail(control, typeIdentifierEnum, isContinuous, isTest, isPn, transferReason,
 				terminalAddress, messageAddress, messages, null, qualifiers);
 		return ruleDetail104;
@@ -217,10 +207,10 @@ public class BasicInstruction104 {
 		int messageAddress = 0;
 		QualifiersEnum qualifiers = QualifiersEnum.generalCallGroupingQualifiersDegree;
 		List<MessageInfo> messages = new ArrayList<>();
-//		MessageInfo message = new MessageInfo();
-//		message.setQualifiersType(qualifiers);
-//		message.setMessageInfos(new byte[] {});
-//		messages.add(message);
+		MessageInfo message = new MessageInfo();
+		message.setQualifiersType(qualifiers);
+		message.setMessageInfos(new byte[] {});
+		messages.add(message);
 		MessageDetail ruleDetail104 = new MessageDetail(control, typeIdentifierEnum, isContinuous, isTest, isPn, transferReason,
 				terminalAddress, messageAddress, messages, null, qualifiers);
 		return ruleDetail104;

platform-iec/src/main/java/com/ydl/iec/iec104/core/ScheduledTaskPool.java

@@ -134,7 +134,7 @@ public class ScheduledTaskPool {
 				sendTestThread = new Thread(() -> {
 					while (sendTestStatus) {
 						try {
-							LOGGER.info("发送测试链路指令，次数：" + sendTestNum);
+							// LOGGER.info("发送测试链路指令，次数：" + sendTestNum);
 							ctx.channel().writeAndFlush(BasicInstruction104.TESTFR);
 							sendTestNum++;
 							Thread.sleep(5000);
@@ -174,15 +174,14 @@ public class ScheduledTaskPool {
 			} else if (generalCallTThread == null) {
 				senGeneralCallStatus = true;
 				generalCallTThread = new Thread(() -> {
-					LOGGER.error("sendTestStatus: " + sendTestStatus);
+					LOGGER.info("sendTestStatus: " + sendTestStatus);
 					while (sendTestStatus) {
 						try {
-							LOGGER.error("发送总召唤指令" );
+							LOGGER.info("总召唤指令" );
 							// ctx.channel().writeAndFlush(BasicInstruction104.CALL_ALL);
 							ctx.channel().writeAndFlush(BasicInstruction104.getGeneralCallRuleDetail104());
 							Thread.sleep(1000 * 60 * 1);// 15分钟
-							//LOGGER.error("发送电度召唤指令," + ByteUtil.byteArrayToHexString(BasicInstruction104.CALL_ALL_DEGREE));
-							LOGGER.error("发送电度召唤指令" );
+							LOGGER.info("电度召唤指令" );
 							ctx.channel().writeAndFlush(BasicInstruction104.getGeneralCallRuleDetail104Degree());
 							Thread.sleep(1000 * 60 * 1);// 15分钟
 						} catch (Exception e) {

platform-iec/src/main/java/com/ydl/iec/iec104/enums/QualifiersEnum.java

@@ -21,7 +21,7 @@ public enum QualifiersEnum {
 	/**
 	 * 电度总召唤限定词 支持 老版的分组
 	 */
-	generalCallGroupingQualifiersDegree(TypeIdentifierEnum.generalCallDegree, 0x45),
+	generalCallGroupingQualifiersDegree(TypeIdentifierEnum.generalCallDegree, 0x05),
 	/**
 	 * 复位进程限定词
 	 */

platform-iec/src/main/java/com/ydl/iec/iec104/server/handler/SysSframeHandler.java

@@ -30,7 +30,7 @@ public class SysSframeHandler extends ChannelInboundHandlerAdapter {
 		byte[] bytes = new byte[result.readableBytes()];
 		result.readBytes(bytes);
 		if (isSysInstruction(bytes)) {
-			LOGGER.info("收到S帧" + Iec104Util.getAccept(ByteUtil.getByte(bytes, 2, 4)));
+			// LOGGER.info("收到S帧" + Iec104Util.getAccept(ByteUtil.getByte(bytes, 2, 4)));
 			ReferenceCountUtil.release(result);
 			return;
 		} 

platform-iec/src/main/java/com/ydl/iec/util/Iec104Util.java

@@ -14,10 +14,10 @@ import com.ydl.iec.iec104.enums.UControlEnum;
 public class Iec104Util {
 
 	private static int controlLength = 4;
-	public static String host = "192.168.2.21";
-	public static int port = 8404;
-	// public static String host = "127.0.0.1";
-	// public static int port = 2404;
+	// public static String host = "192.168.2.21";
+	// public static int port = 8404;
+	public static String host = "127.0.0.1";
+	public static int port = 2404;
 	/**
 	 * I 格式 低位在前
 	 * @param accept 接收序列号

platform-iec/src/test/java/com/ydl/iec/iec104/server/master/MasterSysDataHandler.java

@@ -22,8 +22,8 @@ public class MasterSysDataHandler implements DataHandler {
 			} catch (InterruptedException e) {
 				e.printStackTrace();
 			}
-			System.err.println("___________________________");
-			ctx.writeAndFlush(BasicInstruction104.getGeneralCallRuleDetail104());
+			System.err.println("2___________________________");
+			// ctx.writeAndFlush(BasicInstruction104.getGeneralCallRuleDetail104());
 		};
 		CachedThreadPool.getCachedThreadPool().execute(runnable);
 //		ctx.writeAndFlush(BasicInstruction104.getEndGeneralCallRuleDetail104());