From 8381325223bee254168855b1b697db31fc591b9e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 19 九月 2023 09:28:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java | 74 ++++++++++++++++++++++++++++--------
1 files changed, 57 insertions(+), 17 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
index 93fa594..e73f0da 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
@@ -1,7 +1,9 @@
package com.vci.ubcs.code.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.vci.ubcs.code.dto.DockingSystemConfigDTO;
import com.vci.ubcs.code.dto.DockingSystemDTO;
import com.vci.ubcs.code.dto.DockingTaskDTO;
@@ -11,6 +13,7 @@
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.code.wrapper.*;
import com.vci.ubcs.starter.exception.VciBaseException;
+import com.vci.ubcs.starter.util.UBCSSqlKeyword;
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -18,8 +21,10 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -53,14 +58,21 @@
private final ICodeDuckingSyncService codeDuckingSyncService;
/**绯荤粺闆嗘垚鐨勭郴缁熶俊鎭垪琛�
- * @param dockingSystem 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
*@return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
*/
@GetMapping("/gridDockingSystem")
@ApiOperationSupport(order = 3)
- @ApiOperation(value = "鍒嗛〉", notes = "dockingSystem")
- public R<IPage<DockingSystemVO>> page(DockingSystem dockingSystem, Query query) {
- IPage<DockingSystem> pages = dockingSystemService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingSystem));
+ @ApiOperation(value = "鍒嗛〉", notes = "condtionMap")
+ public R<IPage<DockingSystemVO>> page(BaseQueryObject queryObject) {
+ Map<String,String> condtionMap=queryObject.getConditionMap();
+ Query query=new Query();
+ if(CollectionUtils.isEmpty(condtionMap)){
+ condtionMap=new HashMap<>();
+ }
+ query.setCurrent(queryObject.getPage());
+ query.setSize(queryObject.getLimit());
+ IPage<DockingSystem> pages = dockingSystemService.page(Condition.getPage(query),UBCSSqlKeyword.buildConditionByMapString(condtionMap));
return R.data(DockingSystemWrapper.build().pageVO(pages));
}
@@ -104,14 +116,21 @@
}
/**
* 绯荤粺闆嗘垚鍩虹淇℃伅鍒楄〃
- * @param dockingSystemConfig 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃
*/
@GetMapping("/gridSystemConfig")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鍒嗛〉", notes = "dockingSystemConfig")
- public R<IPage<DockingSystemConfigVO>> gridSystemConfig(DockingSystemConfig dockingSystemConfig, Query query){
- IPage<DockingSystemConfigVO> pages=dockingSystemConfigService.page(dockingSystemConfig,query);
+ public R<IPage<DockingSystemConfigVO>> gridSystemConfig(BaseQueryObject queryObject){
+ Map<String,String> condtionMap=queryObject.getConditionMap();
+ Query query=new Query();
+ if(CollectionUtils.isEmpty(condtionMap)){
+ condtionMap=new HashMap<>();
+ }
+ query.setCurrent(queryObject.getPage());
+ query.setSize(queryObject.getLimit());
+ IPage<DockingSystemConfigVO> pages=dockingSystemConfigService.page(condtionMap,query);
return R.data(pages);
}
@@ -180,41 +199,62 @@
/**
* 寰呴泦鎴愭暟鎹�
- * @param dockingData 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃
*/
@GetMapping("/gridDockingData")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鍒嗛〉", notes = "DockingDataVO")
- public R<IPage<DockingDataVO>> gridDockingData(DockingData dockingData, Query query){
- IPage<DockingDataVO> pages = dokingSysManaentService.gridDockingData(dockingData,query);
+ public R<IPage<DockingDataVO>> gridDockingData(BaseQueryObject queryObject){
+ Map<String,String> condtionMap=queryObject.getConditionMap();
+ Query query=new Query();
+ if(CollectionUtils.isEmpty(condtionMap)){
+ condtionMap=new HashMap<>();
+ }
+ query.setCurrent(queryObject.getPage());
+ query.setSize(queryObject.getLimit());
+ IPage<DockingDataVO> pages = dokingSysManaentService.gridDockingData(condtionMap,query);
return R.data(pages);
}
/**
* data鍒楄〃
- * @param dockingTask 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
*/
@GetMapping("/gridDockingTask")
@ApiOperationSupport(order = 3)
- @ApiOperation(value = "鍒嗛〉", notes = "DockingTaskVO")
- public R<IPage<DockingTaskVO>> gridDockingTask(DockingTask dockingTask, Query query){
- IPage<DockingTaskVO> pages = dokingSysManaentService.gridDockingTask(dockingTask,query);
+ @ApiOperation(value = "鍒嗛〉", notes = "condtionMap")
+ public R<IPage<DockingTaskVO>> gridDockingTask(BaseQueryObject queryObject){
+ Map<String,String> condtionMap=queryObject.getConditionMap();
+ Query query=new Query();
+ if(CollectionUtils.isEmpty(condtionMap)){
+ condtionMap=new HashMap<>();
+ }
+ query.setCurrent(queryObject.getPage());
+ query.setSize(queryObject.getLimit());
+ IPage<DockingTaskVO> pages = dokingSysManaentService.gridDockingTask(condtionMap,query);
return R.data(pages);
}
/**
* 鎺ㄩ�佹暟鎹泦鎴愭棩蹇楀垪琛�
- * @param dockingLog 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
*/
@GetMapping("/gridLoge")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鍒嗛〉", notes = "DockingLogeVO")
- public R<IPage<DockingLogeVO>> gridLoge(DockingLog dockingLog, Query query){
- IPage<DockingLogeVO> pages = dokingSysManaentService.gridLoge(dockingLog,query);
+ public R<IPage<DockingLogeVO>> gridLoge(BaseQueryObject queryObject){
+ Map<String,String> condtionMap=queryObject.getConditionMap();
+ Query query=new Query();
+ if(CollectionUtils.isEmpty(condtionMap)){
+ condtionMap=new HashMap<>();
+ }
+ query.setCurrent(queryObject.getPage());
+ query.setSize(queryObject.getLimit());
+ IPage<DockingLogeVO> pages = dokingSysManaentService.gridLoge(condtionMap,query);
return R.data(pages);
}
--
Gitblit v1.9.3