From 7d885c1d4c86f40927af50e6e7bfa13aac0c2180 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 21 十二月 2023 21:47:15 +0800 Subject: [PATCH] 1、common模块优化代码,Command命令中增加RTU命令结果返回webRul; 2、通信中间件增加了接收http下发RTU命令和内部命令的Controler; 3、RTU模拟器和控制器增加了上报完数据是否关闭TCP连接的控制。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java index 535171d..4e210ff 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java @@ -1,9 +1,12 @@ package com.dy.pipIrrGlobal.util; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.annotation.EnumValue; import com.dy.common.mybatis.envm.IEnum; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -27,11 +30,14 @@ } //鐢ㄦ潵杞琷son - public static Map<Byte, DistrictLevel> ObjMap = new HashMap<Byte, DistrictLevel>(); + public static List<Map> LevelList = new ArrayList<>(); static { DistrictLevel[] all = DistrictLevel.values(); for (DistrictLevel one : all) { - ObjMap.put(one.code, one); + Map<String, Object> objMap = new HashMap<>(); + objMap.put("code", one.code); + objMap.put("name", one.name); + LevelList.add(objMap) ; } } -- Gitblit v1.8.0