From 99bf09fbc855590e209dda4cd2b6c725101cbe9c Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 26 七月 2024 14:39:43 +0800 Subject: [PATCH] 1、完善代码,把开关阀类型编码改为BCD码; 2、制定并实现协议“定时关阀计划开阀(A1H)”和“定量关阀计划开阀(A2H)”. --- pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictVoMapper.java | 9 ++++++--- 1 files changed, 6 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 90b5d8f..387a609 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,12 @@ 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.factory.Mappers; -@Mapper(uses = {TypeConversionDistrict.class}) +@Mapper(uses = {TypeConversionEnum.class}) public interface DistrictVoMapper { DistrictVoMapper INSTANCT = Mappers.getMapper(DistrictVoMapper.class); /** @@ -14,9 +14,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