From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 26 十一月 2024 17:25:39 +0800 Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改; 2、RTU升级模拟器增加命令行设置服务端IP和端口功能; 3、应王江海要求,井电双控协议中也实现远程升级功能,因井电双控协议、阀控器协议不同,而双方协议中的升级子协议相同,所以通信中间件做增量开发、适应性修改,以适应这种混合协议情况,同时也提高通信中间件运行效率。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mybatis/envm/Disabled.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mybatis/envm/Disabled.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mybatis/envm/Disabled.java index fd8e9f4..830a561 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mybatis/envm/Disabled.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mybatis/envm/Disabled.java @@ -1,10 +1,13 @@ package com.dy.common.mybatis.envm; +import com.baomidou.mybatisplus.annotation.EnumValue; + public enum Disabled implements IEnum{ YES((byte)1, "鏄�"), NO((byte)0, "鍚�"); + @EnumValue public Byte code ; public String name ; @@ -13,6 +16,14 @@ this.name = name ; } + /** + * 瀹為檯涓婅浆json锛岃Pojo鐨勫搴斿睘鎬� + * @return json + */ + //public String toString(){ + // return "{\"code\":" + this.code + "," + "\"name\":" + this.name + "}" ; + //} + @Override public Byte getCode() { return this.code ; -- Gitblit v1.8.0