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/controller/DockingManagementController.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 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 30b4b15..77bd3ea 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,12 +1,10 @@
package com.vci.ubcs.code.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException;
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.*;
import com.vci.ubcs.code.service.*;
@@ -17,13 +15,10 @@
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import javafx.scene.control.TableRow;
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.springblade.core.tool.utils.Func;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -41,6 +36,7 @@
@RequestMapping("/dockingManagement")
@Api(value = "鎺ュ彛绠＄悊", tags = "缂栫爜鐩稿叧鎺ュ彛绠＄悊淇℃伅")
public class DockingManagementController {
+
/***
* 闆嗘垚绯荤粺绠＄悊鏈嶅姟
*/
@@ -50,6 +46,7 @@
* 闆嗘垚鎺ュ彛閰嶇疆鏈嶅姟
*/
private final IDockingSystemConfigService dockingSystemConfigService;
+
/***
* 寰呴泦绠＄悊閰嶇疆鏈嶅姟
*/
@@ -93,7 +90,6 @@
return R.status(res);
}
-
/**
* 淇敼 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭�
* @param dockingSystemDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞�
@@ -104,7 +100,6 @@
DockingSystemVO dockingSystemVO = dockingSystemService.editSave(dockingSystemDTO);
return R.data(dockingSystemVO);
}
-
/**
* 鍒犻櫎绯荤粺闆嗘垚鐨勭郴缁熶俊鎭�
@@ -120,6 +115,7 @@
}
return R.success("鎿嶄綔鎴愬姛");
}
+
/**
* 绯荤粺闆嗘垚鍩虹淇℃伅鍒楄〃
* @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
@@ -169,6 +165,7 @@
return R.fail("淇濆瓨澶辫触!");
}
}
+
/**
* 鍒犻櫎绯荤粺闆嗘垚绯荤粺閰嶇疆淇℃伅
* @param oids 绯荤粺闆嗘垚鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
@@ -183,6 +180,7 @@
}
return R.success("鎿嶄綔鎴愬姛");
}
+
/***
* 鎺ュ彛淇℃伅鏄惁鍚敤/鍋滅敤
* @param sysInfoStatusDTO
@@ -222,7 +220,6 @@
IPage<DockingDataVO> pages = dokingSysManaentService.gridDockingData(condtionMap,query);
return R.data(pages);
}
-
/**
* data鍒楄〃
@@ -271,12 +268,24 @@
}
/**
+ * 鏍规嵁闆嗘垚鏃ュ織oid锛屾煡璇㈡棩蹇楄鎯�
+ * @param oid
+ * @return
+ */
+ @GetMapping("/gridLogeDetail")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "鍒嗛〉", notes = "DockingLogeVO")
+ public R<DockingLogeVO> getDockingLogDetailByOid(String oid) throws ServiceException {
+ return R.data(dokingSysManaentService.getDockingLogDetailByOid(oid));
+ }
+
+ /**
* 鎺ュ彛param鍒楄〃
* @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
*/
@GetMapping("/gridParam")
- @ApiOperationSupport(order = 3)
+ @ApiOperationSupport(order = 5)
@ApiOperation(value = "鍒嗛〉", notes = "dockingSysIntParam")
public R<IPage<DockingSysIntParamVO>>gridParam(BaseQueryObject queryObject){
Map<String,String> condtionMap=queryObject.getConditionMap();
@@ -296,7 +305,7 @@
* @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
*/
@GetMapping("/gridHeader")
- @ApiOperationSupport(order = 3)
+ @ApiOperationSupport(order = 6)
@ApiOperation(value = "鍒嗛〉", notes = "DockingSysIntHeaderVO")
public R<IPage<DockingSysIntHeaderVO>>gridHeader(BaseQueryObject queryObject){
Map<String,String> condtionMap=queryObject.getConditionMap();
@@ -311,6 +320,7 @@
}
+
/**
*鎵归噺澶勭悊
* 蹇呴』瑕佹湁鍒嗙被oid鍜宒ataoid
--
Gitblit v1.9.3