From 694374bb1c6c08e3e79a65f575922e61c5c971fc Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 15 六月 2023 10:29:57 +0800
Subject: [PATCH] 历史导入功能添加

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java |  138 ++++++++++++++++++++++++++++++++++------------
 1 files changed, 102 insertions(+), 36 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 fd7c939..7ce4a1d 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,10 +17,14 @@
 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.*;
@@ -36,12 +40,18 @@
 import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
 import com.vci.ubcs.code.wrapper.CodeClassifyWrapper;
 import com.vci.ubcs.code.wrapper.CodeRuleWrapper;
-import com.vci.ubcs.com.vci.starter.exception.VciBaseException;
-import com.vci.ubcs.com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.ubcs.com.vci.starter.web.pagemodel.KeyValue;
-import com.vci.ubcs.com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.ubcs.com.vci.starter.web.util.VciBaseUtil;
-import com.vci.ubcs.com.vci.starter.web.util.WebUtil;
+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.web.pagemodel.BladeQueryObject;
+import com.vci.ubcs.starter.web.pagemodel.KeyValue;
+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;
@@ -94,15 +104,17 @@
 	@Resource
 	private RevisionModelUtil revisionModelUtil;
 
+	/**
+	 * 鍒嗛〉鏌ヨ
+	 * @param query
+	 * @param conidtionMap
+	 * @return
+	 */
 	@Override
-	public IPage<CodeRuleVO> gridCodeRule(IPage<CodeRuleVO> page, CodeRuleVO codeRule) {
-		//瀵圭敓鍛藉懆鏈熺殑鏋氫妇杩涜杞崲
-		if(!StringUtils.isEmpty(codeRule.getLcStatusText())){
-			codeRule.setLcStatus(CodeRuleLC.getValueByText(codeRule.getLcStatusText()));
-		}
-		List<CodeRule> codeRulePage = codeRuleMapper.selectCodeRulePage(page, codeRule);
+	public IPage<CodeRuleVO> gridCodeRule(Query query, Map<String,Object> conidtionMap) {
+		IPage<CodeRule> codeRuleIPage = this.codeRuleMapper.selectPage(Condition.getPage(query), UBCSCondition.getQueryWrapper(conidtionMap, CodeRule.class));
 		//do杞瑅o鍚屾椂setLcStatusText鐢熷懡鍛ㄦ湡鍊硷紝骞跺寘瑁呮垚鍒嗛〉瀵硅薄杩斿洖
-		return page.setRecords(CodeRuleWrapper.build().listVO(codeRulePage));
+		return CodeRuleWrapper.build().pageVO(codeRuleIPage);
 	}
 
 	/**
@@ -113,30 +125,14 @@
 	 * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
 	 */
 	@Override
-	public boolean addSave(CodeRuleDTO codeRuleDTO) throws VciBaseException{
+	public boolean addSave(CodeRuleDTO codeRuleDTO) throws VciBaseException {
 		VciBaseUtil.alertNotNull(codeRuleDTO, "闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
 		//灏咲TO杞崲涓篋O
 		CodeRule codeRule = Objects.requireNonNull(BeanUtil.copy(codeRuleDTO, CodeRule.class));
 		String userId = AuthUtil.getUserId().toString();
-		codeRule.setOid(VciBaseUtil.getPk());
-		codeRule.setRevisionOid(VciBaseUtil.getPk());
-		codeRule.setNameOid(VciBaseUtil.getPk());
-		codeRule.setBtmname("coderule");
-		codeRule.setLastR("1");
-		codeRule.setLastV("1");
-		codeRule.setFirstR("1");
-		codeRule.setFirstV("1");
-		codeRule.setCreator(userId);
-		codeRule.setCreateTime(new Date());
-		codeRule.setLastModifier("1");
-		codeRule.setLastModifyTime(new Date());
-		codeRule.setVersionRule("0");
-		codeRule.setVersionSeq(1);
+		DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeRule, MdmBtmTypeConstant.CODE_RULE);
 		codeRule.setLctid(CODE_RULE_LC);
 		codeRule.setLcStatus(FRAMEWORK_RELEASE_EDITING);
-		codeRule.setOwner("1");
-		codeRule.setCreator(userId);
-		codeRule.setLastModifier(userId);
 		return codeRuleMapper.insert(codeRule)>0;
 	}
 
@@ -170,6 +166,7 @@
 		//灏咲TO杞崲涓篋O
 		CodeRule codeRule = selectByOid(codeRuleDTO.getOid());
 		revisionModelUtil.copyFromDTOIgnore(codeRuleDTO, codeRule);
+		DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeRule);
 		return codeRuleMapper.updateById(codeRule)>0;
 	}
 
