From e1f235008ea146a9ddd283682c762cec4dca94cb Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 13 九月 2023 15:28:07 +0800
Subject: [PATCH] 接口管理接口搜索支持模糊查询
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java | 137 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 110 insertions(+), 27 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 c24f718..22eb94d 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,29 +1,31 @@
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;
import com.vci.ubcs.code.dto.UpdateSysInfoStatusDTO;
-import com.vci.ubcs.code.entity.DockingData;
-import com.vci.ubcs.code.entity.DockingSystem;
-import com.vci.ubcs.code.entity.DockingSystemConfig;
-import com.vci.ubcs.code.service.IDockingDataService;
-import com.vci.ubcs.code.service.IDockingSystemConfigService;
-import com.vci.ubcs.code.service.IDockingSystemService;
-import com.vci.ubcs.code.vo.pagemodel.DockingDataVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingSystemConfigVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingSystemVO;
-import com.vci.ubcs.code.wrapper.DockingDataWrapper;
-import com.vci.ubcs.code.wrapper.DockingSystemWrapper;
+import com.vci.ubcs.code.entity.*;
+import com.vci.ubcs.code.service.*;
+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;
import lombok.AllArgsConstructor;
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;
/**
* 鐮佹鍩虹淇℃伅鎺у埗鍣�
@@ -45,23 +47,28 @@
* 闆嗘垚鎺ュ彛閰嶇疆鏈嶅姟
*/
private final IDockingSystemConfigService dockingSystemConfigService;
-
+ /***
+ * 寰呴泦绠＄悊閰嶇疆鏈嶅姟
+ */
+ private final IDokingSysManaentService dokingSysManaentService;
/***
- * 寰呴泦鎴愭暟鎹湇鍔�
+ * 鍚屾闆嗘垚鏈嶅姟
*/
- private final IDockingDataService dockingDataService;
-
+ private final ICodeDuckingSyncService codeDuckingSyncService;
/**绯荤粺闆嗘垚鐨勭郴缁熶俊鎭垪琛�
- * @param dockingSystem 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
*@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(Map<String,String> condtionMap,Query query) {
+ if(!CollectionUtils.isEmpty(condtionMap)){}{
+ condtionMap=new HashMap<>();
+ }
+ IPage<DockingSystem> pages = dockingSystemService.page(Condition.getPage(query),UBCSSqlKeyword.buildConditionByMapString(condtionMap));
return R.data(DockingSystemWrapper.build().pageVO(pages));
}
@@ -105,14 +112,17 @@
}
/**
* 绯荤粺闆嗘垚鍩虹淇℃伅鍒楄〃
- * @param dockingSystemConfig 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @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(Map<String,String> condtionMap, Query query){
+ if(!CollectionUtils.isEmpty(condtionMap)){
+ condtionMap=new HashMap<>();
+ }
+ IPage<DockingSystemConfigVO> pages=dockingSystemConfigService.page(condtionMap,query);
return R.data(pages);
}
@@ -127,7 +137,7 @@
boolean res = dockingSystemConfigService.addSave(systemConfigDTO);
return R.success("淇濆瓨鎴愬姛!");
}catch (Throwable e){
- return R.fail("淇濆瓨澶辫触!");
+ return R.fail("淇濆瓨澶辫触!"+e.getMessage());
}
}
@@ -181,14 +191,87 @@
/**
* 寰呴泦鎴愭暟鎹�
- * @param dockingData 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃
*/
@GetMapping("/gridDockingData")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鍒嗛〉", notes = "DockingDataVO")
- public R<IPage<DockingDataVO>> gridDockingData(DockingData dockingData, Query query){
- IPage<DockingData> pages = dockingDataService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingData));
- return R.data(DockingDataWrapper.build().pageVO(pages));
+ public R<IPage<DockingDataVO>> gridDockingData(Map<String,String>condtionMap, Query query){
+ if(!CollectionUtils.isEmpty(condtionMap)){
+ condtionMap=new HashMap<>();
+ }
+ IPage<DockingDataVO> pages = dokingSysManaentService.gridDockingData(condtionMap,query);
+ return R.data(pages);
+ }
+
+
+ /**
+ * data鍒楄〃
+ * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
+ */
+ @GetMapping("/gridDockingTask")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "鍒嗛〉", notes = "condtionMap")
+ public R<IPage<DockingTaskVO>> gridDockingTask(Map<String,String> condtionMap, Query query){
+ if(!CollectionUtils.isEmpty(condtionMap)){
+ condtionMap=new HashMap<>();
+ }
+ IPage<DockingTaskVO> pages = dokingSysManaentService.gridDockingTask(condtionMap,query);
+ return R.data(pages);
+ }
+
+ /**
+ * 鎺ㄩ�佹暟鎹泦鎴愭棩蹇楀垪琛�
+ * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
+ */
+ @GetMapping("/gridLoge")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "鍒嗛〉", notes = "DockingLogeVO")
+ public R<IPage<DockingLogeVO>> gridLoge(Map<String,String> condtionMap, Query query){
+ if(!CollectionUtils.isEmpty(condtionMap)){
+ condtionMap=new HashMap<>();
+ }
+ IPage<DockingLogeVO> pages = dokingSysManaentService.gridLoge(condtionMap,query);
+ return R.data(pages);
+ }
+
+ /**
+ * 鎺ュ彛param鍒楄〃
+ * @param dockingSysIntParam 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
+ */
+ @GetMapping("/gridParam")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "鍒嗛〉", notes = "dockingSysIntParam")
+ public R<IPage<DockingSysIntParamVO>>gridParam(DockingSysIntParam dockingSysIntParam, Query query){
+ IPage<DockingSysIntParamVO> pages = dokingSysManaentService.gridParam(dockingSysIntParam,query);
+ return R.data(pages);
+ }
+
+ /**
+ * 鎺ュ彛param鍒楄〃
+ * @param dockingSysIntHeader 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
+ */
+ @GetMapping("/gridHeader")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "鍒嗛〉", notes = "DockingSysIntHeaderVO")
+ public R<IPage<DockingSysIntHeaderVO>>gridHeader(DockingSysIntHeader dockingSysIntHeader, Query query){
+ IPage<DockingSysIntHeaderVO> pages=dokingSysManaentService.gridHeader(dockingSysIntHeader,query);
+ return R.data(pages);
+
+
+ }
+ /**
+ *鎵归噺澶勭悊
+ * 蹇呴』瑕佹湁鍒嗙被oid鍜宒ataoid
+ * @return
+ */
+ @PostMapping("/sendData")
+ public R sendData(String oid){
+ return codeDuckingSyncService.sendData(oid);
}
}
--
Gitblit v1.9.3