From ce567eb11cd0cdbd826214c355d1a8caff175dca Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 15 十一月 2023 14:25:22 +0800
Subject: [PATCH] bug列表：181（修复新增，修改，删除接口，新增时没设置默认值，导致在建分类时无法查询到，关键属性查重规则）183（历史数据导入模板下载，过滤掉模板中配置的默认属性）
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java | 279 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 151 insertions(+), 128 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 5f81558..84531ef 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
@@ -4,28 +4,28 @@
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.dto.CodeBasicSecDTO;
import com.vci.ubcs.code.dto.CodeOrderDTO;
-import com.vci.ubcs.code.dto.CodeRuleDTO;
-import com.vci.ubcs.code.entity.CodeBasicSec;
+import com.vci.ubcs.code.dto.CodeOrderSecDTO;
import com.vci.ubcs.code.service.ICodeBasicSecService;
import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
-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;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.rmi.ServerException;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.Map;
/**
@@ -39,144 +39,144 @@
@Api(value = "鐮佹鍩虹淇℃伅鎺у埗鍣�", tags = "鐮佹鍩虹淇℃伅鎺у埗鍣�")
public class CodeBasicSecController {
- /**
- * 鐮佹鍩虹淇℃伅 鏈嶅姟
- */
- @Autowired
- private ICodeBasicSecService codeBasicSecService;
+ /**
+ * 鐮佹鍩虹淇℃伅 鏈嶅姟
+ */
+ @Autowired
+ private ICodeBasicSecService codeBasicSecService;
- /**
- * 鐮佹鍩虹淇℃伅鍒楄〃
- * @param bladeQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃
- */
- @GetMapping("/gridCodeBasicSec")
+ /**
+ * 鐮佹鍩虹淇℃伅鍒楄〃
+ * @param bladeQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃
+ */
+ @GetMapping("/gridCodeBasicSec")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鍒嗛〉 鐮佹鍩虹淇℃伅鍒楄〃", notes = "浼犲叆codeRuleVO")
- public R<IPage<CodeBasicSecVO>> gridCodeBasicSec(BladeQueryObject bladeQueryObject) throws Exception{
+ public R<IPage<CodeBasicSecVO>> gridCodeBasicSec(BladeQueryObject bladeQueryObject) throws Exception{
IPage<CodeBasicSecVO> codeRuleVOIPage = codeBasicSecService.gridCodeBasicSec(bladeQueryObject.getQuery().setAscs("ordernum"),bladeQueryObject.getConditionMap());
return R.data(codeRuleVOIPage);
- }
+ }
/**
- * 澧炲姞 鐮佹鍩虹淇℃伅
- * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PostMapping( "/addSave")
+ * 澧炲姞 鐮佹鍩虹淇℃伅
+ * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
+ * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
+ */
+ @PostMapping( "/addSave")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "澧炲姞 鐮佹鍩虹淇℃伅", notes = "codeBasicSecDTO")
- public R addSave(@Valid @RequestBody CodeBasicSecDTO codeBasicSecDTO){
+ public R addSave(@Valid @RequestBody CodeBasicSecDTO codeBasicSecDTO){
boolean resBoolean;
- try {
+ try {
resBoolean = codeBasicSecService.addSave(codeBasicSecDTO);
} catch (VciBaseException e) {
- return R.fail(e.getCode());
- }
- return R.status(resBoolean);
- }
+ return R.fail(e.getCode());
+ }
+ return R.status(resBoolean);
+ }
- /** 淇敼 鐮佹鍩虹淇℃伅
- * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PutMapping("/editSave")
+ /** 淇敼 鐮佹鍩虹淇℃伅
+ * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
+ * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
+ */
+ @PutMapping("/editSave")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "淇敼 鐮佹鍩虹淇℃伅", notes = "codeBasicSecDTO")
- public R editSave(@RequestBody CodeBasicSecDTO codeBasicSecDTO){
+ public R editSave(@RequestBody CodeBasicSecDTO codeBasicSecDTO) throws ServerException{
boolean resBoolean;
- try {
+ try {
resBoolean = codeBasicSecService.editSave(codeBasicSecDTO);
} catch (VciBaseException e) {
- return R.fail(e.getCode());
- }
- return R.status(resBoolean);
- }
-
- /**
- * 鍒犻櫎鐮佹鍩虹淇℃伅
- * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @DeleteMapping( "/deleteData")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "鍒犻櫎鐮佹鍩虹淇℃伅", notes = "codeBasicSecDTO")
- public R delCodeBasicSec(@Valid @RequestBody CodeBasicSecDTO codeBasicSecDTO) {
- return codeBasicSecService.deleteCodeBasicSec(codeBasicSecDTO);
- }
-
- /**
- * 涓婚敭鑾峰彇鐮佹鍩虹淇℃伅
- * @param oid 涓婚敭
- * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄
- */
- @GetMapping("/getObjectByOid")
- @ApiOperationSupport(order = 6)
- @ApiOperation(value = "鍒犻櫎鐮佹鍩虹淇℃伅", notes = "codeBasicSecDTO")
- public R<CodeBasicSecVO> getObjectByOid(String oid){
- CodeBasicSecVO codeBasicSecVO = codeBasicSecService.getObjectByOid(oid);
- return R.data(codeBasicSecVO);
- }
+ return R.fail(e.getCode());
+ }
+ return R.status(resBoolean);
+ }
/**
- * 涓婚敭鎵归噺鑾峰彇鐮佹鍩虹淇℃伅
- * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄
- */
- @GetMapping("/listDataByOids")
+ * 鍒犻櫎鐮佹鍩虹淇℃伅
+ * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
+ * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
+ */
+ @DeleteMapping( "/deleteData")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "鍒犻櫎鐮佹鍩虹淇℃伅", notes = "codeBasicSecDTO")
+ public R delCodeBasicSec(@Valid @RequestBody CodeBasicSecDTO codeBasicSecDTO) {
+ return codeBasicSecService.deleteCodeBasicSec(codeBasicSecDTO);
+ }
+
+ /**
+ * 涓婚敭鑾峰彇鐮佹鍩虹淇℃伅
+ * @param oid 涓婚敭
+ * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄
+ */
+ @GetMapping("/getObjectByOid")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "鍒犻櫎鐮佹鍩虹淇℃伅", notes = "codeBasicSecDTO")
+ public R<CodeBasicSecVO> getObjectByOid(String oid){
+ CodeBasicSecVO codeBasicSecVO = codeBasicSecService.getObjectByOid(oid);
+ return R.data(codeBasicSecVO);
+ }
+
+ /**
+ * 涓婚敭鎵归噺鑾峰彇鐮佹鍩虹淇℃伅
+ * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
+ * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄
+ */
+ @GetMapping("/listDataByOids")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "涓婚敭鎵归噺鑾峰彇鐮佹鍩虹淇℃伅", notes = "oids")
- public R<Collection<CodeBasicSecVO>> listCodeBasicSecByOids(String oids){
+ public R<Collection<CodeBasicSecVO>> listCodeBasicSecByOids(String oids){
Collection<CodeBasicSecVO> voCollection = codeBasicSecService.listCodeBasicSecByOids(VciBaseUtil.str2List(oids));
return R.data(voCollection);
- }
+ }
- /**
- * 鍙傜収鐮佹鍩虹淇℃伅鍒楄〃
- * @param bladeQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
- */
- @GetMapping("/refDataGrid")
+ /**
+ * 鍙傜収鐮佹鍩虹淇℃伅鍒楄〃
+ * @param bladeQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
+ */
+ @GetMapping("/refDataGrid")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "鍙傜収鐮佹鍩虹淇℃伅鍒楄〃", notes = "codeBasicSecVO")
- public R<IPage<CodeBasicSecVO>> refDataGridCodeBasicSec(BladeQueryObject bladeQueryObject){
- return R.data(codeBasicSecService.refDataGridCodeBasicSec(bladeQueryObject.getQuery(), bladeQueryObject.getConditionMap()));
- }
+ public R<IPage<CodeBasicSecVO>> refDataGridCodeBasicSec(BladeQueryObject bladeQueryObject){
+ return R.data(codeBasicSecService.refDataGridCodeBasicSec(bladeQueryObject.getQuery(), bladeQueryObject.getConditionMap()));
+ }
- /**
- * 鍙傛暟鍒嗙被鐮佹鍩虹淇℃伅鍒楄〃
- * @param bladeQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑锛屽繀椤昏鏈夌紪鐮佽鍒欑殑涓婚敭 pkCodeRule
- * @return 鐮佹鐨勪俊鎭�
- */
- @GetMapping("/refDataGridClassifySec")
+ /**
+ * 鍙傛暟鍒嗙被鐮佹鍩虹淇℃伅鍒楄〃
+ * @param bladeQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑锛屽繀椤昏鏈夌紪鐮佽鍒欑殑涓婚敭 pkCodeRule
+ * @return 鐮佹鐨勪俊鎭�
+ */
+ @GetMapping("/refDataGridClassifySec")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "鍙傛暟鍒嗙被鐮佹鍩虹淇℃伅鍒楄〃", notes = "codeBasicSecVO")
- public R<IPage<CodeBasicSecVO>> refDataGridClassifySec(BladeQueryObject bladeQueryObject){
- return R.data(codeBasicSecService.refDataGridClassifySec(bladeQueryObject.getQuery(), bladeQueryObject.getConditionMap()));
- }
+ public R<IPage<CodeBasicSecVO>> refDataGridClassifySec(BladeQueryObject bladeQueryObject){
+ return R.data(codeBasicSecService.refDataGridClassifySec(bladeQueryObject.getQuery(), bladeQueryObject.getConditionMap()));
+ }
- /**
- * 鍏嬮殕鐮佹淇℃伅
- * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄锛宱idArr锛氶�夋嫨婧愮爜娈典富閿殑闆嗗悎锛宲kCodeRule锛氱洰鏍囩紪鐮佽鍒欑殑涓婚敭
- * @return 鍏嬮殕缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @PostMapping("/clone")
+ /**
+ * 鍏嬮殕鐮佹淇℃伅
+ * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄锛宱idArr锛氶�夋嫨婧愮爜娈典富閿殑闆嗗悎锛宲kCodeRule锛氱洰鏍囩紪鐮佽鍒欑殑涓婚敭
+ * @return 鍏嬮殕缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
+ */
+ @PostMapping("/clone")
@ApiOperationSupport(order = 10)
@ApiOperation(value = "鍏嬮殕鐮佹淇℃伅", notes = "codeBasicSecDTO")
- public R cloneCodeBasicSec(@RequestBody CodeBasicSecDTO codeBasicSecDTO) throws ServerException {
- VciBaseUtil.alertNotNull(codeBasicSecDTO.getOidArr(),"閫夋嫨鐮佹涓婚敭");
- List<String> oidArr = VciBaseUtil.str2List(codeBasicSecDTO.getOidArr());
- if (CollectionUtils.isEmpty(oidArr)){
- return R.fail("閫夋嫨鐮佹涓婚敭涓嶈兘涓虹┖");
- }
- return codeBasicSecService.cloneCodeBasicSec(oidArr,codeBasicSecDTO.getPkCodeRule());
- }
+ public R cloneCodeBasicSec(@RequestBody CodeBasicSecDTO codeBasicSecDTO) throws ServerException {
+ VciBaseUtil.alertNotNull(codeBasicSecDTO.getOidArr(),"閫夋嫨鐮佹涓婚敭");
+ List<String> oidArr = VciBaseUtil.str2List(codeBasicSecDTO.getOidArr());
+ if (CollectionUtils.isEmpty(oidArr)){
+ return R.fail("閫夋嫨鐮佹涓婚敭涓嶈兘涓虹┖");
+ }
+ return codeBasicSecService.cloneCodeBasicSec(oidArr,codeBasicSecDTO.getPkCodeRule());
+ }
- /**
- * 鏌ヨ鐩爣鍒嗙被鐮佹鎵�鍦ㄧ殑鏍戠粨鏋�
- * @param oid 鐩爣鍒嗙被鐮佹涓婚敭
- * @return 鍒嗙被鐮佹鏍戠粨鏋�
- */
+ /**
+ * 鏌ヨ鐩爣鍒嗙被鐮佹鎵�鍦ㄧ殑鏍戠粨鏋�
+ * @param oid 鐩爣鍒嗙被鐮佹涓婚敭
+ * @return 鍒嗙被鐮佹鏍戠粨鏋�
+ */
/*@GetMapping("/treeCodeClassifySec")
@ApiOperationSupport(order = 11)
@ApiOperation(value = "鏌ヨ鐩爣鍒嗙被鐮佹鎵�鍦ㄧ殑鏍戠粨鏋�", notes = "oid")
@@ -185,29 +185,29 @@
return codeBasicSecService.gridCodeClassifySecTree(oid);
}*/
- /**
- * 涓婄Щ
- * @param oid 涓婚敭
- * @return 鎵ц缁撴灉
- */
- @PostMapping("/upOrderNum")
+ /**
+ * 涓婄Щ
+ * @param oid 涓婚敭
+ * @return 鎵ц缁撴灉
+ */
+ @PostMapping("/upOrderNum")
@ApiOperationSupport(order = 11)
@ApiOperation(value = "涓婄Щ", notes = "oid")
- public R upOrderNum(@Valid @RequestParam String oid){
- return R.status(codeBasicSecService.upOrderNum(oid));
- }
+ public R upOrderNum(@Valid @RequestParam String oid){
+ return R.status(codeBasicSecService.upOrderNum(oid));
+ }
- /**
- * 涓嬬Щ
- * @param oid 涓婚敭
- * @return 鎵ц缁撴灉
- */
- @PostMapping("/downOrderNum")
+ /**
+ * 涓嬬Щ
+ * @param oid 涓婚敭
+ * @return 鎵ц缁撴灉
+ */
+ @PostMapping("/downOrderNum")
@ApiOperationSupport(order = 12)
@ApiOperation(value = "涓嬬Щ", notes = "oid")
- public R downOrderNum(@Valid @RequestParam String oid){
- return R.status(codeBasicSecService.downOrderNum(oid));
- }
+ public R downOrderNum(@Valid @RequestParam String oid){
+ return R.status(codeBasicSecService.downOrderNum(oid));
+ }
/**
* 鏌ヨ缂栫爜瑙勫垯鐨勬墍鏈夋祦姘翠緷璧栫殑鐮佹
@@ -221,7 +221,6 @@
return R.data(codeBasicSecService.getSerialNumberDepend(ruleOid));
}
-
/**
* 璁剧疆鏈�澶ф祦姘村彿
* @param codeOrderDTO 缂栫爜鐢宠浼犺緭瀵硅薄
@@ -233,4 +232,28 @@
public R setMaxSerialNumberForCodeRule(@RequestBody CodeOrderDTO codeOrderDTO){
return R.success(codeBasicSecService.setMaxSerialNumberForCodeRule(codeOrderDTO));
}
+
+ /***
+ * 鏍规嵁娴佹按渚濊禆鑾峰彇鏈�澶ф祦姘村彿
+ * @param secMap
+ * @return
+ */
+ @GetMapping("/getMaxSerialNumberForCodeRule")
+ @ApiOperationSupport(order = 15)
+ @ApiOperation(value = "鏌ヨ缂栫爜瑙勫垯鐨勬墍鏈夋祦姘翠緷璧栫殑鏈�澶ф祦姘�", notes = "浼犲叆oid")
+ public R getMaxSerialNumberForCodeRule(@RequestParam Map<String,String> secMap){
+ if (secMap.isEmpty() && Func.isBlank(secMap.get("codeRuleOid"))) {
+ throw new ServiceException("鏈�澶ф祦姘村彿鐨勬祦姘翠緷璧栦笉鑳戒负绌猴紒");
+ }
+ CodeOrderDTO codeOrderDTO = new CodeOrderDTO();
+ codeOrderDTO.setCodeRuleOid(secMap.get("codeRuleOid"));
+ secMap.remove("codeRuleOid");
+ List<CodeOrderSecDTO> secDTOList = new ArrayList<>();
+ secMap.entrySet().stream().forEach(item->{
+ secDTOList.add(new CodeOrderSecDTO(item.getKey(),item.getValue()));
+ });
+ codeOrderDTO.setSecDTOList(secDTOList);
+ return R.data(codeBasicSecService.getMaxSerialNumberForCodeRule(codeOrderDTO));
+ }
+
}
--
Gitblit v1.9.3