From c42614978ff12013a1eabebd0289b27169a5784f Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 06 五月 2025 17:25:56 +0800 Subject: [PATCH] 1、实现万功能token(0000-0000-1234-9876-5); 2、web端单独实现命令结果等待器,并相应修改相关部分; 3、web端实现透传命令; 4、修改一些不当注释; 5、优化一些代码。 --- pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictVoMapper.java | 10 +++++++--- 1 files changed, 7 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..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,9 +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