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-sell/src/main/java/com/dy/pipIrrSell/client/DtoClientToSeClient.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClientToSeClient.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClientToSeClient.java
index 2130c60..4244c2a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClientToSeClient.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClientToSeClient.java
@@ -3,6 +3,7 @@
import com.dy.pipIrrGlobal.pojoSe.SeClient;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
+import org.mapstruct.ReportingPolicy;
import org.mapstruct.factory.Mappers;
/**
@@ -12,19 +13,22 @@
* @Description
*/
-@Mapper
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE)
public interface DtoClientToSeClient {
DtoClientToSeClient INSTANCT = Mappers.getMapper(DtoClientToSeClient.class);
- @Mapping(target = "villageid", source = "villageid")
- @Mapping(target = "blockid", source = "blockid")
- @Mapping(target = "divideid", source = "divideid")
+ @Mapping(target = "villageid", source = "villageId")
+ @Mapping(target = "blockid", source = "blockId")
+ @Mapping(target = "divideid", source = "divideId")
@Mapping(target = "name", source = "name")
@Mapping(target = "phone", source = "phone")
- @Mapping(target = "idcard", source = "idcard")
+ @Mapping(target = "idcard", source = "idCard")
@Mapping(target = "area", source = "area")
+ @Mapping(target = "typeid", source = "typeId")
@Mapping(target = "address", source = "address")
@Mapping(target = "remarks", source = "remarks")
@Mapping(target = "operator", source = "operator")
+ @Mapping(target = "disabled", ignore=true)
+ @Mapping(target = "deleted", ignore=true)
SeClient po2vo(DtoClient po);
}
--
Gitblit v1.8.0