From 84ee37e1f485a1d3136535f9ef1c43058d9308ab Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 29 十一月 2023 11:39:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java | 80 ++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java
index afe623b..7dec639 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java
@@ -1,60 +1,68 @@
package com.vci.ubcs.code.controller;
-
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.vci.ubcs.code.service.CodeFixedValueServiceI;
-import com.vci.starter.web.pagemodel.BaseQueryObject;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.util.VciBaseUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.dto.CodeFixedValueDTO;
+import com.vci.ubcs.code.entity.CodeFixedValue;
+import com.vci.ubcs.code.service.ICodeFixedValueService;
import com.vci.ubcs.code.vo.pagemodel.CodeFixedValueVO;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
+
/**
* 鍥哄畾鐮佹鐨勭爜鍊兼帶鍒跺櫒
*
- * @author weidy
+ * @author ludc
* @date 2022-01-24
*/
@RestController
@RequestMapping("/codeFixedValueController")
+@Api(value = "鍥哄畾鐮佹鐨勭爜鍊兼帶鍒跺櫒", tags = "鍥哄畾鐮佹鐨勭爜鍊兼帶鍒跺櫒")
public class CodeFixedValueController {
+
/**
* 鍥哄畾鐮佹鐨勭爜鍊� 鏈嶅姟
*/
@Autowired
- private CodeFixedValueServiceI codeFixedValueService;
+ private ICodeFixedValueService codeFixedValueService;
/**
* 鍥哄畾鐮佹鐨勭爜鍊煎垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param codeFixedValueVO query 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 鍥哄畾鐮佹鐨勭爜鍊兼樉绀哄璞″垪琛�
*/
@GetMapping("/gridCodeFixedValue")
- public DataGrid<CodeFixedValueVO> gridCodeFixedValue(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeFixedValueService.gridCodeFixedValue(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "鍥哄畾鐮佹鐨勭爜鍊煎垪琛�", notes = "CodeFixedValueVO")
+ public R<IPage<CodeFixedValueVO>> gridCodeFixedValue(CodeFixedValueVO codeFixedValueVO, Query query){
+ return R.data(codeFixedValueService.gridCodeFixedValue(codeFixedValueVO, Condition.getPage(query.setAscs("orderNum"))));
}
+
/**
* 澧炲姞 鍥哄畾鐮佹鐨勭爜鍊�
* @param codeFixedValueDTO 鍥哄畾鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞�
* @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
*/
@PostMapping( "/addSave")
- public BaseResult<CodeFixedValueVO> addSave(@RequestBody CodeFixedValueDTO codeFixedValueDTO){
- CodeFixedValueVO codeFixedValueVO = codeFixedValueService.addSave(codeFixedValueDTO);
- return BaseResult.success(codeFixedValueVO);
+ public R addSave(@RequestBody CodeFixedValueDTO codeFixedValueDTO){
+ boolean resBoolean = codeFixedValueService.addSave(codeFixedValueDTO);
+ return R.status(resBoolean);
}
/**
@@ -63,11 +71,10 @@
* @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
*/
@PutMapping("/editSave")
- public BaseResult<CodeFixedValueVO> editSave(@RequestBody CodeFixedValueDTO codeFixedValueDTO){
- CodeFixedValueVO codeFixedValueVO = codeFixedValueService.editSave(codeFixedValueDTO);
- return BaseResult.success(codeFixedValueVO);
+ public R editSave(@RequestBody CodeFixedValueDTO codeFixedValueDTO){
+ boolean resBoolean = codeFixedValueService.editSave(codeFixedValueDTO);
+ return R.status(resBoolean);
}
-
/**
* 鍒犻櫎鍥哄畾鐮佹鐨勭爜鍊�
@@ -75,7 +82,7 @@
* @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
*/
@DeleteMapping( "/deleteData")
- public BaseResult delCodeFixedValue( CodeFixedValueDTO codeFixedValueDTO) {
+ public R delCodeFixedValue(@Valid @RequestBody CodeFixedValueDTO codeFixedValueDTO) {
return codeFixedValueService.deleteCodeFixedValue(codeFixedValueDTO);
}
@@ -85,9 +92,9 @@
* @return 鍥哄畾鐮佹鐨勭爜鍊兼樉绀哄璞�
*/
@GetMapping("/getObjectByOid")
- public BaseResult<CodeFixedValueVO> getObjectByOid(String oid){
+ public R<CodeFixedValueVO> getObjectByOid(String oid){
CodeFixedValueVO codeFixedValueVO = codeFixedValueService.getObjectByOid(oid);
- return BaseResult.success(codeFixedValueVO);
+ return R.data(codeFixedValueVO);
}
/**
@@ -96,26 +103,19 @@
* @return 鍥哄畾鐮佹鐨勭爜鍊兼樉绀哄璞�
*/
@GetMapping("/listDataByOids")
- public BaseResult<CodeFixedValueVO> listCodeFixedValueByOids(String oids){
+ public R<Collection<CodeFixedValueVO>> listCodeFixedValueByOids(String oids){
Collection<CodeFixedValueVO> voCollection = codeFixedValueService.listCodeFixedValueByOids(VciBaseUtil.str2List(oids));
- BaseResult baseResult = BaseResult.success();
- baseResult.setData(voCollection);
- return baseResult;
+ return R.data(voCollection);
}
-
-
/**
* 鍙傜収鍥哄畾鐮佹鐨勭爜鍊煎垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param codeFixedValueVO query 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 鍥哄畾鐮佹鐨勭爜鍊兼樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
*/
@GetMapping("/refDataGrid")
- public DataGrid<CodeFixedValueVO> refDataGridCodeFixedValue(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeFixedValueService.refDataGridCodeFixedValue(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
+ public R<IPage<CodeFixedValueVO>> refDataGridCodeFixedValue(CodeFixedValueVO codeFixedValueVO, Query query){
+ return R.data(codeFixedValueService.refDataGridCodeFixedValue(codeFixedValueVO,Condition.getPage(query.setAscs("ordernum"))));
}
/**
@@ -124,17 +124,17 @@
* @return 鎵ц缁撴灉
*/
@PostMapping("/saveOrder")
- public BaseResult<CodeFixedValueVO> batchSave4Order(@RequestBody Map<String,Object> param){
- JSONArray json = JSONArray.parseArray(String.valueOf(param.get("dtoList")));
+ public R batchSave4Order(@RequestBody Map<String,Object> param){
+ JSONArray json = JSONArray.parseArray(String.valueOf(param.get("dtoList")));
List<CodeFixedValueDTO> dtoList = new ArrayList<>();
for (int i = 0; i < json.size(); i++) {
CodeFixedValueDTO codeFixedValueDTO = JSONObject.toJavaObject(JSONObject.parseObject(JSONObject.toJSONString(json.get(i))), CodeFixedValueDTO.class);
dtoList.add(codeFixedValueDTO);
}
- String codefixedsecoid = (String) param.get("codefixedsecoid");
+ String codefixedsecoid = (String) param.get("codeFixedSecOid");
VciBaseUtil.alertNotNull(dtoList,"鐮佸�煎璞￠泦鍚�",codefixedsecoid,"鍥哄畾鐮佹鐨勪富閿�");
if (CollectionUtils.isEmpty(dtoList)){
- return codeFixedValueService.batchDeleteBySecOid(codefixedsecoid);
+ return R.status(codeFixedValueService.batchDeleteBySecOid(codefixedsecoid));
}
return codeFixedValueService.batchSave4Order(dtoList,codefixedsecoid);
}
--
Gitblit v1.9.3