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); } 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); 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); } } 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); } 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("字典已经存在!");