From 2cedb574c22cf2f77418929e79f23ace0a7e7ac6 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 29 四月 2024 10:05:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java | 79 +++++++++++++++++++++++++++++++--------
1 files changed, 63 insertions(+), 16 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 646d483..07ada19 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,29 +1,37 @@
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.*;
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.code.wrapper.*;
+import com.vci.ubcs.starter.util.UBCSCondition;
+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;
import javax.annotation.Resource;
+import java.util.Map;
@Service
public class DokingSysManaentServiceImpl extends ServiceImpl<DockingSystemConfigMapper, DockingSystemConfig> implements IDokingSysManaentService {
-
-// /***
+ // /***
// * 浠诲姟鐢熸垚鏈嶅姟
// */
// @Resource
// private IDockingTaskService dockingTaskService;
-
/***
* 鏃ュ織鐢熸垚鏈嶅姟
@@ -55,45 +63,84 @@
private IDockingDataService dockingDataService;
/**
* data鍒楄〃
- * @param dockingTask 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
*/
@Override
- public IPage<DockingTaskVO> gridDockingTask(DockingTask dockingTask, Query query) {
- IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingTask));
+ public IPage<DockingTaskVO> gridDockingTask(Map<String,String> condtionMap, Query query) {
+ IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query),UBCSSqlKeyword.buildConditionByMapString(condtionMap));
return DockingTaskWrapper.build().pageVO(pages);
}
@Override
- public IPage<DockingDataVO> gridDockingData(DockingData dockingData, Query query) {
- IPage<DockingData> pages=dockingDataService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingData));
+ public IPage<DockingDataVO> gridDockingData(Map<String,String> condtionMap, Query query) {
+ IPage<DockingData> pages=dockingDataService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap));
return DockingDataWrapper.build().pageVO(pages);
}
/**
+ * 鏍规嵁闆嗘垚鏃ュ織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 dockingLog 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
*/
@Override
- public IPage<DockingLogeVO> gridLoge(DockingLog dockingLog, Query query) {
- IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingLog));
+ public IPage<DockingLogeVO> gridLoge(Map<String,String> condtionMap, Query query) {
+ //IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingLog));
+ 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);
}
@Override
- public IPage<DockingSysIntParamVO> gridParam(DockingSysIntParam dockingSysIntParam, Query query) {
- IPage<DockingSysIntParam> pages=dockingSysIntParamService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingSysIntParam));
+ public IPage<DockingSysIntParamVO> gridParam(Map<String,String> condtionMap, Query query) {
+ IPage<DockingSysIntParam> pages=dockingSysIntParamService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap));
return DockingSysIntParamWrapper.build().pageVO(pages);
}
/**
* 鎺ュ彛param鍒楄〃
- * @param dockingSysIntHeader 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
*/
@Override
- public IPage<DockingSysIntHeaderVO> gridHeader(DockingSysIntHeader dockingSysIntHeader , Query query) {
- IPage<DockingSysIntHeader> pages = dockingSysIntHeaderService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingSysIntHeader));
+ public IPage<DockingSysIntHeaderVO> gridHeader(Map<String,String> condtionMap , Query query) {
+ IPage<DockingSysIntHeader> pages = dockingSysIntHeaderService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap));
return DockingSysIntHeaderWrapper.build().pageVO(pages);
}
+
}
--
Gitblit v1.9.3