From 238121be19655f63a45fc9c9c3d864801eb4471b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 24 四月 2024 12:44:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 54 ++++++++++++++++++++++++++----------------------------
1 files changed, 26 insertions(+), 28 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 ca3d624..7d4cbcb 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
@@ -69,8 +69,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.handler.MessageContext;
-import java.io.PrintWriter;
-import java.io.StringWriter;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ForkJoinPool;
@@ -87,7 +85,7 @@
@Service
@Slf4j
@VciWebservice(path = "/universalInterface")
-public class UniversalInterfaceImpl<IDockingLogeServiceing> implements UniversalInterfaceI {
+public class UniversalInterfaceImpl implements UniversalInterfaceI {
/***
* 鎿嶄綔绫诲瀷
@@ -308,7 +306,7 @@
//List<XMLResultDataObjectDetailDO> allResultDataObjectDetailDOS=new ArrayList<>();
String finalSystemId = systemId;
classVOList.stream().forEach(classVO -> {
- log.info("鍙傛暟锛氬垎绫籆Ode:" + classVO.getClassCode());
+ log.info("鍙傛暟锛氬垎绫籆ode:" + classVO.getClassCode());
boolean isCodeOrGroupCode=false;
LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>();
String libray ="";
@@ -490,7 +488,7 @@
ClassfyVO classfyVO = new ClassfyVO();
classfyVO.setLibrary(personLibrary);
classfyVO.setClassCode(personClassCode);
- CodeClassifyVO codeClassifyVO=this.getClassfy(classfyVO,personLibrary);
+ CodeClassifyVO codeClassifyVO=this.getClassfy(classfyVO,personLibrary);
log.info("end锛氬垎绫绘煡璇㈠畬姣�");
//鑾峰彇鍒嗙被妯℃澘淇℃伅
if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
@@ -508,8 +506,7 @@
).collect(Collectors.toList());
List<PersonMasterData> personMasterDataList= personData.getMasterData();
- List<Map> dataList=new ArrayList<>();
-
+ //List<Map> dataList=new ArrayList<>();
List<String> codeList=new ArrayList<>();
List<ApplyDataVO> applyDataVOList=new ArrayList<>();
@@ -528,7 +525,7 @@
*/
fields.stream().forEach(field->{
if(dataMap.containsKey(field)){
- String enumFiled= dataMap.get(field);
+ String enumFiled = dataMap.get(field);
EnumerableData enumerableData=JSONObject.toJavaObject(JSONObject.parseObject(enumFiled),EnumerableData.class);
String enumCode=enumerableData.getCode();
//String enumCodeValue=enumerableData.getName();
@@ -548,11 +545,11 @@
object.setProp(proppertyVOList);
if(personMasterData.getDr()==1){
- object.setOperate("delete");//鎿嶄綔绫诲瀷
+ //鎿嶄綔绫诲瀷
+ object.setOperate("delete");
deleteDataVOList.add(object);
}else{
- String worker_category=personMasterData.getWorker_category();
-
+ //String worker_category=personMasterData.getWorker_category();
object.setOperate("create");
applyDataVOList.add(object);
}
@@ -580,7 +577,7 @@
sb.append(VciBaseUtil.toInSql(codeList.toArray(new String[0])));
sb.append(")");
List<Map<String,String>> dataMapList=commonsMapper.queryByOnlySqlForMap(sb.toString());
-
+ DefaultAttrAssimtUtil.mapToLowerCase(dataMapList,true);
List<ClientBusinessObject> cboList= ChangeMapTOClientBusinessObjects(dataMapList);
ApplyDatasVO applyDatasVO=new ApplyDatasVO();
ApplyDatasVO editDatasVO=new ApplyDatasVO();
@@ -724,7 +721,7 @@
resultOrgData.setMessage(message);
resultOrgData.setSuccess(success.get());
resultOrgData.setMdMappings(resultMdMappingList);
- Object object = JSONObject.toJSON(resultOrgData);
+ //Object object = JSONObject.toJSON(resultOrgData);
}
String resultStr = JSONObject.toJSONString(resultOrgData);
String data = JSONObject.toJSONString(personData);
@@ -749,13 +746,13 @@
public ResultOrgData syncDataForOrg(OrgData orgData) {
boolean isUsedFlag= personAndDeptConfig.isUsedFlag();
ResultOrgData resultOrgData=new ResultOrgData();
- //boolean isPersonApplyGroupCode= personAndDeptConfig.isDeptApplyGroupCode();
+ // boolean isPersonApplyGroupCode= personAndDeptConfig.isDeptApplyGroupCode();
List<ResultMdMapping> resultMdMappingList=new ArrayList<>();
AtomicBoolean success= new AtomicBoolean(true);
String message="";
String systemCode="";
if(isUsedFlag){
- List<OrgMasterData> orgMasterDataList=new ArrayList<>();
+ List<OrgMasterData> orgMasterDataList = new ArrayList<>();
List<String> fields = Func.toStrList(personAndDeptConfig.getDeptFields());
try {
if(orgData==null){
@@ -778,7 +775,7 @@
ClassfyVO classfyVO = new ClassfyVO();
classfyVO.setLibrary(deptLibrary);
classfyVO.setClassCode(deptClassCode);
- CodeClassifyVO codeClassifyVO=this.getClassfy(classfyVO,deptLibrary);
+ CodeClassifyVO codeClassifyVO = this.getClassfy(classfyVO,deptLibrary);
log.info("end锛氬垎绫绘煡璇㈠畬姣�");
//鑾峰彇鍒嗙被妯℃澘淇℃伅
if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
@@ -802,10 +799,10 @@
object.setCode(orgMasterData.getMdm_code());//缂栫爜
object.setCreator(orgMasterData.getCreator());//鍒涘缓鑰�
object.setEditor(orgMasterData.getModifier());//淇敼鑰�
- object.setId(orgMasterData.getPk_mdm());//涓婚敭
+ object.setId(orgMasterData.getDepartment_code());//涓婚敭
object.setStatus(CodeDefaultLC.RELEASED.getValue());//鐘舵�佸垯闇�瑕佸垽鏂�
Map<String,String> dataMap= VciBaseUtil.objectToMapString(orgMasterData);
- List<ProppertyVO> proppertyVOList=new ArrayList<>();
+ List<ProppertyVO> proppertyVOList = new ArrayList<>();
/***
* 鏍规嵁閰嶇疆鏂囦欢鑾峰彇鏋氫妇鍊�
*/
@@ -834,7 +831,6 @@
object.setOperate("delete");//鎿嶄綔绫诲瀷
deleteDataVOList.add(object);
}else{
-
object.setOperate("create");
applyDataVOList.add(object);
}
@@ -850,10 +846,10 @@
throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷瀵硅薄锛�");
}
String tableName = btmTypeVO.getTableName();
- if (com.alibaba.nacos.common.utils.StringUtils.isBlank(tableName)) {
+ if (StringUtils.isBlank(tableName)) {
throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷鐩稿叧鑱旂殑琛�");
}
- StringBuffer sb=new StringBuffer();
+ StringBuffer sb = new StringBuffer();
sb.append(" select * from ");
sb.append(tableName);
sb.append(" where 1=1 ");
@@ -861,15 +857,16 @@
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);
+ List<Map<String,String>> dataMapList = commonsMapper.queryByOnlySqlForMap(sb.toString());
+ DefaultAttrAssimtUtil.mapToLowerCase(dataMapList,true);
+ 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));
+ 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();
+ String code = cbo.getCode();
return !oldpplyDataVOMap.containsKey(code);
}).collect(Collectors.toList());
applyDatasVO.setObject(applyApplyDataVOList);
@@ -892,7 +889,7 @@
DataObjectVO dataObjectVO = new DataObjectVO();
this.getConfigDatas(systemCode, deptLibrary, editDatasVO, attrVOS, dataObjectVO);
log.info("start锛氫慨鏀规暟鎹墽琛屽畬姣�");
- boolean personApplyGroupCode = personAndDeptConfig.isPersonApplyGroupCode();
+ boolean personApplyGroupCode = personAndDeptConfig.isPersonApplyGroupCode();
mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,personApplyGroupCode);
log.info("end锛氫慨鏀规暟鎹墽琛屽畬姣�");
}
@@ -1514,7 +1511,8 @@
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<Map<String,String>> newDataList = commonsMapper.queryByOnlySqlForMap(sb.toString());
+ DefaultAttrAssimtUtil.mapToLowerCase(newDataList,true);
List<ClientBusinessObject> clientBusinessObjects= ChangeMapTOClientBusinessObjects(newDataList);
List<com.vci.ubcs.code.vo.webserviceModel.data.DataObjectVO> dataObjectVOS=new ArrayList<>();
if(!CollectionUtils.isEmpty(clientBusinessObjects)){
@@ -2460,7 +2458,7 @@
*/
public void getConfigDatas(String systemId,String libray, ApplyBZDatasVO applyDatasVO,List<CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrVOList,DataObjectVO dataObjectVO) throws Throwable {
- LinkedHashMap<String,LinkedHashMap<String,String>> dataKeyValueMap=new LinkedHashMap<>();
+ // LinkedHashMap<String,LinkedHashMap<String,String>> dataKeyValueMap=new LinkedHashMap<>();
//濡傛灉灏嗘暟鎹浆鎹㈡垚鎵�闇�瑕佺殑鏁版嵁瀵硅薄
Map<String, String> attrMapConfigMap=new HashMap<>();
Map<String, String> propMaps=new HashMap<>();
--
Gitblit v1.9.3