@@ -291,7 +288,7 @@
 	 */
 	@Override
 	public Collection<CodeClassifyVO> listUseRangeInCodeClassify(String oid) {
-		List<CodeClassify> codeClassifies = codeClassifyServcie.selectByWrapper(Wrappers.<CodeClassify>query().eq("codeRuleOid", oid));
+		List<CodeClassify> codeClassifies = codeClassifyServcie.selectByWrapper(Wrappers.<CodeClassify>query().lambda().eq(CodeClassify::getCodeRuleOid, oid));
 		return CodeClassifyWrapper.build().listVO(codeClassifies);
 	}
 
@@ -323,6 +320,21 @@
 	}
 
 	/**
+	 * 涓婚敭鎵归噺鑾峰彇涓绘暟鎹紪鐮佽鍒�
+	 *
+	 * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
+	 * @param hasSec         鏄惁鍖呭惈鐮佹
+	 * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞�
+	 * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
+	 */
+	@Override
+	public Collection<CodeRuleVO> listCodeRuleByIds(Collection<String> oidCollections, boolean hasSec) throws VciBaseException {
+		VciBaseUtil.alertNotNull(oidCollections, "鏁版嵁瀵硅薄涓婚敭闆嗗悎");
+		List<CodeRule> codeRuleDOList = listCodeRuleDOByOidCollections(oidCollections);
+		return codeRuleDO2VOs(codeRuleDOList, true);
+	}
+
+	/**
 	 * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
 	 *
 	 * @param oidCollections 涓婚敭鐨勯泦鍚�
@@ -345,14 +357,13 @@
 	/**
 	 * 鍙傜収涓绘暟鎹紪鐮佽鍒欏垪琛�
 	 *
-	 * @param codeRule 鏌ヨ鏉′欢
-	 * @param page   鍒嗛〉鍜屾帓搴�
+	 * @param bladeQueryObject 鏌ヨ鏉′欢
 	 * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
 	 * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
 	 */
 	@Override
-	public IPage<CodeRuleVO> refDataGridCodeRule(IPage<CodeRuleVO> page, CodeRuleVO codeRule) throws VciBaseException {
-		return gridCodeRule(page, codeRule);
+	public IPage<CodeRuleVO> refDataGridCodeRule(BladeQueryObject bladeQueryObject) throws VciBaseException {
+		return gridCodeRule(bladeQueryObject.getQuery(), bladeQueryObject.getConditionMap());
 	}
 
 	/**
@@ -429,4 +440,59 @@
 	}
 
 
+	/**
+	 * 浣跨敤涓婚敭鑾峰彇缂栫爜瑙勫垯鐨勫唴瀹�
+	 *
+	 * @param oid 涓婚敭
+	 * @return 瑙勫垯鐨勬樉绀哄璞�
+	 */
+	@Override
+	public CodeRuleVO getObjectHasSecByOid(String oid) {
+		CodeRule ruleDO = selectByOid(oid);
+		return codeRuleDO2VO(ruleDO, true);
+	}
+
+	/**
+	 * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
+	 *
+	 * @param codeRules 鏁版嵁瀵硅薄鍒楄〃
+	 * @param hasSec      鏄惁鍖呭惈鐮佹
+	 * @return 鏄剧ず瀵硅薄
+	 * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
+	 */
+	public List<CodeRuleVO> codeRuleDO2VOs(Collection<CodeRule> codeRules, boolean hasSec) throws VciBaseException {
+		List<CodeRuleVO> voList = new ArrayList<CodeRuleVO>();
+		if (!CollectionUtils.isEmpty(codeRules)) {
+			for (CodeRule s : codeRules) {
+				CodeRuleVO vo = codeRuleDO2VO(s,true);
+				if (vo != null) {
+					voList.add(vo);
+				}
+			}
+		}
+		return voList;
+	}
+
+	/**
+	 * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
+	 *
+	 * @param codeRuleDO 瑙勫垯鐨勬暟鎹璞�
+	 * @param hasSec     鏄惁鏌ヨ鐮佹
+	 * @return 鏄剧ず瀵硅薄
+	 * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
+	 */
+	public CodeRuleVO codeRuleDO2VO(CodeRule codeRuleDO, boolean hasSec) throws VciBaseException {
+		CodeRuleVO vo = new CodeRuleVO();
+		if (codeRuleDO != null) {
+			BeanUtilForVCI.copyPropertiesIgnoreCase(codeRuleDO, vo);
+			//濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
+			vo.setLcStatusText(CodeRuleLC.getTextByValue(vo.getLcStatus()));
+			if (hasSec) {
+				//鏌ヨ鐮佹
+				vo.setSecVOList(codeBasicSecService.listCodeBasicSecByRuleOid(vo.getOid()));
+			}
+		}
+		return vo;
+	}
+
 }

--
Gitblit v1.9.3