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/java/com/dy/pipIrrGlobal/util/TypeConversionDistrict.java |   36 ++++++++++++++++++++++++++++++++++++
 1 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/TypeConversionDistrict.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/TypeConversionDistrict.java
new file mode 100644
index 0000000..ed3fcb7
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/TypeConversionDistrict.java
@@ -0,0 +1,36 @@
+package com.dy.pipIrrGlobal.util;
+
+import org.mapstruct.Named;
+import org.springframework.stereotype.Component;
+import java.util.Objects;
+
+/**
+ * Mapping閫氱敤杞崲
+ */
+@Component
+@SuppressWarnings("")
+public class TypeConversionDistrict {
+    /**
+     * @param obj 鍙傛暟
+     * @return 杞崲鎴愮殑瀵硅薄
+     */
+    @Named("districtLevelByteToObj")
+    public DistrictLevel converseDistrictLevel(Object obj) {
+        if (Objects.isNull(obj)) {
+            return null;
+        }else{
+            byte sourceObj = (obj instanceof Byte?(Byte)obj: DistrictLevel.City.code);
+            DistrictLevel rObj = null ;
+            if(sourceObj == DistrictLevel.City.code){
+                rObj = DistrictLevel.City ;
+            }else if(sourceObj == DistrictLevel.County.code){
+                rObj = DistrictLevel.County ;
+            }else if(sourceObj == DistrictLevel.Town.code){
+                rObj = DistrictLevel.Town ;
+            }else if(sourceObj == DistrictLevel.Village.code){
+                rObj = DistrictLevel.Village ;
+            }
+            return rObj ;
+        }
+    }
+}

--
Gitblit v1.8.0