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-global/src/main/resources/mapper/BaDictItemMapper.xml | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDictItemMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDictItemMapper.xml index 626c080..957e209 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDictItemMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDictItemMapper.xml @@ -192,7 +192,9 @@ <!--鏍规嵁瀛楀吀Code鑾峰彇瀛楀吀椤�--> <select id="getDictItemsByDictCode" resultType="com.dy.pipIrrGlobal.voBa.VoDictItem"> SELECT - name, value + id AS dictItemId, + name, + value FROM ba_dict_item WHERE deleted = 0 AND status = 1 AND dict_code = #{dictCode} ORDER BY sort -- Gitblit v1.8.0