From 1b8120cacac0037fcb1f8ae747c2f54eb735368b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 09 五月 2023 18:50:51 +0800
Subject: [PATCH] 代码整合
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeTemplatePhaseController.java | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeTemplatePhaseController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeTemplatePhaseController.java
index ffa1900..78bc11a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeTemplatePhaseController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeTemplatePhaseController.java
@@ -16,27 +16,28 @@
*/
package com.vci.ubcs.code.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.ubcs.code.dto.CodeTemplatePhaseDTO;
import com.vci.ubcs.code.service.ICodeTempphaseService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseEntityVO;
+import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseVO;
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import com.vci.ubcs.starter.web.pagemodel.DataGrid;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
import java.util.Collection;
/**
* 缂栫爜搴撳畾涔�-妯℃澘闃舵 鎺у埗鍣�
*
* @author ludc
- * @since 2023-04-20
+ * @since 2023-05-07
*/
@RestController
@AllArgsConstructor
@@ -51,13 +52,12 @@
/**
* 妯℃澘闃舵鍒楄〃
- * @param codeTemplatePhaseVO 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @param query
+ * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 妯℃澘闃舵鏄剧ず瀵硅薄鍒楄〃
*/
@GetMapping("/gridCodeTemplatePhase")
- public DataGrid<CodeTemplatePhaseEntityVO> gridCodeTemplatePhase(CodeTemplatePhaseEntityVO codeTemplatePhaseVO, Query query){
- return codeTemplatePhaseService.gridCodeTemplatePhase(codeTemplatePhaseVO,query);
+ public R<IPage<CodeTemplatePhaseVO>> gridCodeTemplatePhase(BaseQueryObject baseQueryObject){
+ return R.data(codeTemplatePhaseService.gridCodeTemplatePhase(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper()));
}
/**
@@ -66,7 +66,7 @@
* @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
*/
@PostMapping( "/addSave")
- public R<CodeTemplatePhaseEntityVO> addSave(@RequestBody CodeTemplatePhaseDTO codeTemplatePhaseDTO){
+ public R<CodeTemplatePhaseVO> addSave(@Valid @RequestBody CodeTemplatePhaseDTO codeTemplatePhaseDTO){
return R.data(codeTemplatePhaseService.addSave(codeTemplatePhaseDTO));
}
@@ -76,9 +76,8 @@
* @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
*/
@PutMapping("/editSave")
- public R<CodeTemplatePhaseEntityVO> editSave(@RequestBody CodeTemplatePhaseDTO codeTemplatePhaseDTO){
- CodeTemplatePhaseEntityVO codeTemplatePhaseVO = codeTemplatePhaseService.editSave(codeTemplatePhaseDTO);
- return R.data(codeTemplatePhaseVO);
+ public R<CodeTemplatePhaseVO> editSave(@Valid @RequestBody CodeTemplatePhaseDTO codeTemplatePhaseDTO){
+ return R.data(codeTemplatePhaseService.editSave(codeTemplatePhaseDTO));
}
/**
@@ -87,7 +86,7 @@
* @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
*/
@DeleteMapping( "/deleteData")
- public R delCodeTemplatePhase( CodeTemplatePhaseDTO codeTemplatePhaseDTO) {
+ public R delCodeTemplatePhase(@Valid @RequestBody CodeTemplatePhaseDTO codeTemplatePhaseDTO) {
return codeTemplatePhaseService.deleteCodeTemplatePhase(codeTemplatePhaseDTO);
}
@@ -97,8 +96,8 @@
* @return 妯℃澘闃舵鏄剧ず瀵硅薄
*/
@GetMapping("/getObjectByOid")
- public R<CodeTemplatePhaseEntityVO> getObjectByOid(String oid){
- CodeTemplatePhaseEntityVO codeTemplatePhaseVO = codeTemplatePhaseService.getObjectByOid(oid);
+ public R<CodeTemplatePhaseVO> getObjectByOid(String oid){
+ CodeTemplatePhaseVO codeTemplatePhaseVO = codeTemplatePhaseService.getObjectByOid(oid);
return R.data(codeTemplatePhaseVO);
}
@@ -108,8 +107,8 @@
* @return 妯℃澘闃舵鏄剧ず瀵硅薄
*/
@GetMapping("/listDataByOids")
- public R<Collection<CodeTemplatePhaseEntityVO>> listCodeTemplatePhaseByOids(String oids){
- Collection<CodeTemplatePhaseEntityVO> voCollection = codeTemplatePhaseService.listCodeTemplatePhaseByOids(VciBaseUtil.str2List(oids));
+ public R<Collection<CodeTemplatePhaseVO>> listCodeTemplatePhaseByOids(String oids){
+ Collection<CodeTemplatePhaseVO> voCollection = codeTemplatePhaseService.listCodeTemplatePhaseByOids(VciBaseUtil.str2List(oids));
return R.data(voCollection);
}
@@ -119,7 +118,7 @@
* @return 妯℃澘闃舵鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
*/
@GetMapping("/refDataGrid")
- public DataGrid<CodeTemplatePhaseEntityVO> refDataGridCodeTemplatePhase(BaseQueryObject baseQueryObject){
+ public IPage<CodeTemplatePhaseVO> refDataGridCodeTemplatePhase(BaseQueryObject baseQueryObject){
if(baseQueryObject == null){
baseQueryObject = new BaseQueryObject();
}
@@ -132,8 +131,8 @@
* @return 灞炴�х殑淇℃伅
*/
@GetMapping("/gridUnUsedAttribute")
- public DataGrid<CodeClassifyTemplateAttrVO> gridUnUsedAttribute(BaseQueryObject baseQueryObject){
- return codeTemplatePhaseService.gridUnUsedAttribute(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
+ public R<IPage<CodeClassifyTemplateAttrVO>> gridUnUsedAttribute(BaseQueryObject baseQueryObject){
+ return R.data(codeTemplatePhaseService.gridUnUsedAttribute(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper()));
}
/**
@@ -142,8 +141,8 @@
* @return 灞炴�х殑淇℃伅
*/
@GetMapping("/gridUsedAttribute")
- public DataGrid<CodeClassifyTemplateAttrVO> gridUsedAttribute(BaseQueryObject baseQueryObject){
- return codeTemplatePhaseService.gridUsedAttribute(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
+ public R<IPage<CodeClassifyTemplateAttrVO>> gridUsedAttribute(BaseQueryObject baseQueryObject){
+ return R.data(codeTemplatePhaseService.gridUsedAttribute(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper()));
}
}
--
Gitblit v1.9.3