From 4494a005613728c9dc22d018bca42ef5d3ebcf69 Mon Sep 17 00:00:00 2001 From: xiejun <xiejun@vci-tech.com> Date: 星期二, 14 一月 2025 20:41:47 +0800 Subject: [PATCH] 产品型号集成,类型转换,人员组织加日志,申请接口引用码段值校验 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 47 insertions(+), 4 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java index 988a97b..85b7cb8 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java @@ -1,7 +1,13 @@ package com.vci.ubcs.code.service.impl; +import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.vci.ubcs.code.entity.*; import com.vci.ubcs.code.mapper.DockingSystemConfigMapper; import com.vci.ubcs.code.service.*; @@ -11,6 +17,7 @@ import com.vci.ubcs.starter.util.UBCSSqlKeyword; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.utils.Func; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,13 +27,11 @@ @Service public class DokingSysManaentServiceImpl extends ServiceImpl<DockingSystemConfigMapper, DockingSystemConfig> implements IDokingSysManaentService { - -// /*** + // /*** // * 浠诲姟鐢熸垚鏈嶅姟 // */ // @Resource // private IDockingTaskService dockingTaskService; - /*** * 鏃ュ織鐢熸垚鏈嶅姟 @@ -74,6 +79,21 @@ } /** + * 鏍规嵁闆嗘垚鏃ュ織oid锛屾煡璇㈡棩蹇楄鎯� + * @param oid + * @return + * @throws ServiceException + */ + @Override + public DockingLogeVO getDockingLogDetailByOid(String oid) throws ServiceException { + if(Func.isBlank(oid)){ + throw new ServiceException("蹇呬紶鍙傛暟闆嗘垚鏃ュ織oid涓嶈兘涓虹┖锛�"); + } + DockingLog dockingLog = dockingLogeService.getOne(Wrappers.<DockingLog>query().lambda().eq(DockingLog::getOid, oid)); + return DockingLogeWrapper.build().entityVO(dockingLog); + } + + /** * 鎺ㄩ�佹暟鎹泦鎴愭棩蹇楀垪琛� * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃 @@ -81,7 +101,29 @@ @Override public IPage<DockingLogeVO> gridLoge(Map<String,String> condtionMap, Query query) { //IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingLog)); - IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap)); + LambdaQueryWrapper<DockingLog> lambdaQueryWrapper = UBCSCondition.getQueryWrapperByMapString(condtionMap, DockingLog.class).lambda(); + lambdaQueryWrapper.select( + DockingLog::getOid, + DockingLog::getCreateTime, + DockingLog::getCreator, + DockingLog::getLastModifier, + DockingLog::getLastModifyTime, + DockingLog::getTenantId, + DockingLog::getSystemOid, + DockingLog::getSystemCode, + DockingLog::getSystemName, + DockingLog::getClassifyOid, + DockingLog::getClassifyId, + DockingLog::getClassifyName, + DockingLog::getUniqueCode, + DockingLog::getType, + DockingLog::getMsg, + //DockingLog::getParamString, + DockingLog::getSendXml, + //DockingLog::getReturnString, + DockingLog::getInterfaceStatus + ); + IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), lambdaQueryWrapper); return DockingLogeWrapper.build().pageVO(pages); } @@ -100,4 +142,5 @@ IPage<DockingSysIntHeader> pages = dockingSysIntHeaderService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap)); return DockingSysIntHeaderWrapper.build().pageVO(pages); } + } -- Gitblit v1.9.3