From f244272cd66b2adcd367f07cb3f0cd89f51df17d Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 06 七月 2023 16:37:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/feign/DictBizClient.java | 3 ++-
Source/UBCS/ubcs-service-api/ubcs-dict-api/src/main/java/com/vci/ubcs/system/feign/IDictBizClient.java | 5 +++--
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DictBizController.java | 13 +++++++++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java | 12 ++++++------
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DictBizServiceImpl.java | 2 +-
5 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-dict-api/src/main/java/com/vci/ubcs/system/feign/IDictBizClient.java b/Source/UBCS/ubcs-service-api/ubcs-dict-api/src/main/java/com/vci/ubcs/system/feign/IDictBizClient.java
index 59c2b25..f0fd7b9 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-dict-api/src/main/java/com/vci/ubcs/system/feign/IDictBizClient.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-dict-api/src/main/java/com/vci/ubcs/system/feign/IDictBizClient.java
@@ -22,6 +22,7 @@
import com.vci.ubcs.system.entity.DictBiz;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
@@ -79,7 +80,7 @@
* @param dictBiz 瀛楀吀鏁版嵁
* @return
*/
- @GetMapping(CHECK_VALUE)
- R getCheck(@Valid @RequestBody DictBiz dictBiz);
+ @PostMapping(CHECK_VALUE)
+ R getCheck(@RequestBody DictBiz dictBiz);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
index 87f43fd..1f1a0bc 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
@@ -460,8 +460,8 @@
for (String s : prefix) {
DictBiz dictBiz = new DictBiz();
dictBiz.setCode(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR);
- dictBiz.setDictKey(s);
- dictBiz.setDictValue("prefix");
+ dictBiz.setDictKey("prefix");
+ dictBiz.setDictValue(s);
iDictBizClient.getCheck(dictBiz) ;
}
// .saveBySameNamespaceAndFlag(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR,"prefix",prefix,sessionInfo);
@@ -470,8 +470,8 @@
for (String s : suffix) {
DictBiz dictBiz = new DictBiz();
dictBiz.setCode(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR);
- dictBiz.setDictKey(s);
- dictBiz.setDictValue("suffix");
+ dictBiz.setDictKey("suffix");
+ dictBiz.setDictValue(s);
iDictBizClient.getCheck(dictBiz) ;
}
// charService.saveBySameNamespaceAndFlag(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR,"suffix",suffix,sessionInfo);
@@ -480,8 +480,8 @@
for (String s : dateFormates) {
DictBiz dictBiz = new DictBiz();
dictBiz.setCode(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR);
- dictBiz.setDictKey(s);
- dictBiz.setDictValue("dateFormates");
+ dictBiz.setDictKey("dateFormates");
+ dictBiz.setDictValue(s);
iDictBizClient.getCheck(dictBiz) ;
}
// charService.saveBySameNamespaceAndFlag(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR,"dateFormates",dateFormates,sessionInfo);
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DictBizController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DictBizController.java
index 86efba4..29b8775 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DictBizController.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DictBizController.java
@@ -16,6 +16,7 @@
*/
package com.vci.ubcs.system.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.system.entity.DictBiz;
@@ -175,5 +176,17 @@
return R.data(DictBizWrapper.build().listNodeVO(tree));
}
+ /**
+ * 鑾峰彇鍙�夋嫨鐨勫垪琛�
+ */
+ @GetMapping("/listByFlag")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "璇︽儏", notes = "浼犲叆dict")
+ public R<List<DictBiz>> listByFlag(DictBiz dict) {
+// QueryWrapper<DictBiz> wrapper = new QueryWrapper<>();
+ List<DictBiz> details = dictService.list(Condition.getQueryWrapper(dict));
+ return R.data(details);
+ }
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/feign/DictBizClient.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/feign/DictBizClient.java
index d66a6b6..34c37da 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/feign/DictBizClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/feign/DictBizClient.java
@@ -23,6 +23,7 @@
import org.springblade.core.tool.api.R;
import com.vci.ubcs.system.entity.DictBiz;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
@@ -67,7 +68,7 @@
* @return
*/
@Override
- @GetMapping(CHECK_VALUE)
+ @PostMapping(CHECK_VALUE)
public R getCheck(DictBiz dictBiz) {
return service.checkOrInsert(dictBiz);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DictBizServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DictBizServiceImpl.java
index 7e8788c..287785f 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DictBizServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DictBizServiceImpl.java
@@ -121,7 +121,7 @@
@Override
public R checkOrInsert(DictBiz dictBiz) {
- LambdaQueryWrapper<DictBiz> lqw = Wrappers.<DictBiz>query().lambda().eq(DictBiz::getCode, dictBiz.getCode()).eq(DictBiz::getDictKey, dictBiz.getDictKey());
+ LambdaQueryWrapper<DictBiz> lqw = Wrappers.<DictBiz>query().lambda().eq(DictBiz::getCode, dictBiz.getCode()).eq(DictBiz::getDictKey, dictBiz.getDictKey()).eq(DictBiz::getDictValue, dictBiz.getDictValue());
Long cnt = baseMapper.selectCount((Func.isEmpty(dictBiz.getId())) ? lqw : lqw.notIn(DictBiz::getId, dictBiz.getId()));
if (cnt > 0L) {
return R.fail("瀛楀吀宸茬粡瀛樺湪锛�");
--
Gitblit v1.9.3