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/activeCard/RechargeDtoMapper.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/RechargeDtoMapper.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/RechargeDtoMapper.java
index b44ca2c..dcf6502 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/RechargeDtoMapper.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/RechargeDtoMapper.java
@@ -3,6 +3,7 @@
import com.dy.pipIrrSell.recharge.DtoRecharge;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
+import org.mapstruct.ReportingPolicy;
import org.mapstruct.factory.Mappers;
/**
@@ -12,12 +13,14 @@
* @Description 灏咲toActiveCard鏄犲皠涓篋toRecharge
*/
-@Mapper
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE)
public interface RechargeDtoMapper {
RechargeDtoMapper INSTANCT = Mappers.getMapper(RechargeDtoMapper.class);
- @Mapping(target = "cardAddr", source = "cardAddr")
+ //@Mapping(target = "cardId", source = "cardId")
@Mapping(target = "clientId", source = "clientId")
+
+ @Mapping(target = "cardNum", source = "cardNum")
@Mapping(target = "amount", source = "amount")
@Mapping(target = "paymentId", source = "paymentId")
@Mapping(target = "remarks", source = "remarks")
--
Gitblit v1.8.0