From 9cacfb217b2dbf58c7efd1d96e818798a97d9382 Mon Sep 17 00:00:00 2001 From: ludc <pUXmgxCf6A> Date: 星期四, 18 五月 2023 20:13:08 +0800 Subject: [PATCH] 以及发布webservice接口功能搭建,将通通用接口移植过来 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempbuttonServiceImpl.java | 16 +++------------- 1 files changed, 3 insertions(+), 13 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempbuttonServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempbuttonServiceImpl.java index 034e69e..84a46e4 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempbuttonServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempbuttonServiceImpl.java @@ -17,8 +17,6 @@ package com.vci.ubcs.code.service.impl; import com.alibaba.nacos.common.utils.StringUtils; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -26,7 +24,6 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.vci.ubcs.code.constant.MdmBtmTypeConstant; import com.vci.ubcs.code.dto.CodeClassifyTemplateButtonDTO; -import com.vci.ubcs.code.dto.CodeClassifyValueDTO; import com.vci.ubcs.code.entity.*; import com.vci.ubcs.code.enumpack.CodeButtonUseEnum; import com.vci.ubcs.code.mapper.CodeClassifyTemplateButtonMapper; @@ -35,29 +32,23 @@ import com.vci.ubcs.code.vo.pagemodel.CodeButtonVO; import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateButtonVO; import com.vci.ubcs.code.wrapper.CodeTempbuttonWrapper; -import com.vci.ubcs.common.utils.PageDO2PageVO; import com.vci.ubcs.starter.exception.VciBaseException; import com.vci.ubcs.starter.revision.service.RevisionModelUtil; import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil; -import com.vci.ubcs.starter.util.Map2MPLLambdaUtil; -import com.vci.ubcs.starter.web.pagemodel.DataGrid; +import com.vci.ubcs.starter.util.Map2MPJLambdaUtil; import com.vci.ubcs.starter.web.pagemodel.PageHelper; import com.vci.ubcs.starter.web.util.BeanUtil; import com.vci.ubcs.starter.web.util.BeanUtilForVCI; import com.vci.ubcs.starter.web.util.VciBaseUtil; -import com.vci.ubcs.starter.web.util.WebUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.Func; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cglib.beans.BeanMap; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import javax.annotation.Resource; -import java.lang.reflect.Field; import java.util.*; import java.util.stream.Collectors; @@ -114,8 +105,7 @@ IPage<CodeClassifyTemplateButton> doList = codeClassifyTemplateButtonMapper.selectPage(Condition.getPage(query),getMPJLambdaWrapper(conditionMap)); IPage<CodeClassifyTemplateButtonVO> voList = new Page<>(); if (!CollectionUtils.isEmpty(doList.getRecords())) { - voList.setRecords(codeClassifyTemplateButtonDO2VOs(doList.getRecords())); - voList = PageDO2PageVO.pageDO2PageVO(doList,voList); + voList = CodeTempbuttonWrapper.build().pageVO(doList); } return voList; } @@ -295,7 +285,7 @@ CodeClassifyTemplateButton codeClassifyTemplateButton = new CodeClassifyTemplateButton(); BeanMap beanMap = BeanMap.create(codeClassifyTemplateButton); beanMap.putAll(conditionMap); - MPJLambdaWrapper<CodeClassifyTemplateButton> mpjLambdaWrapper = Map2MPLLambdaUtil.getMPJLambdaWrapper(codeClassifyTemplateButton) + MPJLambdaWrapper<CodeClassifyTemplateButton> mpjLambdaWrapper = Map2MPJLambdaUtil.getMPJLambdaWrapper(codeClassifyTemplateButton) .selectAll(CodeClassifyTemplateButton.class) .selectAs(CodeButton::getName, CodeClassifyTemplateButton::getClassifyButtonOidName) .selectAs(CodeButton::getId, CodeClassifyTemplateButton::getClassifyButtonId) -- Gitblit v1.9.3