From ce68dd3e32877d786f878657b464be4a488bb245 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 17 七月 2023 14:17:59 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 66 ++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 13 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index ebda882..c47f444 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -11,10 +11,7 @@
import com.vci.ubcs.code.dto.CodeOrderDTO;
import com.vci.ubcs.code.dto.CodeOrderSecDTO;
import com.vci.ubcs.code.entity.*;
-import com.vci.ubcs.code.enumpack.CodeDefaultLC;
-import com.vci.ubcs.code.enumpack.CodeSecTypeEnum;
-import com.vci.ubcs.code.enumpack.SysIntegrationDataFlowTypeEnum;
-import com.vci.ubcs.code.enumpack.sysIntegrationPushTypeEnum;
+import com.vci.ubcs.code.enumpack.*;
import com.vci.ubcs.code.mapper.CommonsMapper;
import com.vci.ubcs.code.service.*;
import com.vci.ubcs.code.util.ClientBusinessObject;
@@ -39,10 +36,10 @@
import com.vci.ubcs.code.wrapper.CodeClassifyWrapper;
import com.vci.ubcs.omd.feign.IBtmTypeClient;
import com.vci.ubcs.omd.vo.BtmTypeVO;
-import com.vci.ubcs.starter.revision.model.BaseModel;
+import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
-import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
+import com.vci.ubcs.starter.util.UBCSSqlKeyword;
import com.vci.ubcs.starter.web.pagemodel.SessionInfo;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
@@ -54,11 +51,10 @@
import javax.annotation.Resource;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
-import static com.vci.ubcs.code.constant.MdmDuckingConstant.DOCKING_DEFAULT_CLASSIFY;
import static com.vci.ubcs.code.constant.MdmEngineConstant.DEFAULT_SYNC_ATTR_LIST;
-import static com.vci.ubcs.code.constant.MdmEngineConstant.IMPORT_ROW_INDEX;
import static com.vci.ubcs.code.enumpack.CodeSecTypeEnum.CODE_CLASSIFY_SEC;
/***
@@ -857,12 +853,12 @@
List<String> classifyIdList= libraryVO.getClassifyid();
List<CodeClassifyVO> codeClassifyVOS =new ArrayList<>();
- //鏍￠獙鏄惁閰嶇疆
+ /*//鏍￠獙鏄惁閰嶇疆
boolean checkPass= checkIspass(systemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_QUERYCLAFILYRULE.getValue());
if(!checkPass){
errorid="101";
throw new Throwable("绯荤粺鏍囪瘑涓恒��"+systemId+"銆�,"+sysIntegrationPushTypeEnum.ACCPET_QUERYCLAFILYRULE.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠＄悊鍛橈紒");
- }
+ }*/
//杩欐槸璐﹀彿淇℃伅
//杩欐槸璐﹀彿淇℃伅
if(userVo!=null) {
@@ -949,10 +945,54 @@
}else if(secType.equals("coderefersec")){//寮曠敤鐮佹
codeBasicSecVO.getReferAttributeId();
codeBasicSecVO.getReferCodeClassifyOid();
- codeBasicSecVO.getReferBtmId();
- codeBasicSecVO.getReferBtmName();
- //codeBasicSecVO.getReferValueInfo();
+ String referBtmId=codeBasicSecVO.getReferBtmId();
+ String btmName=codeBasicSecVO.getReferBtmName();
+ String referConfig= codeBasicSecVO.getReferConfig();
+ CoderefersecSearchVO coderefersecSearchVO=new CoderefersecSearchVO();
+ if(StringUtils.isNotBlank(referConfig)){
+ coderefersecSearchVO = JSONObject.toJavaObject(JSONObject.parseObject(referConfig), CoderefersecSearchVO.class);
+ }
+ String buildSqlwhere="";
+ if(coderefersecSearchVO!=null){
+ Map<String,Object> condtionMap=new HashMap<>();
+ List<CodeSrchCondConfigVO> codeSrchCondConfigVOList=coderefersecSearchVO.getCodeSrchCondConfigVOS();
+ if(!CollectionUtils.isEmpty(codeSrchCondConfigVOList)) {
+ codeSrchCondConfigVOList.stream().forEach(codeSrchCondConfigVO -> {
+ condtionMap.put(codeSrchCondConfigVO.getFilterField()+codeSrchCondConfigVO.getFilterType(),codeSrchCondConfigVO.getFilterValue());
+ });
+ buildSqlwhere= UBCSSqlKeyword.buildSqlwhere(condtionMap);
+ }
+ }
+ //浣跨敤浼犲叆鐨勪笟鍔＄被鍨嬫煡璇㈣〃
+ R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(referBtmId));
+ if (!listR.isSuccess() || listR.getData().size() == 0) {
+ throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
+ }
+ String referTable = listR.getData().get(0).getTableName();
+ StringBuffer sb=new StringBuffer();
+ sb.append(" select * from ");
+ sb.append(referTable);
+ sb.append(" where 1=1 ");
+ if(StringUtils.isNotBlank(buildSqlwhere)){
+ sb.append( buildSqlwhere );
+ }
+ List<Map> ListMap= commonsMapper.selectBySql(sb.toString());
+ String valueField=coderefersecSearchVO.getValueField();
+ String textField=coderefersecSearchVO.getTextField();
+ final int[] num = {0};
+ if(!CollectionUtils.isEmpty(ListMap)){
+ ListMap.stream().forEach(map->{
+ num[0]++;
+ String id= map.getOrDefault("OID".toUpperCase(Locale.ROOT),"").toString();
+ String value= map.getOrDefault(valueField.toUpperCase(Locale.ROOT),"").toString();
+ String text=map.getOrDefault(textField.toUpperCase(Locale.ROOT),"").toString();
+ String description=map.getOrDefault("description".toUpperCase(Locale.ROOT),"").toString();
+ CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(id, num[0]+"",value,text,"",description);
+ codeSectionValueVOList.add(sectionValueVO);
+ });
+ }
+ log.info(libId);
}else if(secType.equals("codelevelsec")) {//灞傜骇鐮佹
int level = codeBasicSecVO.getCodeLevelValue();
CodeClassifyVO levelCodeClassifyVO = new CodeClassifyVO();
--
Gitblit v1.9.3