From 4ed0e9d8ed0e785e62c0f9deb299445e5947c364 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 14 九月 2023 15:43:42 +0800
Subject: [PATCH] PDM 集团码提示信息bug修改
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 1368 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 1,255 insertions(+), 113 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 4221c45..91ee9bc 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
@@ -2,49 +2,66 @@
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.toolkit.Wrappers;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
+import com.vci.ubcs.code.constant.MdmDuckingConstant;
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.*;
import com.vci.ubcs.code.mapper.CommonsMapper;
import com.vci.ubcs.code.service.*;
import com.vci.ubcs.code.util.ClientBusinessObject;
import com.vci.ubcs.code.util.gennerAttrMapUtil;
import com.vci.ubcs.code.vo.pagemodel.*;
+import com.vci.ubcs.code.vo.webserviceModel.person.*;
import com.vci.ubcs.code.vo.webserviceModel.apply.*;
import com.vci.ubcs.code.vo.webserviceModel.attrmap.*;
import com.vci.ubcs.code.vo.webserviceModel.attrmap.DataObjectVO;
import com.vci.ubcs.code.vo.webserviceModel.classify.*;
+import com.vci.ubcs.code.vo.webserviceModel.classify.QueryClassifyVO;
+import com.vci.ubcs.code.vo.webserviceModel.classify.QueryData;
+import com.vci.ubcs.code.vo.webserviceModel.classify.QueryLibraryVO;
+import com.vci.ubcs.code.vo.webserviceModel.classify.ResultClassifyVO;
+import com.vci.ubcs.code.vo.webserviceModel.coderule.*;
import com.vci.ubcs.code.vo.webserviceModel.data.*;
+import com.vci.ubcs.code.vo.webserviceModel.data.ResultDataVO;
import com.vci.ubcs.code.vo.webserviceModel.result.json.*;
import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultClassfyVO;
import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultDataObjectDetailDO;
import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultSystemVO;
import com.vci.ubcs.code.webService.annotation.VciWebservice;
import com.vci.ubcs.code.webService.config.AttributeMapConfig;
+import com.vci.ubcs.code.webService.config.PersonAndDeptConfig;
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.util.UBCSSqlKeyword;
import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
import com.vci.ubcs.starter.web.pagemodel.SessionInfo;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import com.vci.ubcs.system.feign.ISysClient;
+import com.vci.ubcs.system.user.entity.User;
+import com.vci.ubcs.system.user.feign.IUserClient;
+import com.vci.ubcs.system.vo.DeptVO;
+import com.vci.ubcs.system.vo.RoleVO;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
import static com.vci.ubcs.code.constant.MdmEngineConstant.DEFAULT_SYNC_ATTR_LIST;
@@ -57,9 +74,15 @@
@Slf4j
@VciWebservice(path = "/universalInterface")
public class UniversalInterfaceImpl<IDockingLogeServiceing> implements UniversalInterfaceI {
-
+ @Value("${code.universalinterface.checkSystemConfig:true}")
+ public boolean CODE_CHECKCONFIG;
@Autowired(required = false)
private AttributeMapConfig attributeMapConfig;
+ /***
+ * 浜哄憳鐩稿叧閰嶇疆鏈嶅姟
+ */
+ @Autowired(required = false)
+ private PersonAndDeptConfig personAndDeptConfig;
/**
* 缂撳瓨鏈嶅姟
*/
@@ -76,6 +99,18 @@
*/
@Autowired
private IBtmTypeClient btmTypeClient;
+
+ /**
+ * 浜哄憳鏈嶅姟
+ */
+ @Autowired
+ private ISysClient sysClient;
+
+ /**
+ * 浜哄憳鏈嶅姟
+ */
+ @Autowired
+ private IUserClient userClient;
/**
* 閫氱敤鏌ヨ
@@ -96,8 +131,12 @@
@Resource
private MdmIOService mdmIOService;
+ @Resource
+ private IDockingSystemConfigService dockingSystemConfigService;
+
@Autowired
private ICodeClassifyValueService codeClassifyValueService;
+
/***
* 闆嗘垚鎺ュ彛鏃ュ織鏈嶅姟鐨勯厤缃�
*/
@@ -119,7 +158,7 @@
@Override
public String applyCode(String data, String dataType) throws Throwable {
String resultStr = "";
- String errorid="0";
+ final String[] errorid = {"0"};
msg="鎴愬姛";
objerrorCode="0";
objerrorMsg="鎴愬姛";
@@ -129,7 +168,7 @@
List<XMLResultClassfyVO> resultClassfyVOList = new ArrayList<>();
try {
if(StringUtils.isBlank(data)) {
- errorid="101";
+ errorid[0] ="101";
throw new Throwable("鎺ュ彛鍙傛暟锛氫紶閫掍负绌�");
}
InterParameterVO interParameterVO =new InterParameterVO();
@@ -145,7 +184,7 @@
interParameterVO = JSONObject.toJavaObject(JSONObject.parseObject(data), InterParameterVO.class);
}
}catch (Throwable e){
- errorid="101";
+ errorid[0] ="101";
throw new Throwable("鎺ュ彛鍙傛暟锛氫紶鍏ユ暟鎹弬鏁拌В鏋愬け璐�");
}
ClassfysVO classfysVO = interParameterVO.getData().getClassifys();
@@ -160,20 +199,33 @@
sessionInfo.setUserName(userVo.getTrueName());
sessionInfo.setIp(userVo.getIp());
VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
-
+// List<XMLResultDataObjectDetailDO> allResultDataObjectDetailDOS=new ArrayList<>();
String finalSystemId = systemId;
classVOList.stream().forEach(classVO -> {
log.info("鍙傛暟锛氬垎绫籆Ode:" + classVO.getClassCode());
+ boolean isCodeOrGroupCode=false;
LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>();
+ String libray ="";
//鑾峰彇鍒嗙被淇℃伅
try {
- String libray = classVO.getLibrary();
- CodeClassifyVO codeClassifyVO = getClassfy(classVO);
+ libray = classVO.getLibrary();
+ CodeClassifyVO codeClassifyVO = getClassfy(classVO,libray);
log.info("end锛氬垎绫绘煡璇㈠畬姣�");
//鑾峰彇鍒嗙被妯℃澘淇℃伅
if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
objerrorCode="100";
throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙栧埌鍒嗙被淇℃伅");
+ }
+ String operation="";
+ if(CODE_CHECKCONFIG) {
+ //鏍￠獙鏄惁閰嶇疆
+ DockingSystemConfig dockingSystemConfig=null;
+ dockingSystemConfig=checkIspass(finalSystemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue(),codeClassifyVO.getOid());
+ if(dockingSystemConfig==null){
+ errorid[0] ="101";
+ throw new Throwable("绯荤粺鏍囪瘑涓恒��"+ finalSystemId +"銆戯紝闆嗘垚鍒嗙被涓恒��"+codeClassifyVO.getName()+"銆戜互涓婂垎绫伙紝"+sysIntegrationPushTypeEnum.ACCPET_APPCODE.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠＄悊鍛橈紒");
+ }
+ isCodeOrGroupCode="true".equals(dockingSystemConfig.getIsGroupCodeFlag())?true:false;
}
CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
if(templateVO==null||StringUtils.isBlank(templateVO.getOid())){
@@ -205,15 +257,30 @@
CodeOrderDTO orderDTO = new CodeOrderDTO();
orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//鍒嗙被涓婚敭
orderDTO.setSecDTOList(codeOrderSecDTOList);//鍒嗙被鐮佹
- mdmIOService.batchSyncApplyCode(orderDTO, dataObjectVO, resultDataObjectDetailDOs);
+ mdmIOService.batchSyncApplyCode(orderDTO, dataObjectVO, resultDataObjectDetailDOs,isCodeOrGroupCode);
+ //allResultDataObjectDetailDOS.add(resultDataObjectDetailDOs);
log.info("end锛氱敵璇疯幏鍙栧畬姣�");
} catch (Throwable e) {
- XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
- xmlResultDataObjectDetailDO.setCode("");
- xmlResultDataObjectDetailDO.setId("");
- xmlResultDataObjectDetailDO.setErrorid(objerrorCode);
- xmlResultDataObjectDetailDO.setMsg("缂栫爜鐢宠澶辫触:"+e.getMessage());
- resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
+ List<ApplyDataVO> applyDataVOList= classVO.getObjects().getObject();
+ objerrorCode="1";
+ if(!CollectionUtils.isEmpty(applyDataVOList)) {
+ applyDataVOList.stream().forEach(applyDataVO -> {
+ XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO = new XMLResultDataObjectDetailDO();
+ xmlResultDataObjectDetailDO.setCode("");
+ xmlResultDataObjectDetailDO.setId(applyDataVO.getId());
+ xmlResultDataObjectDetailDO.setErrorid(objerrorCode);
+ xmlResultDataObjectDetailDO.setMsg("缂栫爜鐢宠澶辫触:" + e.getMessage());
+ resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
+ });
+ }else{
+
+ XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO = new XMLResultDataObjectDetailDO();
+ xmlResultDataObjectDetailDO.setCode("");
+ xmlResultDataObjectDetailDO.setId("");
+ xmlResultDataObjectDetailDO.setErrorid(objerrorCode);
+ xmlResultDataObjectDetailDO.setMsg("缂栫爜鐢宠澶辫触:" + e.getMessage());
+ resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
+ }
e.printStackTrace();
}finally {
XMLResultClassfyVO resultClassfyVO = new XMLResultClassfyVO();
@@ -224,13 +291,14 @@
resultClassfyVOList.add(resultClassfyVO);
}
});
+
XMLResultSystemVO xmlResultSystemVO=new XMLResultSystemVO();
xmlResultSystemVO.setClassifys(resultClassfyVOList);
xmlResultSystemVO.setMsg(msg);
- xmlResultSystemVO.setErrorid(errorid);
+ xmlResultSystemVO.setErrorid(errorid[0]);
resultStr= transferResultXMl(xmlResultSystemVO,dataType);
}catch (Throwable e){
- e.printStackTrace();;
+ e.printStackTrace();
msg="鐢宠缂栫爜澶辫触:"+e.getMessage();
/* XMLResultSystemVO XMLResultSystemVO=new XMLResultSystemVO();
XMLResultSystemVO.setErrorid(errorid);
@@ -244,10 +312,10 @@
XMLResultSystemVO xmlResultSystemVO=new XMLResultSystemVO();
xmlResultSystemVO.setClassifys(resultClassfyVOList);
xmlResultSystemVO.setMsg(msg);
- xmlResultSystemVO.setErrorid(errorid);
+ xmlResultSystemVO.setErrorid(errorid[0]);
resultStr= transferResultXMl(xmlResultSystemVO,dataType);
final boolean[] issucess = {true};
- if(!errorid.equals("0")) {
+ if(!errorid[0].equals("0")) {
issucess[0] = false;
}else {
if(!CollectionUtils.isEmpty(resultClassfyVOList)) {
@@ -270,10 +338,550 @@
}
}
log.info("杩斿洖鍙傛暟:"+resultStr);
-
+ //璋冪敤闆嗗洟鐢宠鎺ュ彛鐢宠闆嗗洟鐮�
return resultStr;
}
+
+
+ /****
+ * 浜哄憳鏁版嵁鍚屾
+ * @param personData
+ * @return
+ * @throws Throwable
+ */
+ @Override
+ public ResultOrgData syncDataForPerson(PersonData personData) {
+
+ boolean isUsedFlag= personAndDeptConfig.isUsedFlag();
+ ResultOrgData resultOrgData=new ResultOrgData();
+
+ boolean isPersonApplyGroupCode= personAndDeptConfig.isPersonApplyGroupCode();
+ String systemCode=personData.getSystemCode();
+ List<ResultMdMapping> resultMdMappingList=new ArrayList<>();
+ String message="";
+ if(isUsedFlag){
+ AtomicBoolean success= new AtomicBoolean(true);
+ List<PersonMasterData> masterDataList=new ArrayList<>();
+ List<String> fields= VciBaseUtil.str2List(personAndDeptConfig.getPersonFields());
+ try {
+ if(personData==null){
+ throw new Throwable("浼犲叆鍙傛暟涓簄ull");
+ }
+ masterDataList = personData.getMasterData();
+ String personLibrary = personAndDeptConfig.getPersonLibrary();
+ if (StringUtils.isBlank(personLibrary)) {
+ success.set(false);
+ log.info("闆嗘垚閰嶇疆缂哄皯浜哄憳搴撹妭鐐逛俊鎭�,personLibrary->" + personLibrary);
+ throw new Throwable("闆嗘垚閰嶇疆缂哄皯浜哄憳搴撹妭鐐逛俊鎭�,personLibrary->" + personLibrary);
+ }
+ String personClassCode = personAndDeptConfig.getPersonClassCode();
+ ClassfyVO classfyVO = new ClassfyVO();
+ classfyVO.setLibrary(personLibrary);
+ classfyVO.setClassCode(personClassCode);
+ CodeClassifyVO codeClassifyVO=this.getClassfy(classfyVO,personLibrary);
+ log.info("end锛氬垎绫绘煡璇㈠畬姣�");
+ //鑾峰彇鍒嗙被妯℃澘淇℃伅
+ if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
+ success.set(false);
+ throw new Throwable ("鏍规嵁閰嶇疆鍒嗙被鐨勫垎绫荤紪鍙凤紝鏈幏鍙栧埌鍒嗙被淇℃伅");
+ }
+ CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
+ if(templateVO==null||StringUtils.isBlank(templateVO.getOid())){
+ success.set(false);
+ throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙朚DM绯荤粺涓搴旀ā鏉�");
+ }
+
+ List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormDisplayFlag())
+ ).collect(Collectors.toList());
+
+ List<PersonMasterData> personMasterDataList= personData.getMasterData();
+ List<Map> dataList=new ArrayList<>();
+
+ List<String> codeList=new ArrayList<>();
+
+ List<ApplyDataVO> applyDataVOList=new ArrayList<>();
+ List<ApplyDataVO> deleteDataVOList=new ArrayList<>();
+ personMasterDataList.stream().forEach(personMasterData -> {
+ ApplyDataVO object=new ApplyDataVO();
+ object.setCode(personMasterData.getLm_code());//缂栫爜
+ object.setCreator(personMasterData.getCreator());//鍒涘缓鑰�
+ object.setEditor(personMasterData.getModifier());//淇敼鑰�
+ object.setId(personMasterData.getId());//涓婚敭
+ object.setStatus(CodeDefaultLC.RELEASED.getValue());//鐘舵�佸垯闇�瑕佸垽鏂�
+ Map<String,String> dataMap= VciBaseUtil.objectToMapString(personMasterData);
+ List<ProppertyVO> proppertyVOList=new ArrayList<>();
+ /***
+ * 鏍规嵁閰嶇疆鏂囦欢鑾峰彇鏋氫妇鍊�
+ */
+ fields.stream().forEach(field->{
+ if(dataMap.containsKey(field)){
+ String enumFiled= dataMap.get(field);
+ EnumerableData enumerableData=JSONObject.toJavaObject(JSONObject.parseObject(enumFiled),EnumerableData.class);
+ String enumCode=enumerableData.getCode();
+ //String enumCodeValue=enumerableData.getName();
+ ProppertyVO proppertyVO=new ProppertyVO();
+ proppertyVO.setKey(field);
+ proppertyVO.setValue(enumCode);
+ proppertyVOList.add(proppertyVO);
+ dataMap.remove(field);
+ }
+ });
+ dataMap.forEach((key,vaule)->{
+ ProppertyVO proppertyVO=new ProppertyVO();
+ proppertyVO.setKey(key);
+ proppertyVO.setValue(vaule);
+ proppertyVOList.add(proppertyVO);
+ });
+
+ object.setProp(proppertyVOList);
+ if(personMasterData.getDr()==1){
+ object.setOperate("delete");//鎿嶄綔绫诲瀷
+ deleteDataVOList.add(object);
+ }else{
+ String worker_category=personMasterData.getWorker_category();
+
+ object.setOperate("create");
+ applyDataVOList.add(object);
+ }
+ codeList.add(personMasterData.getLm_code());
+ });
+
+ R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(templateVO.getBtmTypeId());
+ if(!r.isSuccess()) {
+ throw new Throwable(r.getMsg());
+ }
+ BtmTypeVO btmTypeVO = r.getData();
+ if (btmTypeVO == null) {
+ throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷瀵硅薄锛�");
+ }
+ String tableName = btmTypeVO.getTableName();
+ if (com.alibaba.nacos.common.utils.StringUtils.isBlank(tableName)) {
+ throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷鐩稿叧鑱旂殑琛�");
+ }
+ StringBuffer sb=new StringBuffer();
+ sb.append(" select * from ");
+ sb.append(tableName);
+ sb.append(" where 1=1 ");
+ sb.append(" and lastr=1 and lastv=1" );
+ sb.append(" and id in (");
+ sb.append(VciBaseUtil.toInSql(codeList.toArray(new String[0])));
+ sb.append(")");
+ List<Map<String,String>> dataMapList=commonsMapper.queryByOnlySqlForMap(sb.toString());
+ List<ClientBusinessObject> cboList= ChangeMapTOClientBusinessObjects(dataMapList);
+ ApplyDatasVO applyDatasVO=new ApplyDatasVO();
+ ApplyDatasVO editDatasVO=new ApplyDatasVO();
+ if(!CollectionUtils.isEmpty(cboList)){
+ Map<String,ClientBusinessObject> oldpplyDataVOMap= cboList.stream().filter(data -> data != null && StringUtils.isNotBlank(data.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
+ //鏁版嵁搴撲笉瀛樺湪鐨�
+ List<ApplyDataVO> applyApplyDataVOList = applyDataVOList.stream().filter(cbo -> {
+ String code =cbo.getCode();
+ return !oldpplyDataVOMap.containsKey(code);
+ }).collect(Collectors.toList());
+ applyDatasVO.setObject(applyApplyDataVOList);
+ //鏁版嵁搴撳瓨鍦ㄧ殑
+ List<ApplyDataVO> editApplyDataVOList = applyDataVOList.stream().filter(cbo -> {
+ String code =cbo.getCode();
+ if(oldpplyDataVOMap.containsKey(code)){
+ cbo.setOperate("update");
+ }
+ return oldpplyDataVOMap.containsKey(code);
+ }).collect(Collectors.toList());
+ editApplyDataVOList.addAll(deleteDataVOList);
+ editDatasVO.setObject(editApplyDataVOList);
+ }else{
+ applyDatasVO.setObject(applyDataVOList);
+ }
+
+ LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs=new LinkedList<>();
+ if(editDatasVO.getObject()!=null&&editDatasVO.getObject().size()>0){
+ DataObjectVO dataObjectVO = new DataObjectVO();
+ this.getConfigDatas(systemCode, personLibrary, editDatasVO, attrVOS, dataObjectVO);
+ log.info("start锛氫慨鏀规暟鎹墽琛屽畬姣�");
+ boolean personApplyGroupCode =personAndDeptConfig.isPersonApplyGroupCode();
+ mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,personApplyGroupCode);
+ log.info("end锛氫慨鏀规暟鎹墽琛屽畬姣�");
+ }
+ if(applyDatasVO.getObject()!=null&&applyDatasVO.getObject().size()>0) {
+ DataObjectVO dataObjectVO = new DataObjectVO();
+ this.getConfigDatas(systemCode, personLibrary, applyDatasVO, attrVOS, dataObjectVO);
+
+ CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(codeClassifyVO.getOid());
+ CodeRuleVO ruleVO = engineService.getCodeRuleByClassifyFullInfo(classifyFullInfo);
+ if(ruleVO==null||"".equals(ruleVO.getOid())){
+ throw new Throwable("缂栫爜瑙勫垯");
+ }
+ List<XMLResultDataObjectDetailDO> xDOs=new CopyOnWriteArrayList<>();
+ dataObjectVO.getRowData().parallelStream().forEach(rowData->{
+ String mesg="";
+ try {
+ CodeOrderDTO orderDTO = new CodeOrderDTO();
+ List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>();
+ orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//鍒嗙被涓婚敭
+ orderDTO.setTemplateOid(templateVO.getOid());
+ if(!CollectionUtils.isEmpty(ruleVO.getSecVOList())) {
+ ruleVO.getSecVOList().stream().forEach(codeBasicSecVO -> {
+ if (codeBasicSecVO.getSecType().equals("codevariablesec")) {//瑙勫垯涔嬪畾涔変负鍙彉鐮佹瀛樺偍涓绘暟鎹紶閫掕繃鏉ョ殑鏁版嵁
+ CodeOrderSecDTO CodeOrderSecDTO = new CodeOrderSecDTO();
+ CodeOrderSecDTO.setSecOid(codeBasicSecVO.getOid());
+ CodeOrderSecDTO.setSecValue(rowData.getCode());
+ codeOrderSecDTOList.add(CodeOrderSecDTO);
+
+ }
+ });
+ }
+ orderDTO.setCodeRuleOid(ruleVO.getOid());
+ orderDTO.setSecDTOList(codeOrderSecDTOList);//瀛樺偍缂栫爜
+ orderDTO.setData(rowData.getFiledValue());
+ String code=engineService.addSaveCode(orderDTO);
+ if(StringUtils.isNotBlank(code)) {
+ StringBuffer sqlsb = new StringBuffer();
+ sqlsb.append(" select * from ");
+ sqlsb.append(tableName);
+ sqlsb.append(" where 1=1 ");
+ sqlsb.append(" and lastr=1 and lastv=1");
+ sqlsb.append(" and id in (");
+ sqlsb.append(VciBaseUtil.toInSql(code));
+ sqlsb.append(")");
+ List<Map<String, String>> newDataMapList = commonsMapper.queryByOnlySqlForMap(sqlsb.toString());
+ if (!CollectionUtils.isEmpty(newDataMapList)) {
+ String oid = StringUtils.isBlank(newDataMapList.get(0).get("OID")) ? "" : newDataMapList.get(0).get("OID");
+ List<String> oidList = new ArrayList<>();
+ oidList.add(oid);
+ //濡傛灉鏈夌敵璇峰氨鍘昏皟鐢ㄧ敵璇烽泦鍥㈢爜
+ if (isPersonApplyGroupCode) {
+ mdmIOService.sendApplyGroupcode(oidList, templateVO.getBtmTypeId(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue());
+ success.set(true);
+ mesg = "鏁版嵁淇濆瓨鎴愬姛锛岀瓑寰呯敵璇烽泦鍥㈢爜";
+ }
+ }
+ }
+ } catch (Exception e) {
+ mesg=e.getMessage();
+ e.printStackTrace();
+ }finally {
+ XMLResultDataObjectDetailDO x=new XMLResultDataObjectDetailDO();
+ x.setId(rowData.getOid());
+ x.setCode(rowData.getCode());
+ x.setMsg(mesg);
+ x.setErrorid("1");
+ xDOs.add(x);
+ }
+ });
+ resultDataObjectDetailDOs.addAll(xDOs);
+ boolean finalSuccess1 = success.get();
+ String finalMessage1 = message;
+ resultDataObjectDetailDOs.stream().forEach(resultDataObjectDetailDO->{
+ ResultMdMapping resultMdMapping=new ResultMdMapping();
+ resultMdMapping.setBusiDataId(resultDataObjectDetailDO.getId());
+ resultMdMapping.setSuccess(finalSuccess1);
+ resultMdMapping.setEntityCode(" ");
+ resultMdMapping.setMdmCode(resultDataObjectDetailDO.getCode());
+ resultMdMapping.setMessage(finalMessage1);
+ resultMdMapping.setSubMdMappings(null);
+ resultMdMappingList.add(resultMdMapping);
+ });
+ log.info("end锛氱敵璇疯幏鍙栧畬姣�");
+ }
+ }catch (Throwable e){
+ success.set(false);
+ message="浜哄憳鏁版嵁鎺ュ彈澶辫触:"+e.getMessage();
+ //缁勭粐杩斿洖缁撴灉
+ boolean finalSuccess = success.get();
+ String finalMessage = message;
+ masterDataList.stream().forEach(masterData -> {
+ ResultMdMapping resultMdMapping=new ResultMdMapping();
+ resultMdMapping.setBusiDataId(masterData.getId());
+ resultMdMapping.setSuccess(finalSuccess);
+ resultMdMapping.setEntityCode(" ");
+ resultMdMapping.setMdmCode(masterData.getLm_code());
+ resultMdMapping.setMessage(finalMessage);
+ resultMdMapping.setSubMdMappings(null);
+ });
+ }finally {
+ resultOrgData.setMessage(message);
+ resultOrgData.setSuccess(success.get());
+ resultOrgData.setMdMappings(resultMdMappingList);
+ Object object = JSONObject.toJSON(resultOrgData);
+ }
+ String resultStr = JSONObject.toJSONString(resultOrgData);
+ String data = JSONObject.toJSONString(personData);
+ try {
+ //璁板綍鏃ュ織
+ this.saveLogs(systemCode, systemCode, data, resultStr, success.get(), msg, "syncDataForPerson");
+ }catch (Throwable e){
+ e.printStackTrace();
+ }
+ }
+
+ return resultOrgData;
+ }
+ /****
+ * 閮ㄩ棬鏁版嵁鍚屾
+ * @param orgData
+ * @return
+ * @throws Throwable
+ */
+ @Override
+ public ResultOrgData syncDataForOrg(OrgData orgData) {
+ boolean isUsedFlag= personAndDeptConfig.isUsedFlag();
+ ResultOrgData resultOrgData=new ResultOrgData();
+ boolean isPersonApplyGroupCode= personAndDeptConfig.isPersonApplyGroupCode();
+ List<ResultMdMapping> resultMdMappingList=new ArrayList<>();
+ AtomicBoolean success= new AtomicBoolean(true);
+ String message="";
+ String systemCode="";
+ if(isUsedFlag){
+ List<OrgMasterData> orgMasterDataList=new ArrayList<>();
+ List<String> fields= VciBaseUtil.str2List(personAndDeptConfig.getPersonFields());
+ try {
+ if(orgData==null){
+ throw new Throwable("浼犲叆鍙傛暟涓簄ull");
+ }
+ systemCode=orgData.getSystemCode();
+ orgMasterDataList = orgData.getMasterData();
+ String personLibrary = personAndDeptConfig.getPersonLibrary();
+ if (StringUtils.isBlank(personLibrary)) {
+ success.set(false);
+ log.info("闆嗘垚閰嶇疆缂哄皯浜哄憳搴撹妭鐐逛俊鎭�,personLibrary->" + personLibrary);
+ throw new Throwable("闆嗘垚閰嶇疆缂哄皯浜哄憳搴撹妭鐐逛俊鎭�,personLibrary->" + personLibrary);
+ }
+ String personClassCode = personAndDeptConfig.getPersonClassCode();
+ ClassfyVO classfyVO = new ClassfyVO();
+ classfyVO.setLibrary(personLibrary);
+ classfyVO.setClassCode(personClassCode);
+ CodeClassifyVO codeClassifyVO=this.getClassfy(classfyVO,personLibrary);
+ log.info("end锛氬垎绫绘煡璇㈠畬姣�");
+ //鑾峰彇鍒嗙被妯℃澘淇℃伅
+ if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
+ success.set(false);
+ throw new Throwable ("鏍规嵁閰嶇疆鍒嗙被鐨勫垎绫荤紪鍙凤紝鏈幏鍙栧埌鍒嗙被淇℃伅");
+ }
+ CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
+ if(templateVO==null||StringUtils.isBlank(templateVO.getOid())){
+ success.set(false);
+ throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙朚DM绯荤粺涓搴旀ā鏉�");
+ }
+
+ List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormDisplayFlag())
+ ).collect(Collectors.toList());
+ List<Map> dataList=new ArrayList<>();
+ List<String> codeList=new ArrayList<>();
+ List<ApplyDataVO> applyDataVOList=new ArrayList<>();
+ List<ApplyDataVO> deleteDataVOList=new ArrayList<>();
+ orgMasterDataList.stream().forEach(orgMasterData -> {
+ ApplyDataVO object=new ApplyDataVO();
+ object.setCode(orgMasterData.getMdm_code());//缂栫爜
+ object.setCreator(orgMasterData.getCreator());//鍒涘缓鑰�
+ object.setEditor(orgMasterData.getModifier());//淇敼鑰�
+ object.setId(orgMasterData.getPk_mdm());//涓婚敭
+ object.setStatus(CodeDefaultLC.RELEASED.getValue());//鐘舵�佸垯闇�瑕佸垽鏂�
+ Map<String,String> dataMap= VciBaseUtil.objectToMapString(orgMasterData);
+ List<ProppertyVO> proppertyVOList=new ArrayList<>();
+ /***
+ * 鏍规嵁閰嶇疆鏂囦欢鑾峰彇鏋氫妇鍊�
+ */
+ fields.stream().forEach(field->{
+ if(dataMap.containsKey(field)){
+ String enumFiled= dataMap.get(field);
+ EnumerableData enumerableData=JSONObject.toJavaObject(JSONObject.parseObject(enumFiled),EnumerableData.class);
+ String enumCode=enumerableData.getCode();
+ //String enumCodeValue=enumerableData.getName();
+ ProppertyVO proppertyVO=new ProppertyVO();
+ proppertyVO.setKey(field);
+ proppertyVO.setValue(enumCode);
+ proppertyVOList.add(proppertyVO);
+ dataMap.remove(field);
+ }
+ });
+ dataMap.forEach((key,vaule)->{
+ ProppertyVO proppertyVO=new ProppertyVO();
+ proppertyVO.setKey(key);
+ proppertyVO.setValue(vaule);
+ proppertyVOList.add(proppertyVO);
+ });
+
+ object.setProp(proppertyVOList);
+ if(orgMasterData.getDr()==1){
+ object.setOperate("delete");//鎿嶄綔绫诲瀷
+ deleteDataVOList.add(object);
+ }else{
+
+ object.setOperate("create");
+ applyDataVOList.add(object);
+ }
+ codeList.add(orgMasterData.getMdm_code());
+ });
+
+ R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(templateVO.getBtmTypeId());
+ if(!r.isSuccess()) {
+ throw new Throwable(r.getMsg());
+ }
+ BtmTypeVO btmTypeVO = r.getData();
+ if (btmTypeVO == null) {
+ throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷瀵硅薄锛�");
+ }
+ String tableName = btmTypeVO.getTableName();
+ if (com.alibaba.nacos.common.utils.StringUtils.isBlank(tableName)) {
+ throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷鐩稿叧鑱旂殑琛�");
+ }
+ StringBuffer sb=new StringBuffer();
+ sb.append(" select * from ");
+ sb.append(tableName);
+ sb.append(" where 1=1 ");
+ sb.append(" and lastr=1 and lastv=1" );
+ sb.append(" and id in (");
+ sb.append(VciBaseUtil.toInSql(codeList.toArray(new String[0])));
+ sb.append(")");
+ List<Map<String,String>> dataMapList=commonsMapper.queryByOnlySqlForMap(sb.toString());
+ List<ClientBusinessObject> cboList= ChangeMapTOClientBusinessObjects(dataMapList);
+ ApplyDatasVO applyDatasVO=new ApplyDatasVO();
+ ApplyDatasVO editDatasVO=new ApplyDatasVO();
+ if(!CollectionUtils.isEmpty(cboList)){
+ Map<String,ClientBusinessObject> oldpplyDataVOMap= cboList.stream().filter(data -> data != null && StringUtils.isNotBlank(data.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
+ //鏁版嵁搴撲笉瀛樺湪鐨�
+ List<ApplyDataVO> applyApplyDataVOList = applyDataVOList.stream().filter(cbo -> {
+ String code =cbo.getCode();
+ return !oldpplyDataVOMap.containsKey(code);
+ }).collect(Collectors.toList());
+ applyDatasVO.setObject(applyApplyDataVOList);
+ //鏁版嵁搴撳瓨鍦ㄧ殑
+ List<ApplyDataVO> editApplyDataVOList = applyDataVOList.stream().filter(cbo -> {
+ String code =cbo.getCode();
+ if(oldpplyDataVOMap.containsKey(code)){
+ cbo.setOperate("update");
+ }
+ return oldpplyDataVOMap.containsKey(code);
+ }).collect(Collectors.toList());
+ editApplyDataVOList.addAll(deleteDataVOList);
+ editDatasVO.setObject(editApplyDataVOList);
+ }else{
+ applyDatasVO.setObject(applyDataVOList);
+ }
+
+ LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs=new LinkedList<>();
+ if(editDatasVO.getObject()!=null&&editDatasVO.getObject().size()>0){
+ DataObjectVO dataObjectVO = new DataObjectVO();
+ this.getConfigDatas(systemCode, personLibrary, editDatasVO, attrVOS, dataObjectVO);
+ log.info("start锛氫慨鏀规暟鎹墽琛屽畬姣�");
+ boolean personApplyGroupCode =personAndDeptConfig.isPersonApplyGroupCode();
+ mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,personApplyGroupCode);
+ log.info("end锛氫慨鏀规暟鎹墽琛屽畬姣�");
+ }
+ if(applyDatasVO.getObject()!=null&&applyDatasVO.getObject().size()>0) {
+ DataObjectVO dataObjectVO = new DataObjectVO();
+ this.getConfigDatas(systemCode, personLibrary, applyDatasVO, attrVOS, dataObjectVO);
+
+ CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(codeClassifyVO.getOid());
+ CodeRuleVO ruleVO = engineService.getCodeRuleByClassifyFullInfo(classifyFullInfo);
+ if(ruleVO==null||"".equals(ruleVO.getOid())){
+ throw new Throwable("缂栫爜瑙勫垯");
+ }
+ List<XMLResultDataObjectDetailDO> xDOs=new CopyOnWriteArrayList<>();
+ dataObjectVO.getRowData().parallelStream().forEach(rowData->{
+ String mesg="";
+ try {
+ CodeOrderDTO orderDTO = new CodeOrderDTO();
+ List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>();
+ orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//鍒嗙被涓婚敭
+ orderDTO.setTemplateOid(templateVO.getOid());
+ if(!CollectionUtils.isEmpty(ruleVO.getSecVOList())) {
+ ruleVO.getSecVOList().stream().forEach(codeBasicSecVO -> {
+ if (codeBasicSecVO.getSecType().equals("codevariablesec")) {//瑙勫垯涔嬪畾涔変负鍙彉鐮佹瀛樺偍涓绘暟鎹紶閫掕繃鏉ョ殑鏁版嵁
+ CodeOrderSecDTO CodeOrderSecDTO = new CodeOrderSecDTO();
+ CodeOrderSecDTO.setSecOid(codeBasicSecVO.getOid());
+ CodeOrderSecDTO.setSecValue(rowData.getCode());
+ codeOrderSecDTOList.add(CodeOrderSecDTO);
+
+ }
+ });
+ }
+ orderDTO.setCodeRuleOid(ruleVO.getOid());
+ orderDTO.setSecDTOList(codeOrderSecDTOList);//瀛樺偍缂栫爜
+ orderDTO.setData(rowData.getFiledValue());
+ String code=engineService.addSaveCode(orderDTO);
+ if(StringUtils.isNotBlank(code)) {
+ StringBuffer sqlsb = new StringBuffer();
+ sqlsb.append(" select * from ");
+ sqlsb.append(tableName);
+ sqlsb.append(" where 1=1 ");
+ sqlsb.append(" and lastr=1 and lastv=1");
+ sqlsb.append(" and id in (");
+ sqlsb.append(VciBaseUtil.toInSql(code));
+ sqlsb.append(")");
+ List<Map<String, String>> newDataMapList = commonsMapper.queryByOnlySqlForMap(sqlsb.toString());
+ if (!CollectionUtils.isEmpty(newDataMapList)) {
+ String oid = StringUtils.isBlank(newDataMapList.get(0).get("OID")) ? "" : newDataMapList.get(0).get("OID");
+ List<String> oidList = new ArrayList<>();
+ oidList.add(oid);
+ //濡傛灉鏈夌敵璇峰氨鍘昏皟鐢ㄧ敵璇烽泦鍥㈢爜
+ if (isPersonApplyGroupCode) {
+ mdmIOService.sendApplyGroupcode(oidList, templateVO.getBtmTypeId(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue());
+ success.set(true);
+ mesg = "鏁版嵁淇濆瓨鎴愬姛锛岀瓑寰呯敵璇烽泦鍥㈢爜";
+ }
+ }
+ }
+ } catch (Exception e) {
+ mesg=e.getMessage();
+ e.getMessage();
+ e.printStackTrace();
+ }finally {
+ XMLResultDataObjectDetailDO x=new XMLResultDataObjectDetailDO();
+ x.setId(rowData.getOid());
+ x.setCode(rowData.getCode());
+ x.setMsg(mesg);
+ x.setErrorid("1");
+ xDOs.add(x);
+ }
+ });
+ resultDataObjectDetailDOs.addAll(xDOs);
+ boolean finalSuccess1 = success.get();
+ String finalMessage1 = message;
+ resultDataObjectDetailDOs.stream().forEach(resultDataObjectDetailDO->{
+ ResultMdMapping resultMdMapping=new ResultMdMapping();
+ resultMdMapping.setBusiDataId(resultDataObjectDetailDO.getId());
+ resultMdMapping.setSuccess(finalSuccess1);
+ resultMdMapping.setEntityCode(" ");
+ resultMdMapping.setMdmCode(resultDataObjectDetailDO.getCode());
+ resultMdMapping.setMessage(finalMessage1);
+ resultMdMapping.setSubMdMappings(null);
+ resultMdMappingList.add(resultMdMapping);
+ });
+ log.info("end锛氱敵璇疯幏鍙栧畬姣�");
+ }
+ }catch (Throwable e){
+ success.set(false);
+ message="浜哄憳鏁版嵁鎺ュ彈澶辫触:"+e.getMessage();
+ //缁勭粐杩斿洖缁撴灉
+ boolean finalSuccess = success.get();
+ String finalMessage = message;
+ orgMasterDataList.stream().forEach(masterData -> {
+ ResultMdMapping resultMdMapping=new ResultMdMapping();
+ resultMdMapping.setBusiDataId(masterData.getPk_mdm());
+ resultMdMapping.setSuccess(finalSuccess);
+ resultMdMapping.setEntityCode(" ");
+ resultMdMapping.setMdmCode(masterData.getMdm_code());
+ resultMdMapping.setMessage(finalMessage);
+ resultMdMapping.setSubMdMappings(null);
+ });
+ }finally {
+ resultOrgData.setMessage(message);
+ resultOrgData.setSuccess(success.get());
+ resultOrgData.setMdMappings(resultMdMappingList);
+ Object object = JSONObject.toJSON(resultOrgData);
+ }
+ String resultStr = JSONObject.toJSONString(resultOrgData);
+ String data = JSONObject.toJSONString(orgData);
+ try {
+ //璁板綍鏃ュ織
+ this.saveLogs(systemCode, systemCode, data, resultStr, success.get(), msg, "syncDataForOrg");
+ }catch (Throwable e){
+ e.printStackTrace();
+ }
+ }
+ return resultOrgData;
+ }
/***
* 缁熶竴鏇存柊鎺ュ彛锛堟洿鏀圭姸鎬侊紝鏇存敼灞炴�т俊鎭級鎺ュ彛
* @param data
@@ -329,16 +937,29 @@
String finalSystemId = systemId;
classVOList.stream().forEach(classVO->{
log.info("鍙傛暟锛氬垎绫籆Ode:" + classVO.getClassCode());
+ boolean isCodeOrGroupCode=false;
LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>();
+ String libray ="";
//鑾峰彇鍒嗙被淇℃伅
try {
- String libray = classVO.getLibrary();
- CodeClassifyVO codeClassifyVO = getClassfy(classVO);
+ libray = classVO.getLibrary();
+ CodeClassifyVO codeClassifyVO = getClassfy(classVO,libray);
if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
objerrorCode="100";
throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙栧埌鍒嗙被淇℃伅");
}
log.info("end锛氬垎绫绘煡璇㈠畬姣�");
+ String operation="";
+ if(CODE_CHECKCONFIG) {
+ //鏍￠獙鏄惁閰嶇疆
+ DockingSystemConfig dockingSystemConfig= checkIspass(finalSystemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_EDITCODE.getValue(),codeClassifyVO.getOid());
+ if(dockingSystemConfig==null){
+ objerrorCode ="101";
+ throw new Throwable("绯荤粺鏍囪瘑涓恒��"+ finalSystemId +"銆戯紝闆嗘垚鍒嗙被涓恒��"+codeClassifyVO.getName()+"銆戜互涓婂垎绫伙紝"+sysIntegrationPushTypeEnum.ACCPET_EDITCODE.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠＄悊鍛橈紒");
+ }
+ isCodeOrGroupCode="true".equals(dockingSystemConfig.getIsGroupCodeFlag())?true:false;
+ }
+
//鑾峰彇鍒嗙被妯℃澘淇℃伅
CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
if(templateVO==null||StringUtils.isBlank(templateVO.getOid())){
@@ -354,15 +975,29 @@
this.getConfigDatas(finalSystemId, libray, applyDatasVO, attrVOS, dataObjectVO);
log.info("end锛氭暟鎹瀯寤哄畬姣�");
log.info("start锛氫慨鏀规暟鎹墽琛屽畬姣�");
- mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs);
+ mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,isCodeOrGroupCode);
log.info("end锛氫慨鏀规暟鎹墽琛屽畬姣�");
} catch (Throwable e) {
- XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
- xmlResultDataObjectDetailDO.setCode("");
- xmlResultDataObjectDetailDO.setId("");
- xmlResultDataObjectDetailDO.setErrorid(objerrorCode);
- xmlResultDataObjectDetailDO.setMsg("缂栫爜鏇存敼/鐘舵�佹洿鏀�/鍒犻櫎:"+e.getMessage());
- resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
+ List<ApplyDataVO> applyDataVOList= classVO.getObjects().getObject();
+ objerrorCode="1";
+ if(!CollectionUtils.isEmpty(applyDataVOList)) {
+ applyDataVOList.stream().forEach(applyDataVO -> {
+ XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO = new XMLResultDataObjectDetailDO();
+ xmlResultDataObjectDetailDO.setCode("");
+ xmlResultDataObjectDetailDO.setId(applyDataVO.getId());
+ xmlResultDataObjectDetailDO.setErrorid(objerrorCode);
+ xmlResultDataObjectDetailDO.setMsg("缂栫爜鏇存敼/鐘舵�佹洿鏀�/鍒犻櫎:" + e.getMessage());
+ resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
+ });
+ }else {
+
+ XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO = new XMLResultDataObjectDetailDO();
+ xmlResultDataObjectDetailDO.setCode("");
+ xmlResultDataObjectDetailDO.setId("");
+ xmlResultDataObjectDetailDO.setErrorid(objerrorCode);
+ xmlResultDataObjectDetailDO.setMsg("缂栫爜鏇存敼/鐘舵�佹洿鏀�/鍒犻櫎:" + e.getMessage());
+ resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
+ }
e.printStackTrace();
}finally {
XMLResultClassfyVO resultClassfyVO = new XMLResultClassfyVO();
@@ -372,7 +1007,6 @@
resultClassfyVO.setObjects(resultDataObjectDetailDOs);
resultClassfyVOList.add(resultClassfyVO);
}
-
});
}catch (Throwable e){
e.printStackTrace();;
@@ -437,7 +1071,7 @@
log.info("鏌ヨ鍒嗙被鐨勬暟鎹被鍨�:->"+dataType);
ResultClassifyVO resultClassifyVO =new ResultClassifyVO();
List<ClassifyVO> classifyVOList=new ArrayList<>();
- ResultData resultData=new ResultData();
+ com.vci.ubcs.code.vo.webserviceModel.classify.ResultData resultData=new com.vci.ubcs.code.vo.webserviceModel.classify.ResultData();
try {
if (StringUtils.isBlank(data)) {
errorid = "101";
@@ -468,6 +1102,13 @@
String libId= libraryVO.getId();
List<String> classifyIdList= libraryVO.getClassifyid();
List<CodeClassifyVO> codeClassifyVOS =new ArrayList<>();
+ //鏍￠獙鏄惁閰嶇疆
+ boolean checkPass = checkIspass(systemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_QUERYCLAFILY.getValue());
+ if (!checkPass) {
+ errorid = "101";
+ throw new Throwable("绯荤粺鏍囪瘑涓恒��" + systemId + "銆�," + sysIntegrationPushTypeEnum.ACCPET_QUERYCLAFILY.getText() + "鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠＄悊鍛橈紒");
+ }
+
//杩欐槸璐﹀彿淇℃伅
//杩欐槸璐﹀彿淇℃伅
if(userVo!=null) {
@@ -480,17 +1121,48 @@
errorid = "101";
throw new Throwable("鎺ュ彛鍙傛暟锛氳处鍙蜂俊鎭幏鍙栧け璐�");
}
- if(!CollectionUtils.isEmpty(classifyIdList)){
- //鍏堢畝绉版槸鍚︽湁鍏宠仈妯℃澘锛屾湁妯℃澘瑕佸厛鍒犻櫎
- List<CodeClassify> libIdDos = classifyService.selectByWrapper(Wrappers.<CodeClassify>query().lambda().in(CodeClassify::getId, classifyIdList));
- codeClassifyVOS=classifyService.codeClassifyDO2VOs(libIdDos);
- }else {
- List<CodeClassify> libIdDos = classifyService.selectByWrapper(Wrappers.<CodeClassify>query().lambda().eq(CodeClassify::getId, libId));
- String oid= libIdDos.get(0).getOid();
- TreeQueryObject treeQueryObject=new TreeQueryObject();
- treeQueryObject.setParentOid(oid);
- treeQueryObject.setQueryAllLevel(true);
- codeClassifyVOS=classifyService.selectCodeClassifyDOByTree(treeQueryObject);
+ List<CodeClassify> libIdDos =classifyService.selectByWrapper(Wrappers.<CodeClassify>query().lambda().in(CodeClassify::getId, libId));
+ if(CollectionUtils.isEmpty(libIdDos)) {
+ CodeClassify libCodeClassify =libIdDos.get(0);
+ String oid=libCodeClassify.getOid();
+ if (!CollectionUtils.isEmpty(classifyIdList)) {
+ //鍏堢畝绉版槸鍚︽湁鍏宠仈妯℃澘锛屾湁妯℃澘瑕佸厛鍒犻櫎
+ List<CodeClassify> childCodeClassifyList = classifyService.selectByWrapper(Wrappers.<CodeClassify>query().lambda().in(CodeClassify::getId, classifyIdList));
+ List<CodeClassify>newchildCodeClassifyList=new ArrayList<>();
+ if(!CollectionUtils.isEmpty(childCodeClassifyList)) {
+ Map<String,String> errorMap=new HashMap<>();
+ childCodeClassifyList.stream().forEach(codeClassify -> {
+ CodeClassifyVO toClassifyVO= classifyService.getTopClassifyVO(codeClassify.getOid());
+ if(toClassifyVO.getOid().equals(libCodeClassify.getOid())){
+ newchildCodeClassifyList.add(codeClassify);
+ }
+ });
+ Map<String/**鍒嗙被缂栧彿**/, CodeClassify/**鍒嗙被瀵硅薄**/> classifyfCodeMap = newchildCodeClassifyList.stream().collect(Collectors.toMap(s -> s.getId(), t -> t));
+ classifyIdList.stream().forEach(classifyfCode -> {
+ if(!classifyfCodeMap.containsKey(classifyfCode)) {
+ errorMap.put("error", errorMap.getOrDefault("error", "") + ";鏍规嵁classCode锛氥��" + classifyfCode + "銆戝湪library:銆�" + libCodeClassify.getId() + "銆戜笅鏈煡璇㈠埌");
+ }
+ });
+ if(errorMap.size()>0){
+ errorid = "101";
+ msg = errorMap.getOrDefault("error","");
+ throw new Throwable(msg);
+ }
+ codeClassifyVOS = classifyService.codeClassifyDO2VOs(newchildCodeClassifyList);
+ }else{
+ errorid = "101";
+ msg = "鎺ュ彛鍙傛暟锛歝lassCode 鏈煡璇㈠埌瀵瑰簲鐨勫垎绫讳俊鎭�";
+ throw new Throwable(msg);
+ }
+ } else {
+ TreeQueryObject treeQueryObject = new TreeQueryObject();
+ treeQueryObject.setParentOid(oid);
+ treeQueryObject.setQueryAllLevel(true);
+ codeClassifyVOS = classifyService.selectCodeClassifyDOByTree(treeQueryObject);
+ }
+ }else{
+ errorid = "101";
+ throw new Throwable("鎺ュ彛鍙傛暟锛氳处鍙蜂俊鎭幏鍙栧け璐�");
}
LibraryVO libraryVo=new LibraryVO();
libraryVo.setId(libId);
@@ -505,7 +1177,7 @@
classifyVO.setClassCode(codeClassifyDO.getId());
classifyVO.setDescription(codeClassifyDO.getDescription());
classifyVO.setName(codeClassifyDO.getName());
- classifyVO.setPid(codeClassifyDO.getParentcodeclassifyoid());
+ classifyVO.setPid(codeClassifyDO.getParentCodeClassifyOid());
classifyVO.setFullPathName(codeClassifyDO.getPath());
classifyVOList.add(classifyVO);
});
@@ -599,8 +1271,15 @@
throw new Throwable(msg);
}
+ /* //鏍￠獙鏄惁閰嶇疆
+ boolean checkPass = checkIspass(systemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_QUERYDATA.getValue());
+ if (!checkPass) {
+ errorid = "101";
+ throw new Throwable("绯荤粺鏍囪瘑涓恒��" + systemId + "銆�," + sysIntegrationPushTypeEnum.ACCPET_QUERYDATA.getText() + "鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠＄悊鍛橈紒");
+ }
+ */
//鍏堢畝绉版槸鍚︽湁鍏宠仈妯℃澘锛屾湁妯℃澘瑕佸厛鍒犻櫎
-
+ boolean isCodeOrGroupCode=false;
List<CodeClassify> libIdDos =classifyService.selectByWrapper(Wrappers.<CodeClassify>query().lambda().eq(CodeClassify::getId,library));
if(!CollectionUtils.isEmpty(libIdDos)){
CodeClassify libCodeClassify=libIdDos.get(0);
@@ -618,6 +1297,17 @@
msg = "鎺ュ彛鍙傛暟锛歝lassCode 鏈煡璇㈠埌瀵瑰簲鐨勫垎绫讳俊鎭�";
throw new Throwable(msg);
}
+
+ String operation="";
+ if(CODE_CHECKCONFIG) {
+ //鏍￠獙鏄惁閰嶇疆
+ DockingSystemConfig dockingSystemConfig= checkIspass(systemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_QUERYDATA.getValue(),currentCodeClassify[0].getOid());
+ if(dockingSystemConfig==null){
+ errorid ="101";
+ throw new Throwable("绯荤粺鏍囪瘑涓恒��"+ systemId +"銆戯紝闆嗘垚鍒嗙被涓恒��"+currentCodeClassify[0].getName()+"銆戜互涓婂垎绫伙紝"+sysIntegrationPushTypeEnum.ACCPET_QUERYDATA.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠＄悊鍛橈紒");
+ }
+ isCodeOrGroupCode="true".equals(dockingSystemConfig.getIsGroupCodeFlag())?true:false;
+ }
List<CodeClassifyVO> dataCodeClassifyVOList =new ArrayList<>();
String oid= currentCodeClassify[0].getOid();
TreeQueryObject treeQueryObject=new TreeQueryObject();
@@ -628,52 +1318,55 @@
Map<String, CodeClassifyVO> oidCodeclassifyDOMap = dataCodeClassifyVOList.stream().filter(systeDataObject -> systeDataObject != null && StringUtils.isNotBlank(systeDataObject.getOid())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
List<PropertyVO> propertyVOS=condtionVO.getPro();
- /*Map<String,String> condtionMap=new HashMap<>();
- propertyVOS.stream().forEach(propertyVO -> {
- condtionMap.put(propertyVO.getFiledName(),propertyVO.getFiledValue());
- });
- condtionMap.put("codeclsfid", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(oidCodeclassifyDOMap.keySet().toArray(new String[0])) + ")");
List<String>statusList=new ArrayList<>();
statusList.add(CodeDefaultLC.RELEASED.getValue());
statusList.add(CodeDefaultLC.DISABLE.getValue());
statusList.add(CodeDefaultLC.TASK_BACK.getValue());
- condtionMap.put("Lcstatus", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(statusList.toArray(new String[]{})) + ")" );
- condtionMap.put("islastr", "1");
- condtionMap.put("islastv", "1");*/
- List<String>statusList=new ArrayList<>();
- statusList.add(CodeDefaultLC.RELEASED.getValue());
- statusList.add(CodeDefaultLC.DISABLE.getValue());
- statusList.add(CodeDefaultLC.TASK_BACK.getValue());
- R<BtmTypeVO> r= btmTypeClient.getDetail(libCodeClassify.getBtmTypeId());
- BtmTypeVO btmTypeVO =r.getData();
- String tableName=btmTypeVO.getTableName();
-
+ String tableName="";
+ R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(libCodeClassify.getBtmTypeId());
+ if(!r.isSuccess()) {
+ throw new Throwable(r.getMsg());
+ }
+ BtmTypeVO btmTypeVO = r.getData();
+ if (btmTypeVO == null) {
+ throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷瀵硅薄锛�");
+ }
+ tableName = btmTypeVO.getTableName();
+ if (com.alibaba.nacos.common.utils.StringUtils.isBlank(tableName)) {
+ throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷鐩稿叧鑱旂殑琛�");
+ }
StringBuffer sb=new StringBuffer();
sb.append(" select * from ");
sb.append(tableName);
sb.append(" where 1=1");
- propertyVOS.stream().forEach(propertyVO -> {
- sb.append( " and "+propertyVO.getFiledName()+"='"+propertyVO.getFiledValue()+"'");
- });
- sb.append(" and islastr=1 and islastv=1" );
+ if(isCodeOrGroupCode){
+ sb.append(" and groupcode is not null ");
+ }
+
+ if(!CollectionUtils.isEmpty(propertyVOS)) {
+ propertyVOS.stream().forEach(propertyVO -> {
+ sb.append(" and " + propertyVO.getFiledName() + "='" + propertyVO.getFiledValue() + "'");
+ });
+ }
+ sb.append(" and lastr=1 and lastv=1" );
sb.append(" and codeclsfid in (" + VciBaseUtil.toInSql(oidCodeclassifyDOMap.keySet().toArray(new String[0])) +")");
sb.append(" and Lcstatus in (" + VciBaseUtil.toInSql(statusList.toArray(new String[]{})) +")");
List<Map<String,String>> newDataList= commonsMapper.queryByOnlySqlForMap(sb.toString());
- List<ClientBusinessObject>clientBusinessObjects=new ArrayList<>();
- newDataList.stream().forEach(stringStringMap -> {
- ClientBusinessObject clientBusinessObject=new ClientBusinessObject();
- DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(stringStringMap,clientBusinessObject);
- clientBusinessObjects.add(clientBusinessObject);
- });
-
+ List<ClientBusinessObject> clientBusinessObjects= ChangeMapTOClientBusinessObjects(newDataList);
List<com.vci.ubcs.code.vo.webserviceModel.data.DataObjectVO> dataObjectVOS=new ArrayList<>();
if(!CollectionUtils.isEmpty(clientBusinessObjects)){
CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(currentCodeClassify[0].getOid());
- Map<String, CodeClassifyTemplateAttrVO> filedAttributeMap = templateVO.getAttributes().stream().filter(attribute -> attribute != null && StringUtils.isNotBlank(attribute.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId(), t -> t));
-
+ Map<String, CodeClassifyTemplateAttrVO> filedAttributeMap = templateVO.getAttributes().stream().filter(attribute -> attribute != null && StringUtils.isNotBlank(attribute.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
+ boolean finalIsCodeOrGroupCode = isCodeOrGroupCode;
clientBusinessObjects.stream().forEach(cbo -> {
com.vci.ubcs.code.vo.webserviceModel.data.DataObjectVO dataObjectVO=new com.vci.ubcs.code.vo.webserviceModel.data.DataObjectVO();
- dataObjectVO.setCode(cbo.getId());
+ String code="";
+ if(finalIsCodeOrGroupCode){
+ code= cbo.getAttributeValue("groupcode");
+ }else {
+ code=cbo.getId();
+ }
+ dataObjectVO.setCode(code);
dataObjectVO.setStatus(cbo.getLcStatus());
String codeclsfid=cbo.getAttributeValue("codeclsfid");
if(oidCodeclassifyDOMap.containsKey(codeclsfid)){
@@ -684,9 +1377,9 @@
String [] newQueryFileds=queryFileds.split(",");
List<PropertyVO> propertyVOList=new ArrayList<>();
for(String filed:newQueryFileds){
- String value=cbo.getAttributeValue(filed);
- if(filedAttributeMap.containsKey(filed)){
- CodeClassifyTemplateAttrVO attrVO= filedAttributeMap.get(filed);
+ if(filedAttributeMap.containsKey(filed.toLowerCase(Locale.ROOT))){
+ String value=cbo.getAttributeValue(filed);
+ CodeClassifyTemplateAttrVO attrVO= filedAttributeMap.get(filed.toLowerCase(Locale.ROOT));
PropertyVO propertyVO=new PropertyVO();
propertyVO.setFiledName(filed);
propertyVO.setFiledValue(value);
@@ -699,7 +1392,14 @@
});
resultDataVO.setObject(dataObjectVOS);
}
+ }else{
+ errorid = "101";
+ msg = "鎺ュ彛鍙傛暟锛歝lassCode 鏈煡璇㈠埌瀵瑰簲鐨勫垎绫讳俊鎭�";
+ throw new Throwable(msg);
}
+ }else{
+ errorid = "101";
+ msg = "鎺ュ彛鍙傛暟锛歭ibrary 鏈煡璇㈠埌瀵瑰簲鐨勫簱鑺傜偣淇℃伅";
}
errorid = "0";
msg = "鏁版嵁鏌ヨ鎴愬姛";
@@ -723,7 +1423,7 @@
resultStr = object.toString();
}
try { //璁板綍鏃ュ織
- this.saveLogs(systemId, systemId, data, resultStr, issucess, msg, "queryClassify");
+ this.saveLogs(systemId, systemId, data, resultStr, issucess, msg, "queryData");
}catch (Throwable e){
e.printStackTrace();
}
@@ -743,8 +1443,9 @@
String systemId="";
log.info("鏌ヨ鍒嗙被鐨勬暟鎹弬鏁�:->"+data);
log.info("鏌ヨ鍒嗙被鐨勬暟鎹被鍨�:->"+dataType);
- ResultClassifyVO resultClassifyVO =new ResultClassifyVO();
- List<ClassifyVO> classifyVOList=new ArrayList<>();
+ ResultClassifyRuleVO resultClassifyRuleVO =new ResultClassifyRuleVO();
+ List<com.vci.ubcs.code.vo.webserviceModel.coderule.ResultClassifyVO> classifyVOList=new ArrayList<>();
+ ResultClassifyRuleData resultClassifyRuleData=new ResultClassifyRuleData();
try {
if (StringUtils.isBlank(data)) {
errorid = "101";
@@ -775,6 +1476,14 @@
String libId= libraryVO.getId();
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) {
@@ -799,29 +1508,374 @@
treeQueryObject.setQueryAllLevel(true);
codeClassifyVOS=classifyService.selectCodeClassifyDOByTree(treeQueryObject);
}
+ ResultLibraryVO resultLibraryVO=new ResultLibraryVO();
+ resultLibraryVO.setId(libId);
+ resultLibraryVO.setName("");
+ if(!CollectionUtils.isEmpty(codeClassifyVOS)){
+ errorid = "0";
+ msg="鎴愬姛!";
+ codeClassifyVOS.stream().forEach(codeClassifyDO -> {
+ //鍚庡幓鍖呭惈鐮佹鐨勭紪鐮佽鍒�
+ CodeRuleVO codeRuleVO= this.engineService.getCodeRuleByClassifyOid(codeClassifyDO.getOid());
+ ResultCodeRuleVO resultCodeRuleVO=new ResultCodeRuleVO();
+ if(codeRuleVO!=null){
+ CodeRuleVO resultClassifyRuleVO1=new CodeRuleVO();
+ List<CodeBasicSecVO> codeBasicSecVOS= codeRuleVO.getSecVOList();
+ List<CodeSectionVO> codeSectionVOList=new CopyOnWriteArrayList<>();
+ Map<String,List<String>> secIdTOListValueOidMap=new HashMap<>();
+ if(!CollectionUtils.isEmpty(codeBasicSecVOS)){
+ codeBasicSecVOS.stream().forEach(codeBasicSecVO -> {
+ List<CodeSectionValueVO> codeSectionValueVOList=new ArrayList<>();
+ String secType= codeBasicSecVO.getSecType();
+ if(secType.equals("codevariablesec")){//鍙彉鐮佹
+ //绌虹潃锛屽墠绔紶
+ }else if(secType.equals("codefixedsec")){//鍥哄畾鐮佹
+ List<CodeFixedValueVO> fixedValueVOList=codeBasicSecVO.getFixedValueVOList();
+ fixedValueVOList.stream().forEach(codeFixedValueVO -> {
+ String id=StringUtils.isBlank(codeFixedValueVO.getOid())?"":codeFixedValueVO.getOid();
+ String value=StringUtils.isBlank(codeFixedValueVO.getId())?"":codeFixedValueVO.getId();
+ String num=StringUtils.isBlank(codeFixedValueVO.getOrderNum()+"")?"":codeFixedValueVO.getOrderNum()+"";
+ String name=StringUtils.isBlank(codeFixedValueVO.getName())?"":codeFixedValueVO.getName();
+ String description=StringUtils.isBlank(codeFixedValueVO.getDescription())?"":codeFixedValueVO.getDescription();
+ CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(id,num,value,name,"",description);
+ codeSectionValueVOList.add(sectionValueVO);
+ });
+ }else if(secType.equals("codeclassifysec")){//鍒嗙被鐮佹
+ String secOid=codeBasicSecVO.getOid();
+ String parentClassifySecOid= codeBasicSecVO.getParentClassifySecOid();
+ String parentClassifyValueOid="";
+ if(secIdTOListValueOidMap.containsKey(parentClassifySecOid)){
+ List<String> parentClassifyValueList= secIdTOListValueOidMap.get(parentClassifySecOid);
+ parentClassifyValueOid=VciBaseUtil.array2String(parentClassifyValueList.toArray(new String[]{}));
+ }
+ List<CodeClassifyValueVO> codeClassifyValueVOS= this.codeClassifyValueService.listCodeClassifyValueBySecOid(secOid,parentClassifyValueOid);
+ if(!CollectionUtils.isEmpty(codeClassifyValueVOS)){
+ List<String>valueOidList=new ArrayList<>();
+ codeClassifyValueVOS.stream().forEach(codeClassifyValueVO -> {
+ String id=StringUtils.isBlank(codeClassifyValueVO.getOid())?"":codeClassifyValueVO.getOid();
+ String value=StringUtils.isBlank(codeClassifyValueVO.getId())?"":codeClassifyValueVO.getId();
+ String num=StringUtils.isBlank(codeClassifyValueVO.getOrderNum()+"")?"":codeClassifyValueVO.getOrderNum()+"";
+ String name=StringUtils.isBlank(codeClassifyValueVO.getName())?"":codeClassifyValueVO.getName();
+ String pid=StringUtils.isBlank(codeClassifyValueVO.getParentClassifyValueOid())?"":codeClassifyValueVO.getParentClassifyValueOid();
+ String description=StringUtils.isBlank(codeClassifyValueVO.getDescription())?"":codeClassifyValueVO.getDescription();
+ CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(id,num,value,name,pid,description);
+ codeSectionValueVOList.add(sectionValueVO);
+ valueOidList.add(id);
+ });
+ secIdTOListValueOidMap.put(secOid,valueOidList);
+ }
+ }else if(secType.equals("codedatesec")){//鏃ユ湡鐮佹
+ //绌虹潃锛屽墠绔紶
+ }else if(secType.equals("coderefersec")){//寮曠敤鐮佹
+ codeBasicSecVO.getReferAttributeId();
+ codeBasicSecVO.getReferCodeClassifyOid();
+ 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) {
+ if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.DEFAULT.getValue()) || coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.GRID.getValue())) {//榛樿鏍峰紡/鍒楄〃
+ 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);
+ });
+ }
+ } else if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.TREE.getValue())) {//鏍戝舰
+ Map<String, Object> condtionMap = new HashMap<>();
+
+ //浣跨敤浼犲叆鐨勪笟鍔＄被鍨嬫煡璇㈣〃
+ 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();
+
+ String oidFieldName = StringUtils.isNotBlank(coderefersecSearchVO.getParentUsedField())?coderefersecSearchVO.getParentUsedField():coderefersecSearchVO.getValueField();
+ String parentValue =coderefersecSearchVO.getParentValue();
+ String parentFieldName =StringUtils.isBlank(coderefersecSearchVO.getParentFieldName())?"":coderefersecSearchVO.getParentFieldName();
+ List<CodeSrchCondConfigVO> codeSrchCondConfigVOList = coderefersecSearchVO.getCodeSrchCondConfigVOS();
+ List<CodeShowFieldConfigVO> codeShowFieldConfigVOS=coderefersecSearchVO.getCodeShowFieldConfigVOS();
+ if (!CollectionUtils.isEmpty(codeSrchCondConfigVOList)) {
+ codeSrchCondConfigVOList.stream().forEach(codeSrchCondConfigVO -> {
+ condtionMap.put(codeSrchCondConfigVO.getFilterField() + codeSrchCondConfigVO.getFilterType(), codeSrchCondConfigVO.getFilterValue());
+ });
+ buildSqlwhere = UBCSSqlKeyword.buildSqlwhere(condtionMap);
+ }
+
+ //if("all".equals(coderefersecSearchVO.getLoadType())) {
+ String parentOidSql = "";
+ if(StringUtils.isNotBlank(parentValue)){
+ String temp=parentValue;
+ if(temp.startsWith(QueryOptionConstant.IN)){
+ temp = temp.substring((QueryOptionConstant.IN).length()).trim();
+ parentOidSql = " in " + ((temp.startsWith("(") && temp.endsWith(")"))?temp:"(" + temp + ")");
+ }else if(temp.startsWith(QueryOptionConstant.NOTIN)){
+ parentOidSql = " not in " + ((temp.startsWith("(") && temp.endsWith(")"))?temp:"(" + temp + ")");
+ }else if(temp.startsWith(QueryOptionConstant.NOTEQUAL)){
+ temp = temp.substring((QueryOptionConstant.NOTEQUAL).length()).trim();
+ parentOidSql = QueryOptionConstant.NOTEQUAL + " " + ((temp.startsWith("'") && temp.endsWith("'"))?temp:"'" + temp + "'");
+ }else if(temp.startsWith(QueryOptionConstant.MORETHAN)){
+ temp = temp.substring((QueryOptionConstant.MORETHAN).length()).trim();
+ parentOidSql = QueryOptionConstant.MORETHAN + " " + ((temp.startsWith("'") && temp.endsWith("'"))?temp:"'" + temp + "'");
+ }else if(temp.startsWith(QueryOptionConstant.MORE)){
+ temp = temp.substring((QueryOptionConstant.MORE).length()).trim();
+ parentOidSql = QueryOptionConstant.MORE + " " + ((temp.startsWith("'") && temp.endsWith("'"))?temp:"'" + temp + "'");
+ }else if(temp.startsWith(QueryOptionConstant.LESSTHAN)){
+ temp = temp.substring((QueryOptionConstant.LESSTHAN).length()).trim();
+ parentOidSql = QueryOptionConstant.LESSTHAN + " " + ((temp.startsWith("'") && temp.endsWith("'"))?temp:"'" + temp + "'");
+ }else if(temp.startsWith(QueryOptionConstant.LESS)){
+ temp = temp.substring((QueryOptionConstant.LESS).length()).trim();
+ parentOidSql = QueryOptionConstant.LESS + " " + ((temp.startsWith("'") && temp.endsWith("'"))?temp:"'" + temp + "'");
+ }else if (temp.startsWith(QueryOptionConstant.ISNOTNULL)) {
+ parentOidSql = " is not null";
+ } else if (temp.startsWith(QueryOptionConstant.ISNULL)) {
+ parentOidSql = " is null";
+ } else if(temp.contains("*")){
+ parentOidSql = " like " + ((temp.startsWith("'") && temp.endsWith("'"))?temp:"'" + temp + "'").replace("*","%");
+ }else {
+ parentOidSql = " = " + ((temp.startsWith("'") && temp.endsWith("'"))?temp:"'" + temp + "'");
+ }
+ }
+ //鏌ヨ鍏ㄩ儴鐨勪俊鎭�
+ buildSqlwhere+= " and oid in (select oid from " +referTable + " START WITH " + coderefersecSearchVO.getParentFieldName() + " "+
+ parentOidSql +
+ " CONNECT BY PRIOR " + oidFieldName + " = " + parentFieldName + ")";
+
+ /*}else{
+ if(StringUtils.isNotBlank(coderefersecSearchVO.getParentFieldName()) && StringUtils.isNotBlank(parentValue)){
+ buildSqlwhere+=" and "+coderefersecSearchVO.getParentFieldName()+"= '"+parentValue+"'";
+ }
+ }*/
+
+ 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();
+ String pid = map.getOrDefault(parentFieldName.toUpperCase(Locale.ROOT), "").toString();
+ CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num[0] + "", value, text, pid, description);
+ codeSectionValueVOList.add(sectionValueVO);
+ });
+ }
+
+
+ } else if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.ORGDEPARTMENTGRIDREFERS.getValue()) ||////閮ㄩ棬鍒楄〃
+ coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.ORGDEPARTMENTREFER.getValue())//閮ㄩ棬鏍�
+ ) {
+ R<List<DeptVO>> r = sysClient.deptList("");
+ if (r.isSuccess()) {
+ List<DeptVO> deptVOList = r.getData();
+ if (!CollectionUtils.isEmpty(deptVOList)) {
+ deptVOList.stream().forEach(deptVO -> {
+ String id = String.valueOf(deptVO.getId());
+ int num = deptVO.getSort();
+ String value = String.valueOf(deptVO.getId());
+ String text = deptVO.getDeptName();
+ String description = deptVO.getRemark();
+ String pid = deptVO.getParentId() + "";
+ CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num + "", value, text, pid, description);
+ codeSectionValueVOList.add(sectionValueVO);
+ });
+ }
+ }
+ } else if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.SMUSERREFER.getValue())//鐢ㄦ埛
+ || coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.SMUSERGRIDREFER.getValue())//鐢ㄦ埛鍒楄〃
+ ) {
+ R<List<User>> r=userClient.selectAllUser();
+ if (r.isSuccess()) {
+ List<User> userList = r.getData();
+ if (!CollectionUtils.isEmpty(userList)) {
+ final int[] num = {0};
+ userList.stream().forEach(user -> {
+ String value=StringUtils.isBlank(user.getAccount())?"":user.getAccount();
+ //String value= String.valueOf(StringUtils.isBlank(user.getCode())?"":user.getCode());
+ String text=StringUtils.isBlank(user.getName())?"":user.getName();
+ String pid=user.getDeptId();
+ num[0]++;
+ String description="";
+ String id= String.valueOf(user.getId());
+ CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num[0] + "", value, text, pid, description);
+ codeSectionValueVOList.add(sectionValueVO);
+ });
+ }
+ }
+
+ } else if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.SMROLEREFER.getValue())) {//瑙掕壊鍒楄〃
+
+ R<List<RoleVO>> r = sysClient.roleTree("");
+ if (r.isSuccess()) {
+ List<RoleVO> roleVOList = r.getData();
+ if (!CollectionUtils.isEmpty(roleVOList)) {
+ roleVOList.stream().forEach(roleVO -> {
+ String id = String.valueOf(roleVO.getId());
+ int num = roleVO.getSort();
+ String value = String.valueOf(roleVO.getId());
+ String text = roleVO.getRoleName();
+ String description = roleVO.getRoleAlias();
+ String pid = roleVO.getParentId() + "";
+ CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num + "", value, text, pid, description);
+ codeSectionValueVOList.add(sectionValueVO);
+ });
+ }
+ }
+ } else if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.ORGDUTYREFER.getValue())) {//鑱屽姟
+
+
+ } else if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.SMWORKTYPEREFER.getValue())) {//宸ョ
+
+
+ } else if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.WFPROCESSTEMPLATEREFER.getValue())) {//娴佺▼妯℃澘
+
+ }
+ }
+ log.info(libId);
+ }else if(secType.equals("codelevelsec")) {//灞傜骇鐮佹
+ CodeClassifyVO levelCodeClassifyVO = new CodeClassifyVO();
+ CodeClassifyFullInfoBO classifyFullInfoBO = this.classifyService.getClassifyFullInfo(codeClassifyDO.getOid());
+ if(codeBasicSecVO.getCodeLevelType().equals("code_level_special")){//鎸囧畾灞傜骇
+ int level = codeBasicSecVO.getCodeLevelValue();
+ List<CodeClassifyVO> classifyVOS = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> o2.getDataLevel().compareTo(o1.getDataLevel()))).collect(Collectors.toList());
+ if (classifyVOS.size() >= level && level > 0) {
+ levelCodeClassifyVO = classifyVOS.get(level - 1);
+ }
+ }else{//鏈�灏忓眰
+ levelCodeClassifyVO=codeClassifyDO;
+ }
+ String id=StringUtils.isBlank(levelCodeClassifyVO.getOid())?"":levelCodeClassifyVO.getOid();
+ String num="";
+ String value=StringUtils.isBlank(levelCodeClassifyVO.getId())?"":levelCodeClassifyVO.getId();
+ String name=StringUtils.isBlank(levelCodeClassifyVO.getName())?"":levelCodeClassifyVO.getName();
+ String description=StringUtils.isBlank(levelCodeClassifyVO.getDescription())?"":levelCodeClassifyVO.getDescription();
+ CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(id,num,value,name,"",description);
+ codeSectionValueVOList.add(sectionValueVO);
+ }else if(secType.equals("codeattrsec")){//灞炴�х爜娈�
+ codeBasicSecVO.getReferAttributeId();
+ codeBasicSecVO.getReferCodeClassifyOid();
+ codeBasicSecVO.getReferBtmId();
+ codeBasicSecVO.getReferBtmName();
+ }else if(secType.equals("codeserialsec")){//娴佹按鐮佹
+
+ }
+ //鏋勫缓瑙勫垯鐮佹
+ CodeSectionVO codeSectionVO=new CodeSectionVO();
+ codeSectionVO.setId(StringUtils.isBlank(codeBasicSecVO.getOid())?"":codeBasicSecVO.getOid());//涓婚敭
+ codeSectionVO.setName(StringUtils.isBlank(codeBasicSecVO.getName())?"":codeBasicSecVO.getName());//鐮佹鍚嶇О
+ codeSectionVO.setCodeSecLength(StringUtils.isBlank(codeBasicSecVO.getCodeSecLength())?"":codeBasicSecVO.getCodeSecLength());//鐮佹闀垮害
+ codeSectionVO.setNum(StringUtils.isBlank(codeBasicSecVO.getOrderNum()+"")?"":codeBasicSecVO.getOrderNum()+"");//鐮佹搴忓彿
+ codeSectionVO.setCodeDateFormatStr(StringUtils.isBlank(codeBasicSecVO.getCodeDateFormatStr())?"":codeBasicSecVO.getCodeDateFormatStr());//鏃ユ湡绫诲瀷
+ codeSectionVO.setCodeSecLengthType(StringUtils.isBlank(codeBasicSecVO.getCodeSecLengthType())?"":codeBasicSecVO.getCodeSecLengthType());//鐮佹闀垮害绫诲瀷
+ codeSectionVO.setPkCodeRule(StringUtils.isBlank(codeRuleVO.getOid())?"":codeRuleVO.getOid());//瑙勫垯涓婚敭
+ codeSectionVO.setSecType(StringUtils.isBlank(codeBasicSecVO.getSecType())?"":codeBasicSecVO.getSecType());//鐮佹绫诲瀷
+ codeSectionVO.setDescription(StringUtils.isBlank(codeBasicSecVO.getDescription())?"":codeBasicSecVO.getDescription());//鎻忚堪
+ codeSectionVO.setParentClassifySecOid(StringUtils.isBlank(codeBasicSecVO.getParentClassifySecOid())?"":codeBasicSecVO.getParentClassifySecOid());//鍒嗙被鐮佹涓婄骇
+ codeSectionVO.setSecTypeText(StringUtils.isBlank(codeBasicSecVO.getSecTypeText())?"":codeBasicSecVO.getSecTypeText());
+ //if(!CollectionUtils.isEmpty(codeSectionValueVOList)) {
+ codeSectionVO.setSectionValue(codeSectionValueVOList);
+ //}
+ codeSectionVO.setSectionCode(codeBasicSecVO.getId());//鐮佹缂栧彿
+ codeSectionVOList.add(codeSectionVO);
+ });
+ }
+ //鏋勫缓瑙勫垯淇℃伅
+ resultCodeRuleVO.setId(StringUtils.isBlank(codeRuleVO.getOid())?"":codeRuleVO.getOid());//涓婚敭
+ resultCodeRuleVO.setNum("");//搴忓彿
+ resultCodeRuleVO.setName(StringUtils.isBlank(codeRuleVO.getName())?"":codeRuleVO.getName());//鍚嶇О璁剧疆
+ resultCodeRuleVO.setRuleCode(StringUtils.isBlank(codeRuleVO.getId())?"":codeRuleVO.getId());//瑙勫垯缂栧彿
+ resultCodeRuleVO.setDescription(StringUtils.isBlank(codeRuleVO.getDescription())?"":codeRuleVO.getDescription());//鎻忚堪
+ resultCodeRuleVO.setCodeSection(codeSectionVOList);
+ }
+ //鏋勫缓鍒嗙被淇℃伅
+ com.vci.ubcs.code.vo.webserviceModel.coderule.ResultClassifyVO classifyVO=new com.vci.ubcs.code.vo.webserviceModel.coderule.ResultClassifyVO();
+ classifyVO.setId(StringUtils.isBlank(codeClassifyDO.getOid())?"":codeClassifyDO.getOid());
+ classifyVO.setLcStatus(StringUtils.isBlank(codeClassifyDO.getLcStatus())?"":codeClassifyDO.getLcStatus());
+ classifyVO.setClassCode(StringUtils.isBlank(codeClassifyDO.getId())?"":codeClassifyDO.getId());
+ classifyVO.setDescription(StringUtils.isBlank(codeClassifyDO.getDescription())?"":codeClassifyDO.getDescription());
+ classifyVO.setName(StringUtils.isBlank(codeClassifyDO.getName())?"":codeClassifyDO.getName());
+ classifyVO.setPid(StringUtils.isBlank(codeClassifyDO.getParentCodeClassifyOid())?"":codeClassifyDO.getParentCodeClassifyOid());
+ classifyVO.setFullPathName(StringUtils.isBlank(codeClassifyDO.getPath())?"":codeClassifyDO.getPath());
+ classifyVO.setCodeRule(resultCodeRuleVO);
+ classifyVOList.add(classifyVO);
+ });
+ resultLibraryVO.setClassify(classifyVOList);
+ }else{
+ errorid = "100";
+ msg="鏈煡璇㈠埌鐩稿叧鐨勫垎绫讳俊鎭�";
+ }
+ issucess=true;
+ resultClassifyRuleData.setLibrary(resultLibraryVO);
}catch (Throwable e){
e.printStackTrace();;
msg="鏌ヨ鍒嗙被澶辫触:"+e.getMessage();
}finally {
- // resultData.setErrorid(errorid);
- // resultData.setMsg(msg);
- // resultClassifyVO.setResultData(resultData);
+ resultClassifyRuleData.setErrorid(errorid);
+ resultClassifyRuleData.setMsg(msg);
+ resultClassifyRuleVO.setData(resultClassifyRuleData);
}
if(dataType.equals("xml")){
//缁勭粐杩斿洖鎺ュ彛淇℃伅
XStream xStream = new XStream(new DomDriver());
xStream.processAnnotations(XMLResultSystemVO.class);
xStream.autodetectAnnotations(true);
- //resultStr = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + xStream.toXML(resultData);
+ resultStr = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + xStream.toXML(resultClassifyRuleData);
}else{
- Object object = JSONObject.toJSON(resultClassifyVO);
+ Object object = JSONObject.toJSON(resultClassifyRuleVO);
resultStr = object.toString();
}
try {
//璁板綍鏃ュ織
- this.saveLogs(systemId, systemId, data, resultStr, issucess, msg, "queryClassify");
+ this.saveLogs(systemId, systemId, data, resultStr, issucess, msg, "queryClassifyRule");
}catch (Throwable e){
e.printStackTrace();
}
@@ -833,7 +1887,7 @@
* 鏌ヨ鏍￠獙鍒嗙被淇℃伅
* @param classfyVO
*/
- private CodeClassifyVO getClassfy(ClassfyVO classfyVO) throws Throwable{
+ private CodeClassifyVO getClassfy(ClassfyVO classfyVO,String libray) throws Throwable{
CodeClassifyVO classifyVO = new CodeClassifyVO();
try {
String classCode = classfyVO.getClassCode();
@@ -842,13 +1896,19 @@
if (StringUtils.isNotBlank(classfyVO.getClassCode())) {
Map<String, String> conditionMap = new HashMap<>();
List<CodeClassify> codeClassifyList = classifyService.selectByWrapper(Wrappers.<CodeClassify>query().lambda().eq(CodeClassify::getId, classCode));
+ final CodeClassify[] newCodeClassify = {new CodeClassify()};
if (!CollectionUtils.isEmpty(codeClassifyList)) {
- CodeClassify classifyDO = codeClassifyList.get(0);
- //灏咲TO杞崲涓篋O
+ codeClassifyList.stream().forEach(codeClassify -> {
+ CodeClassifyVO codeClassifyVO= classifyService.getTopClassifyVO(codeClassify.getOid());
+ if(codeClassifyVO.getId().equals(libray)){
+ newCodeClassify[0] =codeClassify;
+ }
+ });
classifyVO = new CodeClassifyVO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(classifyDO, classifyVO);
+ BeanUtilForVCI.copyPropertiesIgnoreCase(newCodeClassify[0], classifyVO);
+ //灏咲TO杞崲涓篋O
if(StringUtils.isBlank(classifyVO.getOid())){
- throw new Throwable("鏍规嵁鍒嗙被浠ｅ彿鏈煡璇㈠埌鐩稿簲鐨勫垎绫讳俊鎭�");
+ throw new Throwable("鐢宠缂栫爜鐨勫垎绫伙細銆�"+classCode+"銆戜笉灞炰簬搴撹妭鐐广��"+libray+"銆戯紝璇锋鏌ュ弬鏁板垎绫昏妭鐐�/搴撹妭鐐逛俊鎭槸鍚﹀尮閰�");
}
}else{
throw new Throwable("鏍规嵁鍒嗙被浠ｅ彿鏈煡璇㈠埌鐩稿簲鐨勫垎绫讳俊鎭�");
@@ -861,19 +1921,21 @@
}
}catch (Throwable e){
objerrorCode="100";
- new Throwable("鑾峰彇鍒嗙被淇℃伅澶辫触:"+e.getMessage());
+ throw new Throwable("鑾峰彇鍒嗙被淇℃伅澶辫触:"+e.getMessage());
}
return classifyVO;
}
private List<ClientBusinessObject> ChangeMapTOClientBusinessObjects(List<Map<String,String>> oldDataMap){
- List<ClientBusinessObject> clientBusinessObjectList=new CopyOnWriteArrayList<>();
- oldDataMap.parallelStream().forEach(dataMap->{
+ List<ClientBusinessObject> clientBusinessObjectList=new ArrayList<>();
+ oldDataMap.stream().forEach(dataMap->{
ClientBusinessObject clientBusinessObject=new ClientBusinessObject();
DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject);
- dataMap.forEach((key,value)->{
- clientBusinessObject.setAttributeValue(key,value);
- });
+ for (String key:dataMap.keySet()){
+ Object value= dataMap.getOrDefault(key,"");
+ clientBusinessObject.setAttributeValue(key.toLowerCase(Locale.ROOT),value==null?"":value.toString());
+ }
+ clientBusinessObjectList.add(clientBusinessObject);
});
return clientBusinessObjectList;
}
@@ -888,9 +1950,11 @@
});
Map<String,CodeClassifyVO> codeClassifyVOMap= classifyFullInfo.getParentClassifyVOs().stream().collect(Collectors.toMap(s -> s.getId(), t -> t,(o1, o2)->o2));
List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>();
+ Map<String,String> errorMap=new HashMap<>();
for(CodeBasicSecVO codeBasicSecVO: codeBasicSecVOS) {
String sectype = codeBasicSecVO.getSecType();
String classifySecOid= codeBasicSecVO.getOid();
+ String message="";
if (!sectype.equals(CodeSecTypeEnum.CODE_SERIAL_SEC.getValue())) {
String name = codeBasicSecVO.getName();
String sectypeText = codeBasicSecVO.getSecTypeText();
@@ -912,18 +1976,27 @@
CodeClassifyValue codeClassifyValue= codeClassifyValueDOMap.get(sectypeValue);
sectypeValue=codeClassifyValue.getOid();
}else {
- objerrorCode = "101";
- throw new Throwable("浼犲叆鐨勫垎绫荤爜娈碉細銆�" + name + " 鍊硷細" + sectypeValue + "銆戯紝涓嶇鍚堝綋鍓嶅垎绫诲眰绾т唬鍙�");
+ //throw new Throwable("浼犲叆鐨勫垎绫荤爜娈碉細銆�" + name + " 鍊硷細" + sectypeValue + "銆戯紝涓嶇鍚堝綋鍓嶅垎绫诲眰绾т唬鍙�");
+ message="浼犲叆鐨勫垎绫荤爜娈碉細銆�" + name + " 鍊硷細" + sectypeValue + "銆戯紝涓嶇鍚堝綋鍓嶅垎绫诲眰绾т唬鍙�";
+ errorMap.put("error",errorMap.getOrDefault("error","")+";"+message);
}
}
+ }
+ if(StringUtils.isBlank(sectypeValue)){
+ message="浼犲叆鐨勫垎绫荤爜娈碉細銆�" + name + " 銆戠殑鍊间笉鍏佽涓虹┖";
+ errorMap.put("error",errorMap.getOrDefault("error","")+";"+message);
}
CodeOrderSecDTO.setSecValue(sectypeValue);
codeOrderSecDTOList.add(CodeOrderSecDTO);
} else {
- objerrorCode="101";
- throw new Throwable("浼犲叆鐨勭爜娈佃鍒欑己灏�" + name + "鐮佹");
+ message="浼犲叆鐨勭爜娈佃鍒欑己灏�" + name + "鐮佹";
+ errorMap.put("error",errorMap.getOrDefault("error","")+";"+message);
}
}
+ }
+ if(errorMap.size()>0){
+ objerrorCode="101";
+ throw new Throwable(errorMap.getOrDefault("error",""));
}
return codeOrderSecDTOList;
}
@@ -931,7 +2004,7 @@
* 鏍规嵁灞炴�ф槧灏勮浆鎹㈢紪鐮佹墍闇�瀛楁
*/
public void getConfigDatas(String systemId,String libray, ApplyDatasVO applyDatasVO,List<CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrVOList,DataObjectVO dataObjectVO) throws Throwable {
- List<ApplyDataVO> applyDataVOList=applyDatasVO.getObject();
+
LinkedHashMap<String,LinkedHashMap<String,String>> dataKeyValueMap=new LinkedHashMap<>();
//濡傛灉灏嗘暟鎹浆鎹㈡垚鎵�闇�瑕佺殑鏁版嵁瀵硅薄
Map<String, String> attrMapConfigMap=new HashMap<>();
@@ -941,15 +2014,23 @@
Map<String, String> stringStringMap=attributeMapConfig.getSystem_attrmap();
log.info("闆嗘垚绯荤粺灞炴�ф槧灏勯厤缃枃浠舵潯鐩暟-銆�"+stringStringMap.size());
//stringStringMap.put("RLM","D:\\RLM.xml");
- LibraryDO libraryDO=gennerAttrMapUtil.getNewInstance().gennerAttrMapBySystem(systemId,stringStringMap);
- List<LibraryClsfDO> libraryClsfDOList=libraryDO.getClsf();
- Map<String, List<ClsfAttrMappingDO>> libPropMaps = libraryClsfDOList.stream().collect(Collectors.toMap(LibraryClsfDO::getLibrary, LibraryClsfDO::getProp, (key1, key2) -> key2));
- log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�"+libray+"浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃�");
- if(libPropMaps.containsKey(libray)){
- log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�"+libray+"鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�");
- List<ClsfAttrMappingDO> clsfAttrMappingDOList=libPropMaps.get(libray);
- propMaps = clsfAttrMappingDOList.stream().collect(Collectors.toMap(ClsfAttrMappingDO::getSourceKey, ClsfAttrMappingDO::getTargetKey, (key1, key2) -> key2));
- log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�"+libray+"鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�,灞炴�ф槧灏勬潯鐩暟+"+clsfAttrMappingDOList.size());
+ if(!CollectionUtils.isEmpty(stringStringMap)) {
+ log.info("info锛氶渶瑕佽鍙栭厤缃枃浠�");
+ LibraryDO libraryDO = gennerAttrMapUtil.getNewInstance().gennerAttrMapBySystem(systemId, stringStringMap);
+ List<LibraryClsfDO> libraryClsfDOList = libraryDO.getClsf();
+ if(!CollectionUtils.isEmpty(libraryClsfDOList)) {
+ Map<String, List<ClsfAttrMappingDO>> libPropMaps = libraryClsfDOList.stream().collect(Collectors.toMap(LibraryClsfDO::getLibrary, LibraryClsfDO::getProp, (key1, key2) -> key2));
+ log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃�");
+ String path=stringStringMap.get(systemId);
+ if (libPropMaps.containsKey(libray)) {
+ log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�");
+ List<ClsfAttrMappingDO> clsfAttrMappingDOList = libPropMaps.get(libray);
+ propMaps = clsfAttrMappingDOList.stream().collect(Collectors.toMap(ClsfAttrMappingDO::getSourceKey, ClsfAttrMappingDO::getTargetKey, (key1, key2) -> key2));
+ log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�,灞炴�ф槧灏勬潯鐩暟+" + clsfAttrMappingDOList.size());
+ }else{
+ throw new Throwable("鏍规嵁绯荤粺鏍囪瘑銆�"+systemId+"銆戞壘鍒板搴旂殑閰嶇疆鏂囦欢:銆�"+path+"銆戯紝浣嗘湭鑾峰彇鍒板搴旂殑搴撱��"+libray+"銆戝睘鎬ф槧灏勪俊鎭厤缃�");
+ }
+ }
}
log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�"+libray+"浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃� end ");
}catch (Throwable e){
@@ -971,6 +2052,11 @@
dataObjectVO.setColName(rowNameList);//鏀惧叆灞炴��
attrMapConfigMap.putAll(propMaps);
LinkedList<RowDatas> rowDataList = new LinkedList<>();
+ List<ApplyDataVO> applyDataVOList=new ArrayList<>();
+
+ if(!CollectionUtils.isEmpty(applyDatasVO.getObject())){
+ applyDataVOList=applyDatasVO.getObject();
+ }
//Map<String, List<ProppertyVO>> dataPropMap = applyDataVOList.stream().collect(Collectors.toMap(ApplyDataVO::getId, ApplyDataVO::getProp, (key1, key2) -> key2));
final int[] rowIndex = {0};
applyDataVOList.stream().forEach(applyDataVO -> {
@@ -1048,6 +2134,7 @@
dockingLoge.setParamString(parmaData);//鍙傛暟淇℃伅
dockingLoge.setReturnString(result);//杩斿洖淇℃伅
dockingLoge.setType(operation);//鏃ュ織鎿嶄綔绫诲瀷
+ dockingLoge.setCreateTime(new Date());
if(isSucess) {
dockingLoge.setInterfaceStatus("true");//鎺ュ彛闆嗘垚鐘舵��
}else{
@@ -1106,5 +2193,60 @@
return resultStr;
}
+ /***
+ * 鏍￠獙鏄惁鍋氫簡閰嶇疆
+ * @param systemId,绯荤粺鏍囪瘑
+ * @param type:鎺ュ彛绫诲瀷
+ * @param operationType:鎺ュ彛鎿嶄綔绫诲瀷
+ * @return
+ */
+ private boolean checkIspass(String systemId,String type,String operationType){
+ log.info("systemId锛�"+systemId+",type:"+SysIntegrationDataFlowTypeEnum.getTextByValue(type)+",operationType:"+sysIntegrationPushTypeEnum.getTextByValue(operationType));
+ if(!CODE_CHECKCONFIG) {
+ return true;
+ }
+ //鏍规嵁绫诲瀷鍘绘煡璇㈤渶瑕侀泦鎴愮殑鍒嗙被鎴栬�呮暟鎹�
+ LambdaQueryWrapper<DockingSystemConfig> queryWrapper = Wrappers.<DockingSystemConfig>lambdaQuery();
+ queryWrapper.eq(DockingSystemConfig::getUsedFlag, MdmDuckingConstant.SEND_FLAG_TRUE);
+ queryWrapper.eq(DockingSystemConfig::getSysBaseId,systemId);
+ queryWrapper.eq(DockingSystemConfig::getDataFlowType,type);
+ queryWrapper.eq(DockingSystemConfig::getPushType,operationType);
+ return dockingSystemConfigService.count(queryWrapper)>0?true:false;
+ }
+ /***
+ * 鏍￠獙鏄惁鍋氫簡閰嶇疆
+ * @param systemId,绯荤粺鏍囪瘑
+ * @param type:鎺ュ彛绫诲瀷
+ * @param operationType:鎺ュ彛鎿嶄綔绫诲瀷
+ * @return
+ */
+ private DockingSystemConfig checkIspass(String systemId,String type,String operationType,String classOid){
+ log.info("systemId锛�"+systemId+",type:"+SysIntegrationDataFlowTypeEnum.getTextByValue(type)+",operationType:"+sysIntegrationPushTypeEnum.getTextByValue(operationType)+",classOid:"+classOid);
+ CodeClassifyVO codeClassifyVO= classifyService.getObjectByOid(classOid);
+ classOid=codeClassifyVO.getOid();
+ //鏍规嵁绫诲瀷鍘绘煡璇㈤渶瑕侀泦鎴愮殑鍒嗙被鎴栬�呮暟鎹�
+ LambdaQueryWrapper<DockingSystemConfig> queryWrapper = Wrappers.<DockingSystemConfig>lambdaQuery();
+ queryWrapper.eq(DockingSystemConfig::getUsedFlag, MdmDuckingConstant.SEND_FLAG_TRUE);
+ queryWrapper.eq(DockingSystemConfig::getSysBaseId,systemId);
+ queryWrapper.eq(DockingSystemConfig::getDataFlowType,type);
+ queryWrapper.eq(DockingSystemConfig::getPushType,operationType);
+ if(StringUtils.isNotBlank(classOid)){
+ queryWrapper.in(DockingSystemConfig::getClassifyOid,classOid);
+ }
+ List<DockingSystemConfig> dockingSystemConfigList=new ArrayList<>();
+ dockingSystemConfigList= dockingSystemConfigList=dockingSystemConfigService.list(queryWrapper);
+ if(!CollectionUtils.isEmpty(dockingSystemConfigList)){
+ return dockingSystemConfigList.get(0);
+ }else{
+ if(StringUtils.isNotBlank(codeClassifyVO.getParentCodeClassifyOid())) {
+ return checkIspass(systemId, type, operationType, codeClassifyVO.getParentCodeClassifyOid());
+ }
+ }
+ if(dockingSystemConfigList.size()>0){
+ return dockingSystemConfigList.get(0);
+ }else{
+ return new DockingSystemConfig();
+ }
+ }
}
--
Gitblit v1.9.3