From 744171debef6aee198be296520f0b86dc1586723 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 02 八月 2023 20:02:08 +0800 Subject: [PATCH] 提交代码 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java | 1579 +++++++++++++++++++++++++++++---------------------------- 1 files changed, 805 insertions(+), 774 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java index ce05b52..c19a4ca 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java @@ -1,840 +1,871 @@ package com.vci.ubcs.code.service.impl; - +import com.alibaba.cloud.commons.lang.StringUtils; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.vci.frameworkcore.lcstatuspck.FrameworkDataLCStatus; -import com.vci.starter.revision.bo.TreeWrapperOptions; -import com.vci.starter.revision.service.RevisionModelUtil; -import com.vci.starter.web.constant.QueryOptionConstant; -import com.vci.starter.web.exception.VciBaseException; -import com.vci.starter.web.pagemodel.*; -import com.vci.starter.web.util.BeanUtilForVCI; -import com.vci.starter.web.util.VciBaseUtil; -import com.vci.starter.web.wrapper.VciParentQueryOption; -import com.vci.starter.web.wrapper.VciQueryWrapperForDO; +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.entity.CodeBasicSecDO; -import com.vci.ubcs.code.entity.CodeClassifyValueDO; -import com.vci.ubcs.code.entity.CodeFixedValueDO; -import com.vci.ubcs.code.enumpack.CodeSecTypeEnum; +import com.vci.ubcs.code.entity.*; +import com.vci.ubcs.code.enumpack.*; import com.vci.ubcs.code.lifecycle.CodeRuleLC; import com.vci.ubcs.code.mapper.CodeBasicSecMapper; import com.vci.ubcs.code.mapper.CodeClassifyValueMapper; import com.vci.ubcs.code.mapper.CodeFixedValueMapper; -import com.vci.ubcs.code.service.CodeBasicSecServiceI; -import com.vci.ubcs.code.service.CodeClassifyValueServiceI; -import com.vci.ubcs.code.service.CodeFixedValueServiceI; -import com.vci.ubcs.code.service.CodeRuleServiceI; -import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO; -import com.vci.ubcs.code.vo.pagemodel.CodeClassifyValueVO; -import com.vci.ubcs.code.vo.pagemodel.CodeFixedValueVO; -import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO; -import com.vci.web.enumpck.OsCodeFillTypeEnum; -import com.vci.web.pageModel.BatchCBO; -import com.vci.web.pageModel.UIFormReferVO; -import com.vci.web.service.BdSelectInputCharServiceI; -import com.vci.web.service.WebBoServiceI; -import com.vci.web.util.WebUtil; -import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.vci.ubcs.code.service.*; +import com.vci.ubcs.code.vo.CodeReferConfigVO; +import com.vci.ubcs.code.vo.pagemodel.*; +import com.vci.ubcs.code.wrapper.CodeBasicSecWrapper; +import com.vci.ubcs.omd.cache.EnumCache; +import com.vci.ubcs.omd.enums.EnumEnum; +import com.vci.ubcs.starter.enumpack.CodeTableNameEnum; +import com.vci.ubcs.starter.exception.VciBaseException; +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.util.UBCSSqlKeyword; +import com.vci.ubcs.starter.web.enumpck.OsCodeFillTypeEnum; +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 com.vci.ubcs.system.entity.DictBiz; +import com.vci.ubcs.system.feign.IDictBizClient; +import org.springblade.core.log.exception.ServiceException; +import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; -import org.springframework.beans.factory.annotation.Autowired; +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; import org.springframework.util.CollectionUtils; -import plm.bs.bom.clientobject.ClientBusinessObject; import javax.annotation.Resource; import java.util.*; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.stream.Collectors; -import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*; +import static com.vci.ubcs.code.constant.FrameWorkLangCodeConstant.*; /** - * 鐮佹鍩虹淇℃伅鏈嶅姟 + * 鐮佹鍩虹淇℃伅鏈嶅姟鎺ュ彛 * * @author weidy * @date 2022-01-24 */ @Service -public class CodeBasicSecServiceImpl implements CodeBasicSecServiceI { +public class CodeBasicSecServiceImpl extends ServiceImpl<CodeBasicSecMapper, CodeBasicSec> implements ICodeBasicSecService { - /** - * 鏃ュ織 - */ - private Logger logger = LoggerFactory.getLogger(getClass()); + @Resource + private CodeBasicSecMapper codeBasicSecMapper; - /** - * 鏁版嵁鎿嶄綔灞� - */ - @Resource - private CodeBasicSecMapper codeBasicSecMapper; + /** + * 鍥哄畾鐮佹鐨勭爜鍊兼暟鎹搷浣滃眰 + */ + @Resource + private CodeFixedValueMapper fixedValueMapper; - /** - * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔� - */ - @Autowired + /** + * 鍒嗙被鐮佹鐨勭爜鍊兼暟鎹搷浣滃眰 + */ + @Resource + private CodeClassifyValueMapper codeClassifyValueMapper; + + @Resource + private RevisionModelUtil revisionModelUtil; + + @Resource @Lazy - private WebBoServiceI boService; + private ICodeRuleService codeRuleService; - /** - * 瀵硅薄鐨勬搷浣� - */ - @Autowired - private RevisionModelUtil revisionModelUtil; + @Resource + private ICodeClassifyValueService codeClassifyValueService; - /** - * 涓绘暟鎹紪鐮佽鍒欐湇鍔� - */ - @Autowired - @Lazy - private CodeRuleServiceI codeRuleService; + @Resource + private ICodeReferConfigService codeReferConfigService; - /** - * 鍒嗙被鐮佹鐨勭爜鍊兼湇鍔� - */ - @Autowired - private CodeClassifyValueServiceI codeClassifyValueService; + @Resource + private IDictBizClient iDictBizClient; - /** - * 鍒嗙被鐮佹鐨勭爜鍊兼暟鎹搷浣滃眰 - */ - @Resource - private CodeClassifyValueMapper codeClassifyValueMapper; + /** + * 鍥哄畾鐮佹鐨勭爜鍊肩殑鏈嶅姟 + */ + @Resource + private ICodeFixedValueService fixedValueService; - /** - * 鍥哄畾鐮佹鐨勭爜鍊肩殑鏈嶅姟 - */ - @Autowired - private CodeFixedValueServiceI fixedValueService; + /** + * 涓婂眰鍒嗙被鐮佹鐨勫睘鎬у悕绉� + */ + private static final String PARENT_FIELD_NAME = "parentclassifysecoid"; - /** - * 鍥哄畾鐮佹鐨勭爜鍊兼暟鎹搷浣滃眰 - */ - @Resource - private CodeFixedValueMapper fixedValueMapper; + /** + * 涓婄骇鍒嗙被鐮佸�肩殑灞炴�у悕绉� + */ + private static final String PARENT_CLASSIFY_VALUE_FIELD_NAME = "parentClassifyValueOid"; - /** - * 涓婂眰鍒嗙被鐮佹鐨勫睘鎬у悕绉� - */ - private static final String PARENT_FIELD_NAME = "parentclassifysecoid"; + /** + * 鏌ヨ鎵�鏈夌殑鐮佹鍩虹淇℃伅 + * @param conditionMap 鏌ヨ鏉′欢 + * @param query 鍒嗛〉瀵硅薄 + * @return 鎵ц缁撴灉 + * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父 + */ + @Override + public IPage<CodeBasicSecVO> gridCodeBasicSec(Query query, Map<String,Object> conditionMap) throws ServiceException { + if(Func.isEmpty(Func.isEmpty(conditionMap.get(CodeTableNameEnum.PL_CODE_BASICSEC.getText()+".pkCodeRule")))){ + return null; + } + // 鑱旇〃鏌ヨ ,璁剧疆琛ㄥ埆鍚嶏紝琛ㄥ埆鍚嶉粯璁ゅ氨閲囩敤琛ㄥ悕灏忓啓锛岄厤缃珮绾ф煡璇㈢殑鏃跺�欏氨闇�瑕佹牴鎹繖涓潵瀵箇here鏉′欢杩涜閰嶇疆 + MPJLambdaWrapper<CodeBasicSec> mpjLambdaWrapper = new MPJLambdaWrapper<>(CodeBasicSec.class, CodeTableNameEnum.PL_CODE_BASICSEC.getText()) + .selectAll(CodeBasicSec.class) + .selectAs(CodeClassify::getName, CodeBasicSec::getReferCodeClassifyOidName) + .leftJoin(CodeClassify.class, CodeTableNameEnum.PL_CODE_CLASSIFY.getText(), CodeClassify::getOid, CodeBasicSec::getReferCodeClassifyOid) + .leftJoin(CodeBasicSec.class,CodeTableNameEnum.PL_CODE_BASICSEC.getText()+1,CodeBasicSec::getOid,CodeBasicSec::getParentClassifySecOid + ,ext->ext.selectAs(CodeBasicSec::getName,CodeBasicSec::getParentClassifySecText)); + // 娣诲姞where鏉′欢 + UBCSSqlKeyword.buildConditionByAs(conditionMap,mpjLambdaWrapper,CodeTableNameEnum.PL_CODE_BASICSEC.getText()); + IPage<CodeBasicSec> codeBasicSecIPage = codeBasicSecMapper.selectPage(UBCSCondition.getPage(query), mpjLambdaWrapper); + return CodeBasicSecWrapper.build().pageVO(codeBasicSecIPage); + } - /** - * 涓婄骇鍒嗙被鐮佸�肩殑灞炴�у悕绉� - */ - private static final String PARENT_CLASSIFY_VALUE_FIELD_NAME = "parentClassifyValueOid"; + /** + * 鏍规嵁缂栫爜瑙勫垯鎵归噺鍒犻櫎鐮佹鍩烘湰淇℃伅 + * @param codeRuleOid 缂栫爜瑙勫垯涓婚敭 + * @return 鎵ц缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean batchDeleteSecByCodeRuleOid(String codeRuleOid) throws ServiceException { + VciBaseUtil.alertNotNull(codeRuleOid,"缂栫爜瑙勫垯涓婚敭"); + // 1銆侀�氳繃pkcoderule浣滀负鏉′欢锛屽厛鏌ヨ瑕佸垹闄ゅ熀纭�鐮佹 + List<CodeBasicSec> deleteList = this.codeBasicSecMapper.selectList(Wrappers.<CodeBasicSec>query().eq("pkcoderule", codeRuleOid)); + if (CollectionUtils.isEmpty(deleteList)){ + return true; + } + // 2銆佸啀鍒犻櫎鍩虹鐮佹 + boolean deletFlag = codeBasicSecMapper.deleteBatchIds(deleteList.stream().map(CodeBasicSec::getOid).collect(Collectors.toSet())) > 0; + // 3銆佸啀鏍规嵁鍒犻櫎鍥哄畾鐮佹锛屼笡鏌ヨ鍑烘潵鐨勫熀纭�鐮佹涓繃婊ゅ嚭鍖呭惈鍥哄畾鐮佹鐨勮褰� + List<CodeBasicSec> fixedSecList = deleteList.stream().filter(sec -> { + return CodeSecTypeEnum.CODE_FIXED_SEC.getValue().equals(sec.getSecType()); + }).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(fixedSecList)){ + // 灏嗚浣滀负鍒犻櫎鏉′欢鐨勫�兼斁鍦ㄤ竴涓泦鍚堥噷闈� + Set<String> fixedSecOidSet = fixedSecList.stream().map(CodeBasicSec::getOid).collect(Collectors.toSet()); + // 閫氳繃澶栭敭杩涜鏌ヨ + List<CodeFixedValue> fixedValueS = fixedValueMapper.selectList(Wrappers.<CodeFixedValue>query().lambda().in(CodeFixedValue::getCodeFixedSecOid,fixedSecOidSet)); + if(!fixedValueS.isEmpty()){ + // 鏍规嵁鏌ヨ鍑烘潵鐨刬d鎵ц鍥哄畾鐮佹鎵ц鍒犻櫎 + deletFlag = fixedValueMapper.deleteBatchIds(fixedValueS.stream().map(CodeFixedValue::getOid).collect(Collectors.toSet()))>0; + } + } + // 4銆佸啀鍒犻櫎鍒嗙被鐮佹 + List<CodeBasicSec> classifySecList = deleteList.stream().filter(sec -> { + return CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue().equals(sec.getSecType()); + }).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(classifySecList)){ + // 灏嗚浣滀负鍒犻櫎鏉′欢鐨勫�兼斁鍦ㄤ竴涓泦鍚堥噷闈� + Set<String> classifySecOidSet = classifySecList.stream().map(CodeBasicSec::getOid).collect(Collectors.toSet()); + // 閫氳繃澶栭敭杩涜鏌ヨ + List<CodeClassifyValue> fixedValueS = codeClassifyValueMapper.selectList(Wrappers.<CodeClassifyValue>query().lambda().in(CodeClassifyValue::getCodeClassifySecOid,classifySecOidSet)); + if(!fixedValueS.isEmpty()){ + // 鏍规嵁鏌ヨ鍑烘潵鐨勪富閿甶d鎵ц鍥哄畾鐮佹鎵ц鍒犻櫎 + deletFlag = fixedValueMapper.deleteBatchIds(fixedValueS.stream().map(CodeClassifyValue::getOid).collect(Collectors.toSet()))>0; + } + } + return deletFlag; + } - /** - * 鍙�夊彲杈撴湇鍔� - */ - @Autowired - private BdSelectInputCharServiceI charService; + /** + * 鏍规嵁鐮佹鍒嗙被鐨勭被鍨嬪垽鏂睘鎬ф槸鍚︽槸绌虹殑 + * + * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄 + * @return 鏈夌┖鐨勫垯浼爇ey-灞炴�у悕 value-瀛楁鍚箟锛屾病鏈夌┖鐨勫垯浼� key-success value-true + */ + @Override + public KeyValue checkAttrNullableBySecType(CodeBasicSecDTO codeBasicSecDTO) throws ServiceException { + VciBaseUtil.alertNotNull(codeBasicSecDTO.getSecType(), "鐮佹鍒嗙被"); + String secType = codeBasicSecDTO.getSecType(); + HashMap<String, String> attrMap = JSONObject.parseObject(JSONObject.toJSONString(codeBasicSecDTO), HashMap.class); + Map<String, String> notNullableAttr = getNotNullableAttr(secType); + if (notNullableAttr == null) { + throw new VciBaseException("鐮佹鍒嗙被濉啓鍑洪敊锛岃鏌ラ獙鍚庨噸璇�"); + } + for (String key : notNullableAttr.keySet()) { + if (StringUtils.isBlank(WebUtil.getStringValueFromObject(attrMap.get(key)))) { + KeyValue kv = new KeyValue(); + kv.setKey(key); + kv.setValue(notNullableAttr.get(key)); + return kv; + } + } + KeyValue kv = new KeyValue(); + kv.setKey("success"); + kv.setValue("true"); + return kv; + } - /** - * 鏌ヨ鎵�鏈夌殑鐮佹鍩虹淇℃伅 - * - * @param conditionMap 鏌ヨ鏉′欢 - * @param pageHelper 鍒嗛〉鍜屾帓搴� - * @return 鎵ц缁撴灉 - * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父 - */ - @Override - public DataGrid<CodeBasicSecVO> gridCodeBasicSec(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException { - if (pageHelper == null) { - pageHelper = new PageHelper(-1); - } - pageHelper.addDefaultAsc("ordernum"); - if(!conditionMap.containsKey("pkCodeRule") || StringUtils.isBlank(conditionMap.get("pkCodeRule"))){ - return new DataGrid<>(); - } - List<CodeBasicSecDO> doList = codeBasicSecMapper.(conditionMap, pageHelper); - DataGrid<CodeBasicSecVO> dataGrid = new DataGrid<CodeBasicSecVO>(); - if (!CollectionUtils.isEmpty(doList)) { - dataGrid.setData(codeBasicSecDO2VOs(doList)); - dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(codeBasicSecMapper.countByCondition(conditionMap)))); - } - return dataGrid; - } + /** + * 澧炲姞鐮佹鍩虹淇℃伅 + * + * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄 + * @return 鎵ц缁撴灉 + * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean addSave(CodeBasicSecDTO codeBasicSecDTO) throws VciBaseException { + VciBaseUtil.alertNotNull(codeBasicSecDTO, "闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄",codeBasicSecDTO.getPkCodeRule(),"缂栫爜瑙勫垯鐨勪富閿�"); + CodeRuleVO ruleVO = codeRuleService.getObjectByOid(codeBasicSecDTO.getPkCodeRule()); + if(!CodeRuleLC.EDITING.getValue().equalsIgnoreCase(ruleVO.getLcStatus())){ + throw new VciBaseException("缂栫爜瑙勫垯鐨勭姸鎬佷笉鏄��" + CodeRuleLC.EDITING.getText() + "銆戯紒涓嶅厑璁镐慨鏀�"); + } + KeyValue attrKv = checkAttrNullableBySecType(codeBasicSecDTO); + if (! "success".equals(attrKv.getKey())){ + throw new VciBaseException(attrKv.getValue() + "涓嶈兘涓虹┖"); + } + //灏咲TO杞崲涓篋O + CodeBasicSec codeBasicSecDO = new CodeBasicSec(); + BeanUtilForVCI.copyPropertiesIgnoreCase(codeBasicSecDTO, codeBasicSecDO); + //text杞崲 + codeBasicSecDO.setSecTypeText(EnumCache.getValue(EnumEnum.CODE_SEC_TYPE,codeBasicSecDTO.getSecType())); + codeBasicSecDO.setCodeLevelTypeText(EnumCache.getValue(EnumEnum.CODE_LEVEL_TYPE,codeBasicSecDTO.getCodeLevelType())); + codeBasicSecDO.setCodeSecLengthTypeText(EnumCache.getValue(EnumEnum.CODE_SEC_LENGTH,codeBasicSecDTO.getCodeSecLengthType())); + codeBasicSecDO.setValueCutTypeText(EnumCache.getValue(EnumEnum.CODE_CUT_TYPE,codeBasicSecDTO.getValueCutType())); + codeBasicSecDO.setCodeGetValueTypeText(EnumCache.getValue(EnumEnum.CODE_GET_VALUE_TYPE,codeBasicSecDTO.getCodeGetValueType())); + //濉厖涓�浜涢粯璁ゅ�� + DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeBasicSecDO,MdmBtmTypeConstant.CODE_BASIC_SEC); + //鎺掑簭鍙凤紝榛樿绛変簬褰撳墠宸叉湁鐨勬暟閲忓姞1 + Long total = codeBasicSecMapper.selectCount(Wrappers.<CodeBasicSec>query() + .lambda() + .eq(CodeBasicSec::getPkCodeRule,codeBasicSecDTO.getPkCodeRule())); + if(total == null){ + total = 0L; + } + codeBasicSecDO.setOrderNum(total.intValue() + 1); - /** - * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞� - * - * @param codeBasicSecDOs 鏁版嵁瀵硅薄鍒楄〃 - * @return 鏄剧ず瀵硅薄 - * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父 - */ - @Override - public List<CodeBasicSecVO> codeBasicSecDO2VOs(Collection<CodeBasicSecDO> codeBasicSecDOs) throws VciBaseException { - List<CodeBasicSecVO> voList = new ArrayList<CodeBasicSecVO>(); - if (!CollectionUtils.isEmpty(codeBasicSecDOs)) { - for (CodeBasicSecDO s : codeBasicSecDOs) { - CodeBasicSecVO vo = codeBasicSecDO2VO(s); - if (vo != null) { - voList.add(vo); - } - } - } - return voList; - } + //琛ヤ綅鐨勬椂鍊欙紝瑕佹帶鍒惰ˉ浣嶅瓧绗� + if((OsCodeFillTypeEnum.LEFT.getValue().equalsIgnoreCase(codeBasicSecDO.getCodeFillType()) + || OsCodeFillTypeEnum.RIGHT.getValue().equalsIgnoreCase(codeBasicSecDO.getCodeFillType())) + && StringUtils.isBlank(codeBasicSecDO.getCodeFillSeparator())){ + throw new VciBaseException("褰撹ˉ浣嶆柟寮忎负宸﹁ˉ浣嶆垨鑰呭彸琛ヤ綅鐨勬椂鍊欙紝琛ヤ綅瀛楃涓嶈兘涓虹┖"); + } + CodeReferConfigVO codeReferConfigVO = null; + //寮曠敤鐮佹鐨勬椂鍊欙紝闇�瑕佸垽鏂弬鐓х殑淇℃伅鏄惁姝g‘ + if(CodeSecTypeEnum.CODE_REFER_SEC.getValue().equalsIgnoreCase(codeBasicSecDO.getSecType())){ + if(StringUtils.isBlank(codeBasicSecDO.getReferConfig())){ + throw new VciBaseException("寮曠敤鐮佹鐨勬椂鍊欙紝闇�瑕佸~鍐� 鍙傜収閰嶇疆鐨勫唴瀹�"); + } + try{ + //JSONObject.parseObject(codeBasicSecDO.getReferConfig(), UIFormReferVO.class); + codeReferConfigVO = JSONObject.parseObject(codeBasicSecDO.getReferConfig(), CodeReferConfigVO.class); + // 灏嗗弬鐓ч厤缃繘琛屾寔涔呭寲锛岀粰鐢ㄦ埛鎻愪緵鍙彲閫夋嫨鍙傜収閰嶇疆鐨勬柟寮� + }catch (Throwable e){ + throw new VciBaseException("寮曠敤鐮佹鐨勬椂鍊欙紝鍙傜収閰嶇疆鐨勫唴瀹圭殑鏍煎紡涓嶆纭�,",new String[0],e); + } + // 鍒ゆ柇鏄惁涓哄紩鐢ㄧ爜娈碉紝濡傛灉鏄簲鐢ㄧ爜娈电殑璇濓紝涓轰簡閫傞厤鍓嶇缁勪欢锛岃繖閲岃瀵硅〃杩涜澶勭悊涓�涓嬶紝鎸夌収浠ュ墠鐨勫弬鐓ф牸寮忚繘琛岃浆鎹� + codeBasicSecDO.setReferValueInfo(referConfigToUIUiTable(codeReferConfigVO)); + if(codeReferConfigVO.getIsPersistence()=="true"){ + codeReferConfigService.insert(codeReferConfigVO); + } + } + boolean resBoolean = codeBasicSecMapper.insert(codeBasicSecDO) > 0; + //SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo(); + if(StringUtils.isNotBlank(codeBasicSecDO.getCodeFillSeparator())){ + DictBiz dictBiz = new DictBiz(); + dictBiz.setCode("codeFillSeparator"); + dictBiz.setDictKey(codeBasicSecDO.getCodeFillSeparator()); + dictBiz.setDictValue(codeBasicSecDO.getCodeFillSeparator()); + //浠庡師鏉ョ殑charService锛堝彲杈撳彲閫夛級鏇存敼涓鸿皟鐢╫md涓殑鎺ュ彛鏉ュ疄鐜� + iDictBizClient.getCheck(dictBiz); + //charService.save(MdmBtmTypeConstant.CODE_BASIC_SEC,"codefileseparator",codeBasicSecDO.getCodeFillSeparator(),sessionInfo); + } + return resBoolean; + } - /** - * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞� - * - * @param codeBasicSecDOs 鏁版嵁瀵硅薄鍒楄〃 - * @param hasFixedValue 鏄惁鏈夊浐瀹氬�� - * @return 鏄剧ず瀵硅薄 - * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父 - */ - @Override - public List<CodeBasicSecVO> codeBasicSecDO2VOs(Collection<CodeBasicSecDO> codeBasicSecDOs, boolean hasFixedValue) throws VciBaseException { - List<CodeBasicSecVO> voList = new ArrayList<CodeBasicSecVO>(); - if (!CollectionUtils.isEmpty(codeBasicSecDOs)) { - for (CodeBasicSecDO s : codeBasicSecDOs) { - CodeBasicSecVO vo = codeBasicSecDO2VO(s); - if (vo != null) { - voList.add(vo); - } - } - } - if(hasFixedValue && !CollectionUtils.isEmpty(voList)){ - List<CodeBasicSecVO> fixedSecVOList = voList.stream().filter(s -> CodeSecTypeEnum.CODE_FIXED_SEC.getValue().equalsIgnoreCase(s.getSectype())).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(fixedSecVOList)){ - //鏌ヨ鍥哄畾鐮佺殑鐮佸�� - Map<String, List<CodeFixedValueVO>> secValueMap = fixedValueService.listCodeFixedValueBySecOids(fixedSecVOList.stream().map(CodeBasicSecVO::getOid).collect(Collectors.toList())); - voList.stream().forEach(vo->{ - vo.setFixedValueVOList(secValueMap.getOrDefault(vo.getOid(),null)); - }); - } - } - return voList; - } + /** + * 灏唕eferconfig杞崲涓篔SON鏍煎紡鐨刄IFormReferVO + * @param codeReferConfig + * @return + */ + private String referConfigToUIUiTable(CodeReferConfigVO codeReferConfig){ + // 鎷疯礉涓轰互鍓嶇殑鑰佸璞� + UIReferConfigFormVO uiFormReferVO = new UIReferConfigFormVO(); + BeanUtil.copy(codeReferConfig,uiFormReferVO); - /** - * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞� - * - * @param codeBasicSecDO 鏁版嵁瀵硅薄 - * @return 鏄剧ず瀵硅薄 - * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父 - */ - @Override - public CodeBasicSecVO codeBasicSecDO2VO(CodeBasicSecDO codeBasicSecDO) throws VciBaseException { - CodeBasicSecVO vo = new CodeBasicSecVO(); - if (codeBasicSecDO != null) { - BeanUtilForVCI.copyPropertiesIgnoreCase(codeBasicSecDO, vo); - //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽 - if (true) { - //vo.setLcStatusText({lcStatusFullClassName}.getTextByValue(vo.getLcStatus())); - } - } - return vo; - } + // 琛ㄦ牸鐨勮嚜瀹氫箟瀹氫箟 + UITableConfigVO uiTableConfigVO = new UITableConfigVO(); + uiTableConfigVO.setPage(new UITablePageVO(codeReferConfig.getLimit(),1)); + // 鍒楄〃鐨勫垪鐨勪俊鎭浆鎹� + List<TableColVO> uiTableFieldVOs = new ArrayList<>(); + // 蹇�熸煡璇㈠垪 + List<TableColVO> queryColumns = new ArrayList<>(); + if(!CollectionUtils.isEmpty(codeReferConfig.getCodeShowFieldConfigVOS())){ + codeReferConfig.getCodeShowFieldConfigVOS().stream().forEach(showField ->{ + TableColVO tableColVO = new TableColVO(); + BeanUtil.copy(showField,tableColVO); + tableColVO.setSortField(showField.getAttrSortField()); + uiTableFieldVOs.add(tableColVO); + if(showField.getIsQuery().equals("true")){ + queryColumns.add(tableColVO); + } + }); + } + // 鏄剧ず鐨勫垪 + uiTableConfigVO.setCols(uiTableFieldVOs); + // 蹇�熸煡璇㈠垪 + uiTableConfigVO.setQueryColumns(queryColumns); + //set缁欒〃鏍奸厤缃睘鎬� + uiFormReferVO.setTableConfig(uiTableConfigVO); + // 绛涢�夋潯浠� + HashMap<String, String> whereMap = new HashMap<>(); + if(!codeReferConfig.getCodeSrchCondConfigVOS().isEmpty()){ + codeReferConfig.getCodeSrchCondConfigVOS().stream().forEach(srch->{ + whereMap.put(srch.getFilterField()+srch.getFilterType(),srch.getFilterValue()); + }); + } + uiFormReferVO.setWhere(whereMap); + return JSONObject.toJSONString(uiFormReferVO); + } - /** - * 澧炲姞鐮佹鍩虹淇℃伅 - * - * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄 - * @return 鎵ц缁撴灉 - * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父 - */ - @Override - public CodeBasicSecVO addSave(CodeBasicSecDTO codeBasicSecDTO) throws VciBaseException { - VciBaseUtil.alertNotNull(codeBasicSecDTO, "闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄",codeBasicSecDTO.getPkCodeRule(),"缂栫爜瑙勫垯鐨勪富閿�"); - CodeRuleVO ruleVO = codeRuleService.getObjectByOid(codeBasicSecDTO.getPkCodeRule()); - if(!CodeRuleLC.EDITING.getValue().equalsIgnoreCase(ruleVO.getLcStatus())){ - throw new VciBaseException("缂栫爜瑙勫垯鐨勭姸鎬佷笉鏄��" + CodeRuleLC.EDITING.getText() + "銆戯紒涓嶅厑璁镐慨鏀�"); - } - KeyValue attrKv = checkAttrNullableBySecType(codeBasicSecDTO); - if (! "success".equals(attrKv.getKey())){ - throw new VciBaseException(attrKv.getValue() + "涓嶈兘涓虹┖"); - } + /** + * 淇敼鐮佹鍩虹淇℃伅 + * + * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄 + * @return 鎵ц缁撴灉 + * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean editSave(CodeBasicSecDTO codeBasicSecDTO) throws VciBaseException { + VciBaseUtil.alertNotNull(codeBasicSecDTO, "闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄"); + KeyValue attrKv = checkAttrNullableBySecType(codeBasicSecDTO); + if (! "success".equals(attrKv.getKey())){ + throw new VciBaseException(attrKv.getValue() + "涓嶈兘涓虹┖"); + } + //灏咲TO杞崲涓篋O + CodeBasicSec codeBasicSecDO = selectByOid(codeBasicSecDTO.getOid()); + DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeBasicSecDO); + boolean status = codeRuleService.checkEditDelStatus(codeRuleService.getObjectByOid(codeBasicSecDO.getPkCodeRule()).getLcStatus()); + boolean resBoolean; + if (!status){ + //杩斿洖閿欒淇℃伅 + throw new VciBaseException("缂栫爜瑙勫垯涓嶅厑璁哥紪杈戞垨鍒犻櫎锛�"); + } else { + //琛ヤ綅鐨勬椂鍊欙紝瑕佹帶鍒惰ˉ浣嶅瓧绗� + if((OsCodeFillTypeEnum.LEFT.getValue().equalsIgnoreCase(codeBasicSecDO.getCodeFillType()) + || OsCodeFillTypeEnum.RIGHT.getValue().equalsIgnoreCase(codeBasicSecDO.getCodeFillType())) + && StringUtils.isBlank(codeBasicSecDO.getCodeFillSeparator())){ + throw new VciBaseException("褰撹ˉ浣嶆柟寮忎负宸﹁ˉ浣嶆垨鑰呭彸琛ヤ綅鐨勬椂鍊欙紝琛ヤ綅瀛楃涓嶈兘涓虹┖"); + } + CodeReferConfigVO codeReferConfigVO = null; + //寮曠敤鐮佹鐨勬椂鍊欙紝闇�瑕佸垽鏂弬鐓х殑淇℃伅鏄惁姝g‘ + if(CodeSecTypeEnum.CODE_REFER_SEC.getValue().equalsIgnoreCase(codeBasicSecDO.getSecType())){ + if(StringUtils.isBlank(codeBasicSecDO.getReferConfig())){ + throw new VciBaseException("寮曠敤鐮佹鐨勬椂鍊欙紝闇�瑕佸~鍐欏弬鐓ч厤缃殑鍐呭"); + } + try{ + // JSONObject.parseObject(codeBasicSecDO.getReferConfig(), UIFormReferVO.class); + codeReferConfigVO = JSONObject.parseObject(codeBasicSecDO.getReferConfig(), CodeReferConfigVO.class); + }catch (Throwable e){ + throw new VciBaseException("寮曠敤鐮佹鐨勬椂鍊欙紝鍙傜収閰嶇疆鐨勫唴瀹圭殑鏍煎紡涓嶆纭�,",new String[0],e); + } + // 鍒ゆ柇鏄惁涓哄紩鐢ㄧ爜娈碉紝濡傛灉鏄簲鐢ㄧ爜娈电殑璇濓紝涓轰簡閫傞厤鍓嶇缁勪欢锛岃繖閲岃瀵硅〃杩涜澶勭悊涓�涓嬶紝鎸夌収浠ュ墠鐨勫弬鐓ф牸寮忚繘琛岃浆鎹� + codeBasicSecDO.setReferValueInfo(referConfigToUIUiTable(codeReferConfigVO)); + if(codeReferConfigVO.getIsPersistence()=="true"){ + codeReferConfigService.insert(codeReferConfigVO); + } + } + revisionModelUtil.copyFromDTOIgnore(codeBasicSecDTO, codeBasicSecDO); + resBoolean = codeBasicSecMapper.updateById(codeBasicSecDO)>0; + //SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo(); + if(StringUtils.isNotBlank(codeBasicSecDO.getCodeFillSeparator())){ + DictBiz dictBiz = new DictBiz(); + dictBiz.setCode("codeFillSeparator"); + dictBiz.setDictKey(codeBasicSecDO.getCodeFillSeparator()); + dictBiz.setDictValue(codeBasicSecDO.getCodeFillSeparator()); + //浠庡師鏉ョ殑charService锛堝彲杈撳彲閫夛級鏇存敼涓鸿皟鐢╫md涓殑鎺ュ彛鏉ュ疄鐜� + iDictBizClient.getCheck(dictBiz); + //charService.save(MdmBtmTypeConstant.CODE_BASIC_SEC,"codefileseparator",codeBasicSecDO.getCodeFillSeparator(),sessionInfo); + } + } + return resBoolean; + } + /** + * 鏍规嵁鐮佹绫诲瀷鑾峰彇涓嶅彲涓虹┖鐨勫瓧娈� + * + * @param secType 鐮佹绫诲瀷 + * @return 涓嶅彲涓虹┖鐨勫瓧娈甸泦鍚� + */ + private Map<String, String> getNotNullableAttr(String secType) throws ServiceException { + Map<String, String> attrMap = new HashMap<>(); + if (CodeSecTypeEnum.CODE_ATTR_SEC.getValue().equalsIgnoreCase(secType)) { + attrMap.put("name", "灞炴�х爜娈靛悕绉�"); + } else if (CodeSecTypeEnum.CODE_DATE_SEC.getValue().equalsIgnoreCase(secType)) { + attrMap.put("name", "鏃ユ湡鐮佹鍚嶇О"); + attrMap.put("codeDateFormatStr", "鏃ユ湡鏍煎紡"); + } else if (CodeSecTypeEnum.CODE_FIXED_SEC.getValue().equalsIgnoreCase(secType)) { + attrMap.put("name", "鍥哄畾鐮佹鍚嶇О"); + attrMap.put("codeSecLengthType", "鐮佹闀垮害绫诲瀷"); + attrMap.put("codeSecLength", "鐮佹鐨勯暱搴�"); + } else if (CodeSecTypeEnum.CODE_LEVEL_SEC.getValue().equalsIgnoreCase(secType)) { + attrMap.put("name", "灞傜骇鐮佹鍚嶇О"); + attrMap.put("codeLevelType", "灞傜骇绫诲瀷"); + attrMap.put("valueCutType", "瀛楃鎴彇绫诲瀷"); + } else if (CodeSecTypeEnum.CODE_REFER_SEC.getValue().equalsIgnoreCase(secType)) { + attrMap.put("name", "寮曠敤鐮佹鍚嶇О"); + } else if (CodeSecTypeEnum.CODE_SERIAL_SEC.getValue().equalsIgnoreCase(secType)) { + attrMap.put("name", "娴佹按鐮佹鍚嶇О"); + attrMap.put("codeSecLength", "鐮佹鐨勯暱搴�"); + attrMap.put("codeFillType", "缂栫爜琛ヤ綅鏂瑰紡"); + attrMap.put("codeFillLength", "濉厖闀垮害"); + attrMap.put("codeFillLimit", "娴佹按涓婇檺"); + attrMap.put("codeFillFlag", "娴佹按鏄惁琛ョ爜"); + } else if (CodeSecTypeEnum.CODE_VARIABLE_SEC.getValue().equalsIgnoreCase(secType)) { + attrMap.put("name", "鍙彉鐮佹鍚嶇О"); + attrMap.put("codeSecLength", "鐮佹鐨勯暱搴�"); + attrMap.put("codeFillType", "缂栫爜琛ヤ綅鏂瑰紡"); + } else if (CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue().equalsIgnoreCase(secType)) { + attrMap.put("name", "鍒嗙被鐮佹鍚嶇О"); + attrMap.put("codeSecLengthType", "鐮佹闀垮害绫诲瀷"); + attrMap.put("codeSecLength", "鐮佹鐨勯暱搴�"); + } else { + attrMap = null; + } + return attrMap; + } + /** + * 鍒犻櫎鐮佹鍩虹淇℃伅 + * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈� + * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐� + * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯� + */ + @Override + public R deleteCodeBasicSec(CodeBasicSecDTO codeBasicSecDTO) throws VciBaseException { + VciBaseUtil.alertNotNull(codeBasicSecDTO, "鐮佹鍩虹淇℃伅鏁版嵁瀵硅薄", codeBasicSecDTO.getOid(), "鐮佹鍩虹淇℃伅鐨勪富閿�"); + return this.deleteCodeBasicSecByPrimaryKey(codeBasicSecDTO.getOid()); + } - //灏咲TO杞崲涓篋O - CodeBasicSecDO codeBasicSecDO = new CodeBasicSecDO(); - BeanUtilForVCI.copyPropertiesIgnoreCase(codeBasicSecDTO, codeBasicSecDO); - //鎺掑簭鍙凤紝榛樿绛変簬褰撳墠宸叉湁鐨勬暟閲忓姞1 - Map<String,String> conditionMap = new HashMap<>(); - conditionMap.put("pkCodeRule",ruleVO.getOid()); - Long total = codeBasicSecMapper.countByCondition(conditionMap); - if(total == null){ - total = 0L; - } - codeBasicSecDO.setOrderNum(total.intValue() + 1); + /** + * 涓婚敭鍒犻櫎鐮佹鍩虹淇℃伅 + * + * @param oid 鐮佹鍩虹淇℃伅涓婚敭 + * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐� + * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯� + */ + @Override + @Transactional(rollbackFor = Exception.class) + public R deleteCodeBasicSecByPrimaryKey(String oid) throws VciBaseException { + CodeBasicSec codeBasicSecDO = selectByOid(oid); + boolean isLinked = checkIsLinked(codeBasicSecDO.getPkCodeRule(), oid); + if (isLinked) { + return R.fail("缂栫爜瑙勫垯宸茶寮曠敤锛屼笉鍏佽缂栬緫鎴栧垹闄�"); + } + //鎵ц鍒犻櫎鎿嶄綔 + boolean eftDeleteBasic = codeBasicSecMapper.deleteById(oid) > 0; + if (CodeSecTypeEnum.CODE_FIXED_SEC.getValue().equals(codeBasicSecDO.getSecType())){ + List<CodeFixedValue> fixedValueDOS = fixedValueMapper.selectList(Wrappers.<CodeFixedValue>query() + .lambda().eq(CodeFixedValue::getCodeFixedSecOid,codeBasicSecDO.getOid()) + ); + if(!CollectionUtils.isEmpty(fixedValueDOS)){ + fixedValueMapper.deleteBatchIds(fixedValueDOS.stream().map(CodeFixedValue::getOid).collect(Collectors.toSet())); + } + } + if (CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue().equals(codeBasicSecDO.getSecType())){ + List<CodeClassifyValue> classifyValueDOS = codeClassifyValueMapper.selectList(Wrappers.<CodeClassifyValue>query() + .lambda().eq(CodeClassifyValue::getCodeClassifySecOid,codeBasicSecDO.getOid()) + ); + if(!CollectionUtils.isEmpty(classifyValueDOS)) { + codeClassifyValueMapper.deleteBatchIds(classifyValueDOS.stream().map(CodeClassifyValue::getOid).collect(Collectors.toSet())); + } + } - //琛ヤ綅鐨勬椂鍊欙紝瑕佹帶鍒惰ˉ浣嶅瓧绗� - if((OsCodeFillTypeEnum.LEFT.getValue().equalsIgnoreCase(codeBasicSecDO.getCodeFillType()) - || OsCodeFillTypeEnum.RIGHT.getValue().equalsIgnoreCase(codeBasicSecDO.getCodeFillType())) - && StringUtils.isBlank(codeBasicSecDO.getCodeFillSeparator())){ - throw new VciBaseException("褰撹ˉ浣嶆柟寮忎负宸﹁ˉ浣嶆垨鑰呭彸琛ヤ綅鐨勬椂鍊欙紝琛ヤ綅瀛楃涓嶈兘涓虹┖"); - } - //寮曠敤鐮佹鐨勬椂鍊欙紝闇�瑕佸垽鏂弬鐓х殑淇℃伅鏄惁姝g‘ - if(CodeSecTypeEnum.CODE_REFER_SEC.getValue().equalsIgnoreCase(codeBasicSecDO.getSecType())){ - if(StringUtils.isBlank(codeBasicSecDO.getReferConfig())){ - throw new VciBaseException("寮曠敤鐮佹鐨勬椂鍊欙紝闇�瑕佸~鍐� 鍙傜収閰嶇疆 鐨勫唴瀹�"); - } - try{ - JSONObject.parseObject(codeBasicSecDO.getReferConfig(), UIFormReferVO.class); - }catch (Throwable e){ - throw new VciBaseException("寮曠敤鐮佹鐨勬椂鍊欙紝鍙傜収閰嶇疆鐨勫唴瀹圭殑鏍煎紡涓嶆纭�,",new String[0],e); - } - } - codeBasicSecMapper.insert(codeBasicSecDO); - SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo(); - if(StringUtils.isNotBlank(codeBasicSecDO.getCodeFillSeparator())){ - charService.save(MdmBtmTypeConstant.CODE_BASIC_SEC,"codefileseparator",codeBasicSecDO.getCodeFillSeparator(),sessionInfo); - } - return codeBasicSecDO2VO(codeBasicSecDO); - } + return eftDeleteBasic ? R.success(DELETE_SUCCESS) : R.fail(DELETE_FAIL); + } - /** - * 淇敼鐮佹鍩虹淇℃伅 - * - * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄 - * @return 鎵ц缁撴灉 - * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父 - */ - @Override - public CodeBasicSecVO editSave(CodeBasicSecDTO codeBasicSecDTO) throws VciBaseException { - VciBaseUtil.alertNotNull(codeBasicSecDTO, "闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄"); - KeyValue attrKv = checkAttrNullableBySecType(codeBasicSecDTO); - if (! "success".equals(attrKv.getKey())){ - throw new VciBaseException(attrKv.getValue() + "涓嶈兘涓虹┖"); - } - //灏咲TO杞崲涓篋O - CodeBasicSecDO codeBasicSecDO = selectByOid(codeBasicSecDTO.getOid()); - boolean status = codeRuleService.checkEditDelStatus(codeRuleService.getObjectByOid(codeBasicSecDO.getPkCodeRule()).getLcStatus()); - if (!status){ - //杩斿洖閿欒淇℃伅 - throw new VciBaseException("缂栫爜瑙勫垯涓嶅厑璁哥紪杈戞垨鍒犻櫎锛�"); - } else { - //琛ヤ綅鐨勬椂鍊欙紝瑕佹帶鍒惰ˉ浣嶅瓧绗� - if((OsCodeFillTypeEnum.LEFT.getValue().equalsIgnoreCase(codeBasicSecDO.getCodeFillType()) - || OsCodeFillTypeEnum.RIGHT.getValue().equalsIgnoreCase(codeBasicSecDO.getCodeFillType())) - && StringUtils.isBlank(codeBasicSecDO.getCodeFillSeparator())){ - throw new VciBaseException("褰撹ˉ浣嶆柟寮忎负宸﹁ˉ浣嶆垨鑰呭彸琛ヤ綅鐨勬椂鍊欙紝琛ヤ綅瀛楃涓嶈兘涓虹┖"); - } - //寮曠敤鐮佹鐨勬椂鍊欙紝闇�瑕佸垽鏂弬鐓х殑淇℃伅鏄惁姝g‘ - if(CodeSecTypeEnum.CODE_REFER_SEC.getValue().equalsIgnoreCase(codeBasicSecDO.getSecType())){ - if(StringUtils.isBlank(codeBasicSecDO.getReferConfig())){ - throw new VciBaseException("寮曠敤鐮佹鐨勬椂鍊欙紝闇�瑕佸~鍐� 鍙傜収閰嶇疆 鐨勫唴瀹�"); - } - try{ - JSONObject.parseObject(codeBasicSecDO.getReferConfig(), UIFormReferVO.class); - }catch (Throwable e){ - throw new VciBaseException("寮曠敤鐮佹鐨勬椂鍊欙紝鍙傜収閰嶇疆鐨勫唴瀹圭殑鏍煎紡涓嶆纭�,",new String[0],e); - } - } - revisionModelUtil.copyFromDTOIgnore(codeBasicSecDTO, codeBasicSecDO); - codeBasicSecMapper.updateByPrimaryKey(codeBasicSecDO); - SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo(); - if(StringUtils.isNotBlank(codeBasicSecDO.getCodeFillSeparator())){ - charService.save(MdmBtmTypeConstant.CODE_BASIC_SEC,"codefileseparator",codeBasicSecDO.getCodeFillSeparator(),sessionInfo); - } - } - return codeBasicSecDO2VO(codeBasicSecDO); - } + /** + * 涓婚敭鑾峰彇鐮佹鍩虹淇℃伅 + * + * @param oid 涓婚敭 + * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄 + * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父 + */ + @Override + public CodeBasicSecVO getObjectByOid(String oid) throws VciBaseException { + return CodeBasicSecWrapper.build().entityVO(selectByOid(oid)); + } + /** + * 涓婚敭鎵归噺鑾峰彇鐮佹鍩虹淇℃伅 + * + * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓� + * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄 + * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭 + */ + @Override + public Collection<CodeBasicSecVO> listCodeBasicSecByOids(Collection<String> oidCollections) throws VciBaseException { + VciBaseUtil.alertNotNull(oidCollections, "鏁版嵁瀵硅薄涓婚敭闆嗗悎"); + List<CodeBasicSec> codeBasicSecDOList = listCodeBasicSecDOByOidCollections(oidCollections); + return CodeBasicSecWrapper.build().listVO(codeBasicSecDOList); + } - /** - * 鏍¢獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎 - * - * @param codeBasicSecDTO 鏁版嵁浼犺緭瀵硅薄 - * @param codeBasicSecDO 鏁版嵁搴撲腑鐨勬暟鎹璞� - * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾� - */ - private BaseResult checkIsCanDeleteForDO(CodeBasicSecDTO codeBasicSecDTO, CodeBasicSecDO codeBasicSecDO) { - boService.checkTs(codeBasicSecDTO); - if (!checkIsLinked(null, codeBasicSecDO.getOid())) { - return BaseResult.success(); - } else { - return BaseResult.fail(DATA_LINKED_NOT_DELETE, new String[]{""}); - } - } + /** + * 鍙傜収鐮佹鍩虹淇℃伅鍒楄〃 + * + * @param conditionMap 鏌ヨ鏉′欢 + * @param query 鍒嗛〉鍜屾帓搴� + * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭 + * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父 + */ + @Override + public IPage<CodeBasicSecVO> refDataGridCodeBasicSec(Query query ,Map<String,Object> conditionMap) throws VciBaseException { + return gridCodeBasicSec(query,conditionMap); + } - /** - * 鏍¢獙鏄惁琚紩鐢� - * - * @param codeRuleOid 缂栫爜瑙勫垯涓婚敭 - * @param codeBasicSecOid 缂栫爜鍩虹淇℃伅涓婚敭 - * @return true琛ㄧず宸茶寮曠敤锛宖alse琛ㄧず鏈寮曠敤 - * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父 - */ - private boolean checkIsLinked(String codeRuleOid, String codeBasicSecOid) throws VciBaseException { - boolean flag = true; - if (StringUtils.isNotBlank(codeRuleOid)) { - boolean status = codeRuleService.checkEditDelStatus(codeRuleService.getObjectByOid(codeRuleOid).getLcStatus()); - if (!status){ - return true; - } - boolean alreadyInUse = codeRuleService.isAlreadyInUse(codeRuleOid); - if (!alreadyInUse){ - flag = false; - } - } else { - boolean status = codeRuleService.checkEditDelStatus(codeRuleService.getObjectByOid(codeBasicSecMapper.selectByPrimaryKey(codeBasicSecOid).getPkCodeRule()).getLcStatus()); - if (!status){ - return true; - } - boolean alreadyInUse = codeRuleService.isAlreadyInUse(codeBasicSecMapper.selectByPrimaryKey(codeBasicSecOid).getPkCodeRule()); - if (!alreadyInUse){ - flag = false; - } - } - return flag; - } + /** + * 鍙傜収鍒嗙被鐨勭爜娈� + * @param conditionMap 鏌ヨ鏉′欢 + * @param query 鍒嗛〉鍜屾帓搴� + * @return 鐮佹鐨勫唴瀹� + */ + @Override + public IPage<CodeBasicSecVO> refDataGridClassifySec(Query query ,Map<String,Object> conditionMap) throws VciBaseException { + if(Func.isEmpty(conditionMap.get("pkCodeRule"))){ + return null; + } + conditionMap.put("secType",(CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue())); + return refDataGridCodeBasicSec(query.setAscs("orderNum"),conditionMap); + } - /** - * 鍒犻櫎鐮佹鍩虹淇℃伅 - * - * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈� - * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐� - * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯� - */ - @Override - public BaseResult deleteCodeBasicSec(CodeBasicSecDTO codeBasicSecDTO) throws VciBaseException { - VciBaseUtil.alertNotNull(codeBasicSecDTO, "鐮佹鍩虹淇℃伅鏁版嵁瀵硅薄", codeBasicSecDTO.getOid(), "鐮佹鍩虹淇℃伅鐨勪富閿�"); - return deleteCodeBasicSecByPrimaryKey(codeBasicSecDTO.getOid()); - } + /** + * 鍏嬮殕鐮佹淇℃伅 + * + * @param oidList 婧愮爜娈典俊鎭富閿泦鍚� + * @param pkCodeRule 鐩爣缂栫爜瑙勫垯 + * @return 鍏嬮殕缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐� + */ + @Override + @Transactional(rollbackFor = Exception.class) + public R cloneCodeBasicSec(List<String> oidList, String pkCodeRule) throws ServiceException { + boolean isLinked = checkIsLinked(pkCodeRule,null); + if (isLinked) { + return R.fail("缂栫爜瑙勫垯宸茶寮曠敤锛屼笉鍏佽缂栬緫鎴栧垹闄�"); + } + List<CodeBasicSec> createList = new ArrayList<>(); + List<CodeBasicSec> basicSecDOS = codeBasicSecMapper.selectBatchIds(oidList); + if(basicSecDOS.isEmpty()){ + return R.fail("鍏嬮殕鐨勭爜娈典俊鎭笉瀛樺湪锛�"); + } + basicSecDOS.forEach(sec -> { + CodeBasicSec newSecDO = new CodeBasicSec(); + BeanUtilForVCI.copyPropertiesIgnoreCase(sec,newSecDO); + newSecDO.setOid(VciBaseUtil.getPk()); + newSecDO.setNameOid(VciBaseUtil.getPk()); + newSecDO.setRevisionOid(VciBaseUtil.getPk()); + newSecDO.setId(newSecDO.getId() + "_copy"); + newSecDO.setName(newSecDO.getName() + "_copy"); + newSecDO.setPkCodeRule(pkCodeRule); + createList.add(newSecDO); + }); + boolean resBoolean = saveBatch(createList); + //codeBasicSecMapper.insertBatch(createList); + return resBoolean ? R.data(resBoolean,"鍏嬮殕鐮佹淇℃伅鎴愬姛"):R.fail("鍏嬮殕鐮佹淇℃伅澶辫触锛�"); + } - /** - * 涓婚敭鍒犻櫎鐮佹鍩虹淇℃伅 - * - * @param oid 鐮佹鍩虹淇℃伅涓婚敭 - * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐� - * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯� - */ - @Override - public BaseResult deleteCodeBasicSecByPrimaryKey(String oid) throws VciBaseException { - CodeBasicSecDO codeBasicSecDO = selectByOid(oid); - boolean isLinked = checkIsLinked(codeBasicSecDO.getPkCodeRule(), oid); - if (isLinked) { - return BaseResult.fail("缂栫爜瑙勫垯宸茶寮曠敤锛屼笉鍏佽缂栬緫鎴栧垹闄�"); - } - Map<String,String> conditionMap = new HashMap<>(); - //鎵ц鍒犻櫎鎿嶄綔 - WebUtil.setPersistence(false); - BatchCBO batchCBO = codeBasicSecMapper.deleteByPrimaryKey(oid); - Set<ClientBusinessObject> deleteSet = new HashSet<>(); - deleteSet.addAll(batchCBO.getDeleteCbos()); - if (CodeSecTypeEnum.CODE_FIXED_SEC.getValue().equals(codeBasicSecDO.getSecType())){ - conditionMap.put("codefixedsecoid",codeBasicSecDO.getOid()); - VciQueryWrapperForDO wrapper = new VciQueryWrapperForDO(conditionMap, CodeFixedValueDO.class); - List<CodeFixedValueDO> fixedValueDOS = fixedValueMapper.selectByWrapper(wrapper); - BatchCBO valueCBO = fixedValueMapper.batchDeleteByOids(fixedValueDOS.stream().map(CodeFixedValueDO::getOid).collect(Collectors.toSet())); - deleteSet.addAll(valueCBO.getDeleteCbos()); - } - if (CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue().equals(codeBasicSecDO.getSecType())){ - conditionMap.put("codeclassifysecoid",codeBasicSecDO.getOid()); - VciQueryWrapperForDO wrapper = new VciQueryWrapperForDO(conditionMap, CodeClassifyValueDO.class); - List<CodeClassifyValueDO> classifyValueDOS = codeClassifyValueMapper.selectByWrapper(wrapper); - if(!CollectionUtils.isEmpty(classifyValueDOS)) { - BatchCBO valueCBO = codeClassifyValueMapper.batchDeleteByOids(classifyValueDOS.stream().map(CodeClassifyValueDO::getOid).collect(Collectors.toSet())); - deleteSet.addAll(valueCBO.getDeleteCbos()); - } - } - batchCBO.setDeleteCbos(deleteSet); - WebUtil.setPersistence(true); - boService.persistenceBatch(batchCBO); - return (batchCBO != null && batchCBO.getDeleteCbos() != null && batchCBO.getDeleteCbos().size() > 0) ? BaseResult.successMsg(DELETE_SUCCESS) : BaseResult.fail(DELETE_FAIL); - } + /** + * 鏌ヨ鐩爣鍒嗙被鐮佹鎵�鍦ㄧ殑鏍戠粨鏋� + * + * @param oid 鐩爣鍒嗙被鐮佹涓婚敭 + * @return 鍒嗙被鐮佹鏍戠粨鏋� + */ + /*@Override + public List<Tree> gridCodeClassifySecTree(String oid) { + VciParentQueryOption queryOption = new VciParentQueryOption(PARENT_FIELD_NAME); + queryOption.setfOid(oid); + queryOption.setLinkTypeFlag(false); + queryOption.setHasSelf(true); + VciQueryWrapperForDO wrapper = new VciQueryWrapperForDO(CodeBasicSec.class); + wrapper.childQueryParent(queryOption); + List<CodeBasicSec> doList = codeBasicSecMapper.selectByWrapper(wrapper); + List<String> secOid = new ArrayList<>(); + doList.forEach(o -> secOid.add(o.getOid())); + List<CodeClassifyValueVO> valueVOs = (List<CodeClassifyValueVO>) codeClassifyValueService.listCodeClassifyValueByOids(secOid); + TreeQueryObject treeQueryObject = new TreeQueryObject(); + treeQueryObject.setMultipleSelect(false); + treeQueryObject.setShowCheckBox(false); + treeQueryObject.setQueryAllLevel(false); + treeQueryObject.setValueField("oid"); + treeQueryObject.setTextField("name"); + treeQueryObject.setQueryAllRev(false); + TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(PARENT_CLASSIFY_VALUE_FIELD_NAME); + treeWrapperOptions.copyFromTreeQuery(treeQueryObject); + return revisionModelUtil.doList2Trees(valueVOs,treeWrapperOptions,(CodeClassifyValueVO s) ->{ + //鍙互鍦ㄨ繖閲屽鐞嗘爲鑺傜偣鐨勬樉绀� + return s.getId() + " " + s.getName() + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s + .getLcStatus()) ? (" 銆愬仠鐢ㄣ�� ") : ""); + }); + }*/ - /** - * 涓婚敭鑾峰彇鐮佹鍩虹淇℃伅 - * - * @param oid 涓婚敭 - * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄 - * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父 - */ - @Override - public CodeBasicSecVO getObjectByOid(String oid) throws VciBaseException { - return codeBasicSecDO2VO(selectByOid(oid)); - } + /** + * 涓婄Щ + * + * @param oid 涓婚敭 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean upOrderNum(String oid) throws ServiceException{ + CodeBasicSec secDO = selectByOid(oid); + if(secDO.getOrderNum() > 1){ + //绛変簬1鐨勬椂鍊欎笉鑳戒笂绉讳簡 + //鎵炬瘮鑷繁灏忕殑 + List<CodeBasicSec> lastSecDOs = codeBasicSecMapper.selectList(Wrappers.<CodeBasicSec>query() + .lambda().eq(CodeBasicSec::getPkCodeRule,secDO.getPkCodeRule()) + .eq(CodeBasicSec::getOrderNum,String.valueOf(secDO.getOrderNum()-1)) + ); + if(!CollectionUtils.isEmpty(lastSecDOs)){ + CodeBasicSec lastSec = lastSecDOs.get(0); + codeBasicSecMapper.update(null, Wrappers.<CodeBasicSec>update() + .lambda().set(CodeBasicSec::getOrderNum, lastSec.getOrderNum() + 1) + .eq(CodeBasicSec::getOid, lastSec.getOid()) + ); + } + codeBasicSecMapper.update(null, Wrappers.<CodeBasicSec>update() + .lambda().set(CodeBasicSec::getOrderNum, secDO.getOrderNum() - 1) + .eq(CodeBasicSec::getOid, secDO.getOid()) + ); + } + return true; + } - /** - * 涓婚敭鏌ヨ鏁版嵁瀵硅薄 - * - * @param oid 涓婚敭 - * @return 鏁版嵁瀵硅薄 - * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父 - */ - private CodeBasicSecDO selectByOid(String oid) throws VciBaseException { - VciBaseUtil.alertNotNull(oid, "涓婚敭"); - CodeBasicSecDO codeBasicSecDO = codeBasicSecMapper.selectByPrimaryKey(oid.trim()); - if (codeBasicSecDO == null || StringUtils.isBlank(codeBasicSecDO.getOid())) { - throw new VciBaseException(DATA_OID_NOT_EXIST); - } - return codeBasicSecDO; - } + /** + * 涓嬬Щ + * + * @param oid 涓婚敭 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean downOrderNum(String oid) throws ServiceException { + CodeBasicSec secDO = selectByOid(oid); + Long total = codeBasicSecMapper.selectCount(Wrappers.<CodeBasicSec>query() + .lambda().eq(CodeBasicSec::getPkCodeRule,secDO.getPkCodeRule()) + ); + if(secDO.getOrderNum() < total){ + //灏忎簬鎬绘暟鐨勬椂鍊欐墠涓嬬Щ + List<CodeBasicSec> lastSecDOs = codeBasicSecMapper.selectList(Wrappers.<CodeBasicSec>query() + .lambda().eq(CodeBasicSec::getOrderNum,secDO.getOrderNum()+1) + .eq(CodeBasicSec::getPkCodeRule,secDO.getPkCodeRule()) + ); + if(!CollectionUtils.isEmpty(lastSecDOs)){ + CodeBasicSec lastSec = lastSecDOs.get(0); + codeBasicSecMapper.update(null, Wrappers.<CodeBasicSec>update() + .lambda().set(CodeBasicSec::getOrderNum, lastSec.getOrderNum() - 1) + .eq(CodeBasicSec::getOid, lastSec.getOid()) + ); + } + codeBasicSecMapper.update(null, Wrappers.<CodeBasicSec>update() + .lambda().set(CodeBasicSec::getOrderNum, secDO.getOrderNum() + 1) + .eq(CodeBasicSec::getOid, secDO.getOid()) + ); + } + return true; + } - /** - * 涓婚敭鎵归噺鑾峰彇鐮佹鍩虹淇℃伅 - * - * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓� - * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄 - * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭 - */ - @Override - public Collection<CodeBasicSecVO> listCodeBasicSecByOids(Collection<String> oidCollections) throws VciBaseException { - VciBaseUtil.alertNotNull(oidCollections, "鏁版嵁瀵硅薄涓婚敭闆嗗悎"); - List<CodeBasicSecDO> codeBasicSecDOList = listCodeBasicSecDOByOidCollections(oidCollections); - return codeBasicSecDO2VOs(codeBasicSecDOList); - } + /** + * 鏍戝舰缁撴瀯鏌ヨoid + * @param codeClassifySecOid + * @return + */ + @Override + public List<String> getOidByCodeclassifysecOid(String codeClassifySecOid)throws ServiceException { + return codeBasicSecMapper.getOidByCodeclassifysecOid(codeClassifySecOid.trim()); + } - /** - * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄 - * - * @param oidCollections 涓婚敭鐨勯泦鍚� - * @return 鏁版嵁瀵硅薄鍒楄〃 - */ - private List<CodeBasicSecDO> listCodeBasicSecDOByOidCollections(Collection<String> oidCollections) { - List<CodeBasicSecDO> codeBasicSecDOList = new ArrayList<CodeBasicSecDO>(); - if (!CollectionUtils.isEmpty(oidCollections)) { - Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections); - for (Collection<String> oids : oidCollectionsList) { - List<CodeBasicSecDO> tempDOList = codeBasicSecMapper.selectByPrimaryKeyCollection(oids); - if (!CollectionUtils.isEmpty(tempDOList)) { - codeBasicSecDOList.addAll(tempDOList); - } - } - } - return codeBasicSecDOList; - } + /** + * 鏍¢獙鏄惁琚紩鐢� + * + * @param codeRuleOid 缂栫爜瑙勫垯涓婚敭 + * @param codeBasicSecOid 缂栫爜鍩虹淇℃伅涓婚敭 + * @return true琛ㄧず宸茶寮曠敤锛宖alse琛ㄧず鏈寮曠敤 + * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父 + */ + private boolean checkIsLinked(String codeRuleOid, String codeBasicSecOid) throws VciBaseException { + boolean flag = true; + if (StringUtils.isNotBlank(codeRuleOid)) { + boolean status = codeRuleService.checkEditDelStatus(codeRuleService.getObjectByOid(codeRuleOid).getLcStatus()); + if (!status){ + return true; + } + boolean alreadyInUse = codeRuleService.isAlreadyInUse(codeRuleOid); + if (!alreadyInUse){ + flag = false; + } + } else { + boolean status = codeRuleService.checkEditDelStatus(codeRuleService.getObjectByOid(codeBasicSecMapper.selectById(codeBasicSecOid).getPkCodeRule()).getLcStatus()); + if (!status){ + return true; + } + boolean alreadyInUse = codeRuleService.isAlreadyInUse(codeBasicSecMapper.selectById(codeBasicSecOid).getPkCodeRule()); + if (!alreadyInUse){ + flag = false; + } + } + return flag; + } + /** + * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄 + * + * @param oidCollections 涓婚敭鐨勯泦鍚� + * @return 鏁版嵁瀵硅薄鍒楄〃 + */ + private List<CodeBasicSec> listCodeBasicSecDOByOidCollections(Collection<String> oidCollections) { + List<CodeBasicSec> codeBasicSecDOList = new ArrayList<>(); + if (!CollectionUtils.isEmpty(oidCollections)) { + Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections); + for (Collection<String> oids : oidCollectionsList) { + List<CodeBasicSec> tempDOList = codeBasicSecMapper.selectBatchIds(oids); + if (!CollectionUtils.isEmpty(tempDOList)) { + codeBasicSecDOList.addAll(tempDOList); + } + } + } + return codeBasicSecDOList; + } - /** - * 鍙傜収鐮佹鍩虹淇℃伅鍒楄〃 - * - * @param conditionMap 鏌ヨ鏉′欢 - * @param pageHelper 鍒嗛〉鍜屾帓搴� - * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭 - * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父 - */ - @Override - public DataGrid<CodeBasicSecVO> refDataGridCodeBasicSec(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException { - if (conditionMap == null) { - conditionMap = new HashMap<String, String>(); - } - return gridCodeBasicSec(conditionMap, pageHelper); - } + /** + * 涓婚敭鏌ヨ鏁版嵁瀵硅薄 + * + * @param oid 涓婚敭 + * @return 鏁版嵁瀵硅薄 + * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父 + */ + private CodeBasicSec selectByOid(String oid) throws VciBaseException { + VciBaseUtil.alertNotNull(oid, "涓婚敭"); + CodeBasicSec codeBasicSecDO = codeBasicSecMapper.selectById(oid.trim()); + if (codeBasicSecDO == null || StringUtils.isBlank(codeBasicSecDO.getOid())) { + throw new VciBaseException(DATA_OID_NOT_EXIST); + } + return codeBasicSecDO; + } - /** - * 鍏嬮殕鐮佹淇℃伅 - * - * @param oidList 婧愮爜娈典俊鎭富閿泦鍚� - * @param pkCodeRule 鐩爣缂栫爜瑙勫垯 - * @return 鍏嬮殕缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐� - */ - @Override - public BaseResult cloneCodeBasicSec(List<String> oidList, String pkCodeRule) { - boolean isLinked = checkIsLinked(pkCodeRule,null); - if (isLinked) { - return BaseResult.fail("缂栫爜瑙勫垯宸茶寮曠敤锛屼笉鍏佽缂栬緫鎴栧垹闄�"); - } - List<CodeBasicSecDO> createList = new ArrayList<>(); - List<CodeBasicSecDO> basicSecDOS = codeBasicSecMapper.selectByPrimaryKeyCollection(oidList); - basicSecDOS.forEach(sec -> { - CodeBasicSecDO newSecDO = new CodeBasicSecDO(); - BeanUtilForVCI.copyPropertiesIgnoreCase(sec,newSecDO); - newSecDO.setOid(""); - newSecDO.setNameOid(""); - newSecDO.setRevisionOid(""); - newSecDO.setId(newSecDO.getId() + "_copy"); - newSecDO.setName(newSecDO.getName() + "_copy"); - newSecDO.setPkCodeRule(pkCodeRule); - createList.add(newSecDO); - }); - codeBasicSecMapper.batchInsert(createList); - return BaseResult.success(); - } + /** + * 浣跨敤瑙勫垯鐨勪富閿幏鍙栧搴旂殑鐮佹鍐呭 + * + * @param ruleOid 瑙勫垯鐨勫唴瀹� + * @return 鐮佹鐨勫唴瀹� + */ + @Override + public List<CodeBasicSecVO> listCodeBasicSecByRuleOid(String ruleOid)throws ServiceException { + if(StringUtils.isBlank(ruleOid)){ + return new ArrayList<>(); + } + LambdaQueryWrapper<CodeBasicSec> wrapper = Wrappers.<CodeBasicSec>query().lambda() + .eq(CodeBasicSec::getPkCodeRule, ruleOid) + .orderByAsc(CodeBasicSec::getOrderNum); + List<CodeBasicSec> secDOList = baseMapper.selectList(wrapper);// + return codeBasicSecDO2VOs(secDOList,true); + } - /** - * 鏍规嵁鐮佹鍒嗙被鐨勭被鍨嬪垽鏂睘鎬ф槸鍚︽槸绌虹殑 - * - * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄 - * @return 鏈夌┖鐨勫垯浼爇ey-灞炴�у悕 value-瀛楁鍚箟锛屾病鏈夌┖鐨勫垯浼� key-success value-true - */ - @Override - public KeyValue checkAttrNullableBySecType(CodeBasicSecDTO codeBasicSecDTO) { - VciBaseUtil.alertNotNull(codeBasicSecDTO.getSectype(), "鐮佹鍒嗙被"); - String secType = codeBasicSecDTO.getSectype(); - HashMap<String, String> attrMap = JSONObject.parseObject(JSONObject.toJSONString(codeBasicSecDTO), HashMap.class); - Map<String, String> notNullableAttr = getNotNullableAttr(secType); - if (notNullableAttr == null) { - throw new VciBaseException("鐮佹鍒嗙被濉啓鍑洪敊锛岃鏌ラ獙鍚庨噸璇�"); - } - for (String key : notNullableAttr.keySet()) { - if (StringUtils.isBlank(WebUtil.getStringValueFromObject(attrMap.get(key)))) { - KeyValue kv = new KeyValue(); - kv.setKey(key); - kv.setValue(notNullableAttr.get(key)); - return kv; - } - } - KeyValue kv = new KeyValue(); - kv.setKey("success"); - kv.setValue("true"); - return kv; - } + /** + * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞� + * + * @param codeBasicSecDOs 鏁版嵁瀵硅薄鍒楄〃 + * @param hasFixedValue 鏄惁鏈夊浐瀹氬�� + * @return 鏄剧ず瀵硅薄 + * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父 + */ + @Override + public List<CodeBasicSecVO> codeBasicSecDO2VOs(Collection<CodeBasicSec> codeBasicSecDOs, boolean hasFixedValue) throws VciBaseException { + List<CodeBasicSecVO> voList = new ArrayList<CodeBasicSecVO>(); + if (!CollectionUtils.isEmpty(codeBasicSecDOs)) { + for (CodeBasicSec s : codeBasicSecDOs) { + CodeBasicSecVO vo = codeBasicSecDO2VO(s); + if (vo != null) { + voList.add(vo); + } + } + } + if(hasFixedValue && !CollectionUtils.isEmpty(voList)){ + List<CodeBasicSecVO> fixedSecVOList = voList.stream().filter(s -> CodeSecTypeEnum.CODE_FIXED_SEC.getValue().equalsIgnoreCase(s.getSecType())).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(fixedSecVOList)){ + //鏌ヨ鍥哄畾鐮佺殑鐮佸�� + Map<String, List<CodeFixedValueVO>> secValueMap = fixedValueService.listCodeFixedValueBySecOids(fixedSecVOList.stream().map(CodeBasicSecVO::getOid).collect(Collectors.toList())); + voList.stream().forEach(vo->{ + vo.setFixedValueVOList(secValueMap.getOrDefault(vo.getOid(),null)); + }); + } + } + return voList; + } - /** - * 浣跨敤瑙勫垯鐨勪富閿幏鍙栧搴旂殑鐮佹鍐呭 - * - * @param ruleOid 瑙勫垯鐨勫唴瀹� - * @return 鐮佹鐨勫唴瀹� - */ - @Override - public List<CodeBasicSecVO> listCodeBasicSecByRuleOid(String ruleOid) { - if(StringUtils.isBlank(ruleOid)){ - return new ArrayList<>(); - } - Map<String,String> conditionMap = new HashMap<>(); - conditionMap.put("pkCodeRule",ruleOid); - PageHelper pageHelper = new PageHelper(-1); - pageHelper.addDefaultAsc("ordernum"); - List<CodeBasicSecDO> secDOList = codeBasicSecMapper.selectByCondition(conditionMap, pageHelper); - return codeBasicSecDO2VOs(secDOList,true); - } + /** + * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞� + * + * @param codeBasicSecDOs 鏁版嵁瀵硅薄鍒楄〃 + * @return 鏄剧ず瀵硅薄 + * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父 + */ + @Override + public List<CodeBasicSecVO> codeBasicSecDO2VOs(Collection<CodeBasicSec> codeBasicSecDOs) throws VciBaseException { + List<CodeBasicSecVO> voList = new ArrayList<CodeBasicSecVO>(); + if (!CollectionUtils.isEmpty(codeBasicSecDOs)) { + for (CodeBasicSec s : codeBasicSecDOs) { + CodeBasicSecVO vo = codeBasicSecDO2VO(s); + if (vo != null) { + voList.add(vo); + } + } + } + return voList; + } - /** - * 浣跨敤瑙勫垯鐨勪富閿幏鍙栧搴旂殑鐮佹鐨勫唴瀹� - * - * @param ruleCollection 瑙勫垯涓婚敭闆嗗悎 - * @return 鐮佹鐨勫唴瀹� - */ - @Override - public List<CodeBasicSecVO> listCodeBasicSecByRuleOids(Collection<String> ruleCollection) { - if(CollectionUtils.isEmpty(ruleCollection)){ - return new ArrayList<>(); - } - List<CodeBasicSecDO> secDOList = new CopyOnWriteArrayList<>(); - SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo(); - VciBaseUtil.switchCollectionForOracleIn(ruleCollection).parallelStream().forEach(ruleOids->{ - WebUtil.setCurrentUserSessionInfo(sessionInfo); - Map<String,String> conditionMap = new HashMap<>(); - conditionMap.put("pkcoderule", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(ruleOids.toArray(new String[0])) + ")"); - PageHelper pageHelper = new PageHelper(-1); - pageHelper.addDefaultAsc("ordernum"); - List<CodeBasicSecDO> tempSecDOs = codeBasicSecMapper.selectByCondition(conditionMap, pageHelper); - if(!CollectionUtils.isEmpty(tempSecDOs)){ - secDOList.addAll(tempSecDOs); - } - }); - return codeBasicSecDO2VOs(secDOList); - } + /** + * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞� + * + * @param codeBasicSecDO 鏁版嵁瀵硅薄 + * @return 鏄剧ず瀵硅薄 + * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父 + */ + @Override + public CodeBasicSecVO codeBasicSecDO2VO(CodeBasicSec codeBasicSecDO) throws VciBaseException { + CodeBasicSecVO codeBasicSecVO = new CodeBasicSecVO(); + if (codeBasicSecDO != null) { + BeanUtilForVCI.copyPropertiesIgnoreCase(codeBasicSecDO, codeBasicSecVO); + if(StringUtils.isNotBlank(codeBasicSecDO.getSecType())){ + codeBasicSecVO.setSecTypeText(EnumCache.getValue(EnumEnum.CODE_SEC_TYPE,codeBasicSecDO.getSecType())); + } + if(StringUtils.isNotBlank(codeBasicSecDO.getCodeLevelType())){ + codeBasicSecVO.setCodeLevelTypeText(EnumCache.getValue(EnumEnum.CODE_LEVEL_TYPE,codeBasicSecDO.getCodeLevelType())); + } + if(StringUtils.isNotBlank(codeBasicSecDO.getCodeSecLengthType())){ + codeBasicSecVO.setCodeSecLengthTypeText(EnumCache.getValue(EnumEnum.CODE_SEC_LENGTH,codeBasicSecDO.getCodeSecLengthType())); + } + if(StringUtils.isNotBlank(codeBasicSecDO.getValueCutType())){ + codeBasicSecVO.setValueCutTypeText(EnumCache.getValue(EnumEnum.CODE_CUT_TYPE,codeBasicSecDO.getValueCutType())); + } + if(StringUtils.isNotBlank(codeBasicSecDO.getCodeGetValueType())){ + codeBasicSecVO.setCodeGetValueTypeText(EnumCache.getValue(EnumEnum.CODE_GET_VALUE_TYPE,codeBasicSecDO.getCodeGetValueType())); + } + // 濡傛灉鏄垎绫荤爜娈甸渶瑕佹煡璇㈡墍灞炲垎绫荤殑涓枃鍚嶇О + if(codeBasicSecDO.getSecType().equals("codeclassifysec") && Func.isNotEmpty(codeBasicSecDO.getParentClassifySecOid())){ + CodeBasicSec codeBasicSec = codeBasicSecMapper.selectOne(Wrappers.<CodeBasicSec>query().lambda() + .eq(CodeBasicSec::getOid, codeBasicSecDO.getParentClassifySecOid()) + .eq(CodeBasicSec::getSecType, codeBasicSecDO.getSecType())); + if(Func.isNotEmpty(codeBasicSec)){ + codeBasicSecVO.setParentClassifySecOid(codeBasicSec.getOid()); + codeBasicSecVO.setParentClassifySecText(codeBasicSec.getName()); + } + } + //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽 + if (true) { + //vo.setLcStatusText({lcStatusFullClassName}.getTextByValue(vo.getLcStatus())); + } + } + return codeBasicSecVO; + } - /** - * 鍙傜収鍒嗙被鐨勭爜娈� - * - * @param conditionMap 鏌ヨ鏉′欢锛屽繀椤昏鏈塸kCodeRule - * @param pageHelper 鍒嗛〉鐨勫璞� - * @return 鐮佹鐨勫唴瀹� - */ - @Override - public DataGrid<CodeBasicSecVO> refDataGridClassifySec(Map<String, String> conditionMap, PageHelper pageHelper) { - if(CollectionUtils.isEmpty(conditionMap) || !conditionMap.containsKey("pkCodeRule")){ - return new DataGrid<>(); - } - conditionMap.put("secType",CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue()); - return refDataGridCodeBasicSec(conditionMap,pageHelper); - } - - /** - * 鏍规嵁鐮佹绫诲瀷鑾峰彇涓嶅彲涓虹┖鐨勫瓧娈� - * - * @param secType 鐮佹绫诲瀷 - * @return 涓嶅彲涓虹┖鐨勫瓧娈甸泦鍚� - */ - private Map<String, String> getNotNullableAttr(String secType) { - Map<String, String> attrMap = new HashMap<>(); - if (CodeSecTypeEnum.CODE_ATTR_SEC.getValue().equalsIgnoreCase(secType)) { - attrMap.put("name", "灞炴�х爜娈靛悕绉�"); - } else if (CodeSecTypeEnum.CODE_DATE_SEC.getValue().equalsIgnoreCase(secType)) { - attrMap.put("name", "鏃ユ湡鐮佹鍚嶇О"); - attrMap.put("codeDateFormatStr", "鏃ユ湡鏍煎紡"); - } else if (CodeSecTypeEnum.CODE_FIXED_SEC.getValue().equalsIgnoreCase(secType)) { - attrMap.put("name", "鍥哄畾鐮佹鍚嶇О"); - attrMap.put("codeSecLengthType", "鐮佹闀垮害绫诲瀷"); - attrMap.put("codeSecLength", "鐮佹鐨勯暱搴�"); - } else if (CodeSecTypeEnum.CODE_LEVEL_SEC.getValue().equalsIgnoreCase(secType)) { - attrMap.put("name", "灞傜骇鐮佹鍚嶇О"); - attrMap.put("codeLevelType", "灞傜骇绫诲瀷"); - attrMap.put("valueCutType", "瀛楃鎴彇绫诲瀷"); - } else if (CodeSecTypeEnum.CODE_REFER_SEC.getValue().equalsIgnoreCase(secType)) { - attrMap.put("name", "寮曠敤鐮佹鍚嶇О"); - } else if (CodeSecTypeEnum.CODE_SERIAL_SEC.getValue().equalsIgnoreCase(secType)) { - attrMap.put("name", "娴佹按鐮佹鍚嶇О"); - attrMap.put("codeSecLength", "鐮佹鐨勯暱搴�"); - attrMap.put("codeFillType", "缂栫爜琛ヤ綅鏂瑰紡"); - attrMap.put("codeFillLength", "濉厖闀垮害"); - attrMap.put("codeFillLimit", "娴佹按涓婇檺"); - attrMap.put("codeFillFlag", "娴佹按鏄惁琛ョ爜"); - } else if (CodeSecTypeEnum.CODE_VARIABLE_SEC.getValue().equalsIgnoreCase(secType)) { - attrMap.put("name", "鍙彉鐮佹鍚嶇О"); - attrMap.put("codeSecLength", "鐮佹鐨勯暱搴�"); - attrMap.put("codeFillType", "缂栫爜琛ヤ綅鏂瑰紡"); - } else if (CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue().equalsIgnoreCase(secType)) { - attrMap.put("name", "鍒嗙被鐮佹鍚嶇О"); - attrMap.put("codeSecLengthType", "鐮佹闀垮害绫诲瀷"); - attrMap.put("codeSecLength", "鐮佹鐨勯暱搴�"); - } else { - attrMap = null; - } - return attrMap; - } - - /** - * 鏌ヨ鐩爣鍒嗙被鐮佹鎵�鍦ㄧ殑鏍戠粨鏋� - * - * @param oid 鐩爣鍒嗙被鐮佹涓婚敭 - * @return 鍒嗙被鐮佹鏍戠粨鏋� - */ - @Override - public List<Tree> gridCodeClassifySecTree(String oid) { - VciParentQueryOption queryOption = new VciParentQueryOption(PARENT_FIELD_NAME); - queryOption.setfOid(oid); - queryOption.setLinkTypeFlag(false); - queryOption.setHasSelf(true); - VciQueryWrapperForDO wrapper = new VciQueryWrapperForDO(CodeBasicSecDO.class); - wrapper.childQueryParent(queryOption); - List<CodeBasicSecDO> doList = codeBasicSecMapper.selectByWrapper(wrapper); - List<String> secOid = new ArrayList<>(); - doList.forEach(o -> secOid.add(o.getOid())); - List<CodeClassifyValueVO> valueVOs = (List<CodeClassifyValueVO>) codeClassifyValueService.listCodeClassifyValueByOids(secOid); - TreeQueryObject treeQueryObject = new TreeQueryObject(); - treeQueryObject.setMultipleSelect(false); - treeQueryObject.setShowCheckBox(false); - treeQueryObject.setQueryAllLevel(false); - treeQueryObject.setValueField("oid"); - treeQueryObject.setTextField("name"); - treeQueryObject.setQueryAllRev(false); - TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(PARENT_CLASSIFY_VALUE_FIELD_NAME); - treeWrapperOptions.copyFromTreeQuery(treeQueryObject); - return revisionModelUtil.doList2Trees(valueVOs,treeWrapperOptions,(CodeClassifyValueVO s) ->{ - //鍙互鍦ㄨ繖閲屽鐞嗘爲鑺傜偣鐨勬樉绀� - return s.getId() + " " + s.getName() + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s - .getLcStatus()) ? (" 銆愬仠鐢ㄣ�� ") : ""); - }); - } - - /** - * 鏍规嵁缂栫爜瑙勫垯鎵归噺鍒犻櫎鐮佹鍩烘湰淇℃伅 - * @param codeRuleOid 缂栫爜瑙勫垯涓婚敭 - * @return 鎵ц缁撴灉 - */ - @Override - public BatchCBO batchDeleteSecByCodeRuleOid(String codeRuleOid) { - VciBaseUtil.alertNotNull(codeRuleOid,"缂栫爜瑙勫垯涓婚敭"); - Map<String,String> conditionMap = new HashMap<>(); - conditionMap.put("pkcoderule",codeRuleOid); - VciQueryWrapperForDO wrapper = new VciQueryWrapperForDO(conditionMap,CodeBasicSecDO.class); - List<CodeBasicSecDO> deleteList = codeBasicSecMapper.selectByWrapper(wrapper); - if (CollectionUtils.isEmpty(deleteList)){ - return new BatchCBO(); - } - BatchCBO batchCBO = codeBasicSecMapper.batchDeleteByOids(deleteList.stream().map(CodeBasicSecDO::getOid).collect(Collectors.toSet())); - Set<ClientBusinessObject> deleteSet = new HashSet<>(); - deleteSet.addAll(batchCBO.getDeleteCbos()); - List<CodeBasicSecDO> fixedSecList = deleteList.stream().filter(sec -> { - return CodeSecTypeEnum.CODE_FIXED_SEC.getValue().equals(sec.getSecType()); - }).collect(Collectors.toList()); - List<CodeBasicSecDO> classifySecList = deleteList.stream().filter(sec -> { - return CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue().equals(sec.getSecType()); - }).collect(Collectors.toList()); - Set<String> fixedSecOidSet = fixedSecList.stream().map(CodeBasicSecDO::getOid).collect(Collectors.toSet()); - Set<String> classifySecOidSet = classifySecList.stream().map(CodeBasicSecDO::getOid).collect(Collectors.toSet()); - if (!CollectionUtils.isEmpty(fixedSecOidSet)){ - StringBuilder sb = new StringBuilder(); - fixedSecOidSet.stream().forEach(oid -> { - sb.append("'").append(oid).append("',"); - }); - String inSql = sb.toString().substring(0,sb.toString().length()-1); - VciQueryWrapperForDO wrapperForValue = new VciQueryWrapperForDO(null,CodeFixedValueDO.class); - PageHelper ph = new PageHelper(); - ph.setLimit(-1); - wrapperForValue.in("codefixedsecoid",inSql); - List<CodeFixedValueDO> fixedValueDOS = fixedValueMapper.selectByWrapper(wrapperForValue); - BatchCBO fixedCBO = fixedValueMapper.batchDeleteByOids(fixedValueDOS.stream().map(CodeFixedValueDO::getOid).collect(Collectors.toSet())); - deleteSet.addAll(fixedCBO.getDeleteCbos()); - } - if (!CollectionUtils.isEmpty(classifySecOidSet)){ - StringBuilder sb = new StringBuilder(); - classifySecOidSet.stream().forEach(oid -> { - sb.append("'").append(oid).append("',"); - }); - String inSql = sb.toString().substring(0,sb.toString().length()-1); - VciQueryWrapperForDO wrapperForValue = new VciQueryWrapperForDO(null,CodeClassifyValueDO.class); - PageHelper ph = new PageHelper(); - ph.setLimit(-1); - wrapperForValue.in("codeclassifysecoid",inSql); - List<CodeClassifyValueDO> classifyValueDOS = codeClassifyValueMapper.selectByWrapper(wrapperForValue); - BatchCBO fixedCBO = codeClassifyValueMapper.batchDeleteByOids(classifyValueDOS.stream().map(CodeClassifyValueDO::getOid).collect(Collectors.toSet())); - deleteSet.addAll(fixedCBO.getDeleteCbos()); - } - batchCBO.setDeleteCbos(deleteSet); - return batchCBO; - } - - /** - * 涓婄Щ - * - * @param oid 涓婚敭 - */ - @Override - public void upOrderNum(String oid) { - CodeBasicSecDO secDO = selectByOid(oid); - BatchCBO batchCBO = new BatchCBO(); - WebUtil.setPersistence(false); - if(secDO.getOrderNum() >1){ - //绛変簬1鐨勬椂鍊欎笉鑳戒笂绉讳簡 - //鎵炬瘮鑷繁灏忕殑 - Map<String,String> conditionMap = new HashMap<>(); - conditionMap.put("pkCodeRule",secDO.getPkCodeRule()); - conditionMap.put("ordernum",String.valueOf(secDO.getOrderNum()-1)); - List<CodeBasicSecDO> lastSecDOs = codeBasicSecMapper.selectByCondition(conditionMap,new PageHelper(-1)); - if(!CollectionUtils.isEmpty(lastSecDOs)){ - CodeBasicSecDO lastSec = lastSecDOs.get(0); - lastSec.setOrderNum(lastSec.getOrderNum()+1); - batchCBO.copyFromOther(codeBasicSecMapper.updateByPrimaryKey(lastSec)); - } - secDO.setOrderNum(secDO.getOrderNum()-1); - batchCBO.copyFromOther(codeBasicSecMapper.updateByPrimaryKey(secDO)); - } - WebUtil.setPersistence(true); - boService.persistenceBatch(batchCBO); - } - - /** - * 涓嬬Щ - * - * @param oid 涓婚敭 - */ - @Override - public void downOrderNum(String oid) { - CodeBasicSecDO secDO = selectByOid(oid); - BatchCBO batchCBO = new BatchCBO(); - WebUtil.setPersistence(false); - Map<String,String> conditionMap = new HashMap<>(); - conditionMap.put("pkCodeRule",secDO.getPkCodeRule()); - Long total = codeBasicSecMapper.countByCondition(conditionMap); - if(secDO.getOrderNum() < total){ - //灏忎簬鎬绘暟鐨勬椂鍊欐墠涓嬬Щ - conditionMap.put("ordernum",String.valueOf(secDO.getOrderNum()+1)); - List<CodeBasicSecDO> lastSecDOs = codeBasicSecMapper.selectByCondition(conditionMap,new PageHelper(-1)); - if(!CollectionUtils.isEmpty(lastSecDOs)){ - CodeBasicSecDO lastSec = lastSecDOs.get(0); - lastSec.setOrderNum(lastSec.getOrderNum()-1); - batchCBO.copyFromOther(codeBasicSecMapper.updateByPrimaryKey(lastSec)); - } - secDO.setOrderNum(secDO.getOrderNum()+1); - batchCBO.copyFromOther(codeBasicSecMapper.updateByPrimaryKey(secDO)); - } - WebUtil.setPersistence(true); - boService.persistenceBatch(batchCBO); - } } - -- Gitblit v1.9.3