From a17f731ee4bcad459c184be5a7c3de6c3619443b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 07 六月 2023 19:47:03 +0800
Subject: [PATCH] 代码整合
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java | 30 ++++++++++--------------------
1 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java
index e70d868..3a83061 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java
@@ -8,6 +8,7 @@
import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
import com.vci.ubcs.code.wrapper.CodeBasicSecWrapper;
import com.vci.ubcs.starter.exception.VciBaseException;
+import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -40,27 +41,16 @@
@Autowired
private ICodeBasicSecService codeBasicSecService;
- /**
- * 缂栫爜瑙勫垯 鍒嗛〉
- */
- @GetMapping("/list")
- @ApiOperationSupport(order = 1)
- @ApiOperation(value = "鍒嗛〉", notes = "浼犲叆codeRuleVO")
- public R<IPage<CodeBasicSecVO>> list(CodeBasicSec codeBasicSec, Query query) {
- IPage<CodeBasicSec> pages = codeBasicSecService.page(Condition.getPage(query), Condition.getQueryWrapper(codeBasicSec));
- return R.data(CodeBasicSecWrapper.build().pageVO(pages));
- }
-
/**
* 鐮佹鍩虹淇℃伅鍒楄〃
- * @param codeBasicSecVO 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param bladeQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃
*/
@GetMapping("/gridCodeBasicSec")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鍒嗛〉 鐮佹鍩虹淇℃伅鍒楄〃", notes = "浼犲叆codeRuleVO")
- public R<IPage<CodeBasicSecVO>> gridCodeBasicSec(CodeBasicSecVO codeBasicSecVO, Query query){
- IPage<CodeBasicSecVO> codeRuleVOIPage = codeBasicSecService.gridCodeBasicSec(Condition.getPage(query.setAscs("ordernum")),codeBasicSecVO);
+ public R<IPage<CodeBasicSecVO>> gridCodeBasicSec(BladeQueryObject bladeQueryObject){
+ IPage<CodeBasicSecVO> codeRuleVOIPage = codeBasicSecService.gridCodeBasicSec(bladeQueryObject.getQuery().setAscs("ordernum"),bladeQueryObject.getConditionMap());
return R.data(codeRuleVOIPage);
}
@@ -139,26 +129,26 @@
/**
* 鍙傜収鐮佹鍩虹淇℃伅鍒楄〃
- * @param codeBasicSecVO 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param bladeQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
*/
@GetMapping("/refDataGrid")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "鍙傜収鐮佹鍩虹淇℃伅鍒楄〃", notes = "codeBasicSecVO")
- public R<IPage<CodeBasicSecVO>> refDataGridCodeBasicSec(CodeBasicSecVO codeBasicSecVO, Query query){
- return R.data(codeBasicSecService.refDataGridCodeBasicSec(Condition.getPage(query),codeBasicSecVO));
+ public R<IPage<CodeBasicSecVO>> refDataGridCodeBasicSec(BladeQueryObject bladeQueryObject){
+ return R.data(codeBasicSecService.refDataGridCodeBasicSec(bladeQueryObject.getQuery(), bladeQueryObject.getConditionMap()));
}
/**
* 鍙傛暟鍒嗙被鐮佹鍩虹淇℃伅鍒楄〃
- * @param codeBasicSecVO 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑锛屽繀椤昏鏈夌紪鐮佽鍒欑殑涓婚敭 pkCodeRule
+ * @param bladeQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑锛屽繀椤昏鏈夌紪鐮佽鍒欑殑涓婚敭 pkCodeRule
* @return 鐮佹鐨勪俊鎭�
*/
@GetMapping("/refDataGridClassifySec")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "鍙傛暟鍒嗙被鐮佹鍩虹淇℃伅鍒楄〃", notes = "codeBasicSecVO")
- public R<IPage<CodeBasicSecVO>> refDataGridClassifySec(CodeBasicSecVO codeBasicSecVO, Query query){
- return R.data(codeBasicSecService.refDataGridClassifySec(Condition.getPage(query.setAscs("ordernum")), codeBasicSecVO));
+ public R<IPage<CodeBasicSecVO>> refDataGridClassifySec(BladeQueryObject bladeQueryObject){
+ return R.data(codeBasicSecService.refDataGridClassifySec(bladeQueryObject.getQuery(), bladeQueryObject.getConditionMap()));
}
/**
--
Gitblit v1.9.3