hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dongj' into dongj

This commit is contained in:
476474485@qq.com 2024-12-23 17:30:46 +08:00
parent 1879c10240 1933f96229
commit 84d849f64f
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/impl/NingboBankPluginServiceImpl.java
View File

@ -285,7 +285,7 @@ private IFormmain0044Service formmain0044Service;
if (CollectionUtils.isNotEmpty(formmain0044List) && CollectionUtils.isNotEmpty(accTransactionResList)){
accTransactionResList = accTransactionResList.stream()
.filter(acc -> formmain0044List.stream()
.noneMatch(f -> acc.getSerialId().equals(f.getField0018())))
.noneMatch(f -> acc.getSerialId().equals(f.getField0019())))
.collect(Collectors.toList());
}
if (CollectionUtils.isNotEmpty(accTransactionResList)){

16
buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
View File

@ -544,7 +544,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
map1.put("tableName",mainDb);
map1.put("dataStatus", "N");
map1.put("deleteStatus", "0");
map1.put("size", 50);
map1.put("size", 10);
objects = mdmModuleDao.queryMdmSTs(map1);
objects = toLowerCaseKeys(objects);
@ -739,7 +739,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
map1.put("tableName",mainDb);
//map1.put("dataStatus", "F");
map1.put("updateStatus", "0");
map1.put("size", 50);
map1.put("size", 10);
objects = mdmModuleDao.queryMdmSTs(map1);
objects = toLowerCaseKeys(objects);
@ -927,7 +927,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
map1.put("tableName",mainDb);
//map1.put("dataStatus", "Y");
map1.put("addStatus", "0");
map1.put("size", 50);
map1.put("size", 10);
objects = mdmModuleDao.queryMdmSTs(map1);
objects = toLowerCaseKeys(objects);
@ -965,14 +965,14 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
for (int i = 0; i < doObjects.size(); i++) {
saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"2","新增接口未查找到",mainDb,objects.get(i).getString("id"),null,null,null,null,doObjects.get(i).toJSONString(),"1");
}
return ;
continue ;
}
SysApplicationEntity sysApplicationEntity = sysApplicationDao.get(apiEntity.getAppId());
if(sysApplicationEntity == null || sysApplicationEntity.getId() == null ){
for (int i = 0; i < doObjects.size(); i++) {
saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"2","应用未查找到",mainDb,objects.get(i).getString("id"),null,null,apiEntity.getApiName(),apiEntity.getId(),doObjects.get(i).toJSONString(),"1");
}
return ;
continue ;
}
SysApplicationScriptEntity scriptEntity = null;
@ -982,7 +982,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
for (int i = 0; i < doObjects.size(); i++) {
saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"2","脚本未查找到",mainDb,objects.get(i).getString("id"),sysApplicationEntity.getName(),sysApplicationEntity.getId(),apiEntity.getApiName(),apiEntity.getId(),doObjects.get(i).toJSONString(),"1");
}
return ;
continue ;
}
}
@ -1136,14 +1136,14 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
//所有下发发送完成，修改数据状态
for (int i = 0; i < objects.size(); i++) {
if(objects.get(i).getBoolean("sendsanfzt123")){
//if(objects.get(i).getBoolean("sendsanfzt123")){
Map<String, Object> updateMap = new HashMap<>();
updateMap.put("tableName",mainDb);
//updateMap.put("dataStatus", "Y");
updateMap.put("addStatus", "1");
updateMap.put("id", objects.get(i).getString("id"));
mdmModuleDao.updateMdmSTs(updateMap);
}
//}
}
}

5
service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java
View File

@ -485,6 +485,7 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
map.put("modify_time", new Date());
map.put("sts", "Y");
map.put("data_status","F");//数据状态
map.put("add_status", "0");//新增状态
map.put("update_status","0");//修改状态
map.remove("id");
comparisonEntity.setMap(map);
@ -622,10 +623,10 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
return BaseResult.getFailureMessageEntity("根据data_id查询id数据为空，请检查data_id");
}
//递归删除树结构 1.树 2.列表
/*//递归删除树结构 1.树 2.列表
if(comparisonEntities.get(0).getViewName().equals("1")){
return recursiveDeleteComparison(comparisonEntitiePages,comparisonEntity);
}
}*/
String id = String.valueOf(comparisonEntitiePages.get(0).get("id"));