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-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictVoMapper.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictVoMapper.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictVoMapper.java
index 3b79344..22e00a6 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictVoMapper.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictVoMapper.java
@@ -1,12 +1,13 @@
package com.dy.pipIrrBase.district;
import com.dy.pipIrrGlobal.pojoBa.BaDistrict;
-import com.dy.pipIrrGlobal.util.TypeConversionDistrict;
+import com.dy.pipIrrGlobal.util.TypeConversionEnum;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
+import org.mapstruct.ReportingPolicy;
import org.mapstruct.factory.Mappers;
-@Mapper(uses = {TypeConversionDistrict.class})
+@Mapper(uses = {TypeConversionEnum.class}, unmappedTargetPolicy = ReportingPolicy.IGNORE)
public interface DistrictVoMapper {
DistrictVoMapper INSTANCT = Mappers.getMapper(DistrictVoMapper.class);
/**
@@ -14,8 +15,12 @@
* @param vo 鍊煎璞�
* @return po
*/
- @Mapping(target = "id", ignore = true)
+ @Mapping(target = "id", source = "id")
+ @Mapping(target = "supperId", source = "supperId")
@Mapping(target = "name", source = "name")
+ @Mapping(target = "num", source = "num")
@Mapping(target = "level", source = "level", qualifiedByName = "districtLevelByteToObj")
+ @Mapping(target = "deleted", source = "deleted", qualifiedByName = "deletedByteToObj")
+ @Mapping(target = "subDistricts", ignore = true)
BaDistrict convert(DistrictVo vo);
}
--
Gitblit v1.8.0