From c29a6c5cd3f232ab61d9e97df17c63cf1e4b0755 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 07 十二月 2023 11:46:14 +0800
Subject: [PATCH] 分类路径注入，过滤默认属性、过滤表单不显示导致分类注入失败bug修改
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyValueController.java | 50 +++++++++++++++++++++++---------------------------
1 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyValueController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyValueController.java
index adaafe4..70092de 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyValueController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyValueController.java
@@ -1,23 +1,25 @@
package com.vci.ubcs.code.controller;
-
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.vci.ubcs.code.service.CodeClassifyValueServiceI;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.Tree;
-import com.vci.starter.web.pagemodel.TreeQueryObject;
-import com.vci.starter.web.util.VciBaseUtil;
import com.vci.ubcs.code.dto.CodeClassifyValueDTO;
+import com.vci.ubcs.code.service.ICodeClassifyValueService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyValueVO;
+import com.vci.ubcs.starter.revision.model.TreeQueryObject;
+
+import com.vci.ubcs.starter.web.pagemodel.Tree;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
+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;
+
/**
* 鍒嗙被鐮佹鐨勭爜鍊兼帶鍒跺櫒
@@ -32,7 +34,7 @@
* 鍒嗙被鐮佹鐨勭爜鍊� 鏈嶅姟
*/
@Autowired
- private CodeClassifyValueServiceI codeClassifyValueService;
+ private ICodeClassifyValueService codeClassifyValueService;
/**
* 鍒嗙被鐮佹鐨勭爜鍊兼爲
@@ -50,9 +52,8 @@
* @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
*/
@PostMapping( "/addSave")
- public BaseResult<CodeClassifyValueVO> addSave(@RequestBody CodeClassifyValueDTO codeClassifyValueDTO){
- CodeClassifyValueVO codeClassifyValueVO = codeClassifyValueService.addSave(codeClassifyValueDTO);
- return BaseResult.success(codeClassifyValueVO);
+ public R<CodeClassifyValueVO> addSave(@RequestBody CodeClassifyValueDTO codeClassifyValueDTO){
+ return R.status(codeClassifyValueService.addSave(codeClassifyValueDTO));
}
/**
@@ -61,9 +62,8 @@
* @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
*/
@PutMapping("/editSave")
- public BaseResult<CodeClassifyValueVO> editSave(@RequestBody CodeClassifyValueDTO codeClassifyValueDTO){
- CodeClassifyValueVO codeClassifyValueVO = codeClassifyValueService.editSave(codeClassifyValueDTO);
- return BaseResult.success(codeClassifyValueVO);
+ public R<CodeClassifyValueVO> editSave(@RequestBody CodeClassifyValueDTO codeClassifyValueDTO){
+ return R.status(codeClassifyValueService.editSave(codeClassifyValueDTO));
}
/**
@@ -72,7 +72,7 @@
* @return 鎵ц缁撴灉 success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
*/
@PostMapping( "/checkIsCanDelete")
- public BaseResult checkIsCanDelete( CodeClassifyValueDTO codeClassifyValueDTO) {
+ public R checkIsCanDelete(CodeClassifyValueDTO codeClassifyValueDTO) {
return codeClassifyValueService.checkIsCanDelete(codeClassifyValueDTO);
}
@@ -82,7 +82,7 @@
* @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
*/
@DeleteMapping( "/deleteData")
- public BaseResult delCodeClassifyValue( CodeClassifyValueDTO codeClassifyValueDTO) {
+ public R delCodeClassifyValue(@Valid @RequestBody CodeClassifyValueDTO codeClassifyValueDTO) {
return codeClassifyValueService.deleteCodeClassifyValue(codeClassifyValueDTO);
}
@@ -92,9 +92,9 @@
* @return 鍒嗙被鐮佹鐨勭爜鍊兼樉绀哄璞�
*/
@GetMapping("/getObjectByOid")
- public BaseResult<CodeClassifyValueVO> getObjectByOid(String oid){
+ public R<CodeClassifyValueVO> getObjectByOid(String oid){
CodeClassifyValueVO codeClassifyValueVO = codeClassifyValueService.getObjectByOid(oid);
- return BaseResult.success(codeClassifyValueVO);
+ return R.data(codeClassifyValueVO);
}
/**
@@ -103,14 +103,10 @@
* @return 鍒嗙被鐮佹鐨勭爜鍊兼樉绀哄璞�
*/
@GetMapping("/listDataByOids")
- public BaseResult<CodeClassifyValueVO> listCodeClassifyValueByOids(String oids){
+ public R<Collection<CodeClassifyValueVO>> listCodeClassifyValueByOids(String oids){
Collection<CodeClassifyValueVO> voCollection = codeClassifyValueService.listCodeClassifyValueByOids(VciBaseUtil.str2List(oids));
- BaseResult baseResult = BaseResult.success();
- baseResult.setData(voCollection);
- return baseResult;
+ return R.data(voCollection);
}
-
-
/**
* 鍙傜収鏍� 鍒嗙被鐮佹鐨勭爜鍊�
@@ -128,19 +124,19 @@
* @return 鎵ц缁撴灉
*/
@PostMapping("/saveOrder")
- public BaseResult saveOrder(@RequestBody Map<String,Object> param){
+ public R saveOrder(@RequestBody Map<String,Object> param){
JSONArray json = JSONArray.parseArray(String.valueOf(param.get("dtoList")));
List<CodeClassifyValueDTO> dtoList = new ArrayList<>();
for (int i = 0; i < json.size(); i++) {
CodeClassifyValueDTO codeFixedValueDTO = JSONObject.toJavaObject(JSONObject.parseObject(JSONObject.toJSONString(json.get(i))), CodeClassifyValueDTO.class);
dtoList.add(codeFixedValueDTO);
}
- String codeclassifysecoid = (String) param.get("codeclassifysecoid");
+ String codeClassifySecOid = (String) param.get("codeClassifySecOid");
VciBaseUtil.alertNotNull(dtoList,"鐮佸�奸泦鍚�");
if (CollectionUtils.isEmpty(dtoList)){
- return BaseResult.success();
+ return R.success("");
}
- return codeClassifyValueService.batchSave4Order(dtoList,codeclassifysecoid);
+ return codeClassifyValueService.batchSave4Order(dtoList,codeClassifySecOid);
}
}
--
Gitblit v1.9.3