From 55400f5a76ea389970b2efebe7d0ea8b86a9f746 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 12 七月 2023 10:34:26 +0800
Subject: [PATCH] 编码规则码值查询接口修正
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java | 86 +++++++++++++++++++++++++++++++++++--------
1 files changed, 70 insertions(+), 16 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
index 7ce4a1d..c7c4c3f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
@@ -17,17 +17,15 @@
package com.vci.ubcs.code.service.impl;
import com.alibaba.cloud.commons.lang.StringUtils;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
import com.vci.ubcs.code.dto.CodeBasicSecDTO;
import com.vci.ubcs.code.dto.CodeRuleDTO;
import com.vci.ubcs.code.entity.*;
+import com.vci.ubcs.code.enumpack.CodeSecTypeEnum;
import com.vci.ubcs.code.lifecycle.CodeRuleLC;
import com.vci.ubcs.code.mapper.CodeRuleMapper;
import com.vci.ubcs.code.mapper.CodeSerialValueMapper;
@@ -36,6 +34,7 @@
import com.vci.ubcs.code.service.ICodeBasicSecService;
import com.vci.ubcs.code.service.ICodeClassifyService;
import com.vci.ubcs.code.service.ICodeRuleService;
+import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.ubcs.code.wrapper.CodeClassifyWrapper;
@@ -44,17 +43,15 @@
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.UBCSCondition;
-import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
-import com.vci.ubcs.starter.web.pagemodel.KeyValue;
+import com.vci.ubcs.starter.web.pagemodel.*;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.starter.web.util.WebUtil;
-import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.Func;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -125,15 +122,39 @@
* @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
*/
@Override
- public boolean addSave(CodeRuleDTO codeRuleDTO) throws VciBaseException {
+ public R addSave(CodeRuleDTO codeRuleDTO) throws VciBaseException {
VciBaseUtil.alertNotNull(codeRuleDTO, "闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
- //灏咲TO杞崲涓篋O
+ if(checkCodeRuleRepeat(codeRuleDTO)){
+ return R.fail("瑙勫垯缂栧彿宸插瓨鍦紒");
+ }
+ // 灏咲TO杞崲涓篋O
CodeRule codeRule = Objects.requireNonNull(BeanUtil.copy(codeRuleDTO, CodeRule.class));
- String userId = AuthUtil.getUserId().toString();
+ // 濉厖榛樿鍊�
DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeRule, MdmBtmTypeConstant.CODE_RULE);
codeRule.setLctid(CODE_RULE_LC);
codeRule.setLcStatus(FRAMEWORK_RELEASE_EDITING);
- return codeRuleMapper.insert(codeRule)>0;
+ return R.status(codeRuleMapper.insert(codeRule)>0);
+ }
+
+ /**
+ * 妫�鏌d缂栧彿鏄惁閲嶅
+ * @param codeRuleDTO 褰撳墠鍒ゆ柇鏄惁閲嶅鐨勫璞�
+ * @return 杩斿洖false琛ㄧず鏈噸澶�
+ */
+ @Override
+ public boolean checkCodeRuleRepeat(CodeRuleDTO codeRuleDTO){
+ List<CodeRule> codeRulesList = this.codeRuleMapper.selectList(Wrappers.<CodeRule>query().lambda().eq(CodeRule::getId, codeRuleDTO.getId()));
+ if(!codeRulesList.isEmpty()){
+ return codeRulesList.parallelStream().anyMatch(codeRule -> {
+ if(StringUtils.isNotBlank(codeRuleDTO.getOid())){
+ // 浠ｈ〃鏄慨鏀�
+ return !codeRule.getOid().equals(codeRuleDTO.getOid());
+ }else {
+ return true;
+ }
+ });
+ }
+ return false;
}
/**
@@ -143,7 +164,7 @@
* @return true琛ㄧず鍙互缂栬緫鎴栧垹闄わ紝false琛ㄧず涓嶅彲浠�
*/
@Override
- public boolean checkEditDelStatus(String lcStatus) {
+ public boolean checkEditDelStatus(String lcStatus) throws VciBaseException {
if (CodeRuleLC.RELEASED.getValue().equals(lcStatus) || CodeRuleLC.DISABLED.getValue().equals(lcStatus)) {
return false;
}
@@ -158,8 +179,11 @@
* @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
*/
@Override
- public boolean editSave(CodeRuleDTO codeRuleDTO) throws VciBaseException{
+ public R editSave(CodeRuleDTO codeRuleDTO) throws VciBaseException{
VciBaseUtil.alertNotNull(codeRuleDTO, "鏁版嵁瀵硅薄", codeRuleDTO.getOid(), "涓绘暟鎹紪鐮佽鍒欎富閿�");
+ if(checkCodeRuleRepeat(codeRuleDTO)){
+ return R.fail("瑙勫垯缂栧彿宸插瓨鍦紒");
+ }
if (!checkEditDelStatus(codeRuleDTO.getLcStatus())) {
throw new VciBaseException("缂栫爜瑙勫垯宸插彂甯冿紝涓嶅厑璁哥紪杈戞垨鍒犻櫎");
}
@@ -167,7 +191,7 @@
CodeRule codeRule = selectByOid(codeRuleDTO.getOid());
revisionModelUtil.copyFromDTOIgnore(codeRuleDTO, codeRule);
DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeRule);
- return codeRuleMapper.updateById(codeRule)>0;
+ return R.status(codeRuleMapper.updateById(codeRule)>0);
}
/**
@@ -439,7 +463,6 @@
return R.data(exFlag&&exFlag1);
}
-
/**
* 浣跨敤涓婚敭鑾峰彇缂栫爜瑙勫垯鐨勫唴瀹�
*
@@ -450,6 +473,34 @@
public CodeRuleVO getObjectHasSecByOid(String oid) {
CodeRule ruleDO = selectByOid(oid);
return codeRuleDO2VO(ruleDO, true);
+ }
+
+ /**
+ * 妫�鏌ョ浉浼肩紪鐮佽鍒欙紝骞惰繑鍥炲搴旂殑缁撴灉
+ * @param oid 涓婚敭
+ * @return 鎵ц缁撴灉
+ */
+ @Override
+ public R checkLikeCodeRule(String oid) throws VciBaseException {
+ CodeRuleVO codeRuleVO = getObjectByOid(oid);
+ // 1銆佸幓鎺夋祦姘寸爜娈碉紝璁＄畻鍑哄叾浠栫爜娈靛�奸暱搴︼紝鍦ㄥ凡鍙戝竷鐨勮鍒欎腑姣斿鍑洪暱搴︿竴鑷寸殑缂栫爜瑙勫垯
+ HashMap<String, Object> condtionMap = new HashMap<>();
+ condtionMap.put("pkCodeRule_equal",codeRuleVO.getOid());
+ condtionMap.put("secType_notequal", CodeSecTypeEnum.CODE_SERIAL_SEC);
+ codeRuleVO.setSecVOList(codeBasicSecService.listCodeBasicSecByRuleOid(condtionMap));
+ // TODO 寰呭畬鍠�
+
+
+ // 2銆佸湪1銆佺殑鍩虹涓婂啀姣斿鐮佹绫诲瀷鐨勯『搴忎竴鑷寸殑缂栫爜璺潃
+
+ // 3銆佸湪2銆佺殑鍩虹涓婃瘮杈冪爜娈电爜鍊奸暱搴︼紝瀵规瘮鍑洪暱搴︾浉鍚岀殑缂栫爜瑙勫垯
+
+ // 4銆佸湪3銆佺殑鍩虹涓婃瘮杈冪爜鍊兼槸鍚︾浉鍚�
+
+
+ // 鏈�鍚庡皢缁撴灉杩涜杩斿洖
+
+ return null;
}
/**
@@ -488,8 +539,11 @@
//濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
vo.setLcStatusText(CodeRuleLC.getTextByValue(vo.getLcStatus()));
if (hasSec) {
+ Map<String, Object> condtionMap = new HashMap<>();
+ condtionMap.put("pkCodeRule",vo.getOid());
+ List<CodeBasicSecVO> codeBasicSecVOS = codeBasicSecService.listCodeBasicSecByRuleOid(condtionMap);
//鏌ヨ鐮佹
- vo.setSecVOList(codeBasicSecService.listCodeBasicSecByRuleOid(vo.getOid()));
+ vo.setSecVOList(codeBasicSecVOS);
}
}
return vo;
--
Gitblit v1.9.3