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

Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project

This commit is contained in:
yuqh 2024-06-25 09:29:17 +08:00
parent 5c77244d24 0e7b05e788
commit e6d814e405
4 changed files with 143 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java
View File

@ -582,6 +582,24 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
document_rule_num.setCreate(); document_rule_num.setCreate();
document_rule_num.setDataType("1"); document_rule_num.setDataType("1");
mdmModuleDbFiledsEntities.add(document_rule_num); mdmModuleDbFiledsEntities.add(document_rule_num);
MdmModuleDbFiledsEntity data_id = new MdmModuleDbFiledsEntity();
data_id.setMdmId(entity.getMdmId());
data_id.setDbId(entity.getId());
data_id.setEnName("data_id");
data_id.setChName("第三方主键ID");
data_id.setFiledType("1");
data_id.setAddType("2");
data_id.setUpdateType("2");
data_id.setShowType("2");
data_id.setQueryType("2");
data_id.setListType("2");
data_id.setViewType("2");
data_id.setFiledLength("255");
data_id.setCreate();
data_id.setDataType("1");
mdmModuleDbFiledsEntities.add(data_id);
} }
if ("2".equals(entity.getDbType()) || "3".equals(entity.getDbType()) || "4".equals(entity.getDbType())) { if ("2".equals(entity.getDbType()) || "3".equals(entity.getDbType()) || "4".equals(entity.getDbType())) {
MdmModuleDbFiledsEntity formmain_id = new MdmModuleDbFiledsEntity(); MdmModuleDbFiledsEntity formmain_id = new MdmModuleDbFiledsEntity();
@ -600,6 +618,24 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
formmain_id.setCreate(); formmain_id.setCreate();
formmain_id.setDataType("1"); formmain_id.setDataType("1");
mdmModuleDbFiledsEntities.add(formmain_id); mdmModuleDbFiledsEntities.add(formmain_id);
MdmModuleDbFiledsEntity data_id = new MdmModuleDbFiledsEntity();
data_id.setMdmId(entity.getMdmId());
data_id.setDbId(entity.getId());
data_id.setEnName("data_id");
data_id.setChName("第三方主键ID");
data_id.setFiledType("1");
data_id.setAddType("2");
data_id.setUpdateType("2");
data_id.setShowType("2");
data_id.setQueryType("2");
data_id.setListType("2");
data_id.setViewType("2");
data_id.setFiledLength("255");
data_id.setCreate();
data_id.setDataType("1");
mdmModuleDbFiledsEntities.add(data_id);
} }
//写入日志字段：操作人 //写入日志字段：操作人
if ("3".equals(entity.getDbType())) { if ("3".equals(entity.getDbType())) {

79
service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
View File

@ -2511,35 +2511,84 @@ public class MdmServiceImpl implements IMdmService {
mdmDataDto.setTableName(mdmModuleDbEntityList.get(i).getDbName()); mdmDataDto.setTableName(mdmModuleDbEntityList.get(i).getDbName());
List<MdmDataFiledDto> mdmDataFiledDtos = new ArrayList<>(); List<MdmDataFiledDto> mdmDataFiledDtos = new ArrayList<>();
for (int i1 = 0; i1 < fileds.size(); i1++) { for (int i1 = 0; i1 < fileds.size(); i1++) {
if("id".equals(fileds.get(i1).getEnName())){
if (jsonObject.getString("id") != null) {
MdmDataFiledDto ids = new MdmDataFiledDto();
ids.setFiledsName("id");
ids.setFiledsValue(jsonObject.getString("id"));
mdmDataFiledDtos.add(ids);
} else {
MdmDataFiledDto ids = new MdmDataFiledDto();
ids.setFiledsName("id");
ids.setFiledsValue(UUIDUtils.getUUID());
mdmDataFiledDtos.add(ids);
}
}else if("formmain_id".equals(fileds.get(i1).getEnName())){
MdmDataFiledDto formain_id = new MdmDataFiledDto();
formain_id.setFiledsName("formmain_id");
formain_id.setFiledsValue(id);
mdmDataFiledDtos.add(formain_id);
}else if("data_status".equals(fileds.get(i1).getEnName())){
if (jsonObject.getString("id") != null) {
MdmDataFiledDto ids = new MdmDataFiledDto();
ids.setFiledsName("data_status");
ids.setFiledsValue("F");
mdmDataFiledDtos.add(ids);
} else {
MdmDataFiledDto ids = new MdmDataFiledDto();
ids.setFiledsName("data_status");
ids.setFiledsValue("Y");
mdmDataFiledDtos.add(ids);
}
}else if("sorts".equals(fileds.get(i1).getEnName())){
}else if("create_user_id".equals(fileds.get(i1).getEnName())){
//if (jsonObject.getString("id") != null) {
//
//} else {
// MdmDataFiledDto ids = new MdmDataFiledDto();
// ids.setFiledsName("create_user_id");
// ids.setFiledsValue(UUIDUtils.getUUID());
// mdmDataFiledDtos.add(ids);
//}
}else if("create_time".equals(fileds.get(i1).getEnName())){
}else if("modify_user_id".equals(fileds.get(i1).getEnName())){
//MdmDataFiledDto ids = new MdmDataFiledDto();
//ids.setFiledsName("modify_user_id");
//ids.setFiledsValue(UUIDUtils.getUUID());
//mdmDataFiledDtos.add(ids);
}else if("company_id".equals(fileds.get(i1).getEnName())){
MdmDataFiledDto ids = new MdmDataFiledDto();
ids.setFiledsName("company_id");
ids.setFiledsValue("0");
mdmDataFiledDtos.add(ids);
}else if("org_id".equals(fileds.get(i1).getEnName())){
MdmDataFiledDto ids = new MdmDataFiledDto();
ids.setFiledsName("org_id");
ids.setFiledsValue("0");
mdmDataFiledDtos.add(ids);
}else if("modify_time".equals(fileds.get(i1).getEnName())){
}else if("sts".equals(fileds.get(i1).getEnName())){
}else {
MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto(); MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto();
mdmDataFiledDto.setFiledsName(fileds.get(i1).getEnName()); mdmDataFiledDto.setFiledsName(fileds.get(i1).getEnName());
mdmDataFiledDto.setFiledsValue(jsonObject.getString(fileds.get(i1).getEnName())); mdmDataFiledDto.setFiledsValue(jsonObject.getString(fileds.get(i1).getEnName()));
mdmDataFiledDtos.add(mdmDataFiledDto); mdmDataFiledDtos.add(mdmDataFiledDto);
} }
}
MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto(); MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto();
mdmDataFiledDto.setFiledsName("logid"); mdmDataFiledDto.setFiledsName("logid");
mdmDataFiledDto.setFiledsValue(StpUtil.getLoginIdAsString()); mdmDataFiledDto.setFiledsValue(StpUtil.getLoginIdAsString());
mdmDataFiledDtos.add(mdmDataFiledDto); mdmDataFiledDtos.add(mdmDataFiledDto);
MdmDataFiledDto formain_id = new MdmDataFiledDto();
formain_id.setFiledsName("formmain_id");
formain_id.setFiledsValue(id);
mdmDataFiledDtos.add(formain_id);
mdmDataDto.setMdmDataFiledDtos(mdmDataFiledDtos); mdmDataDto.setMdmDataFiledDtos(mdmDataFiledDtos);
if (jsonObject.getString("id") != null) { if (jsonObject.getString("id") != null) {
MdmDataFiledDto sts = new MdmDataFiledDto();
sts.setFiledsName("sts");
sts.setFiledsValue("Y");
mdmDataFiledDtos.add(sts);
mdmDataDto.setId(jsonObject.getString("id")); mdmDataDto.setId(jsonObject.getString("id"));
int a = mdmModuleDao.updateForm(mdmDataDto); int a = mdmModuleDao.updateForm(mdmDataDto);
} else { } else {
MdmDataFiledDto ids = new MdmDataFiledDto();
ids.setFiledsName("id");
ids.setFiledsValue(UUIDUtils.getUUID());
mdmDataFiledDtos.add(ids);
mdmDataDto.setMdmDataFiledDtos(mdmDataFiledDtos);
mdmDataDto.setDbType(mdmModuleDbEntityList.get(i).getDbType()); mdmDataDto.setDbType(mdmModuleDbEntityList.get(i).getDbType());
int a = mdmModuleDao.saveForm(mdmDataDto); int a = mdmModuleDao.saveForm(mdmDataDto);
} }
@ -2547,9 +2596,7 @@ public class MdmServiceImpl implements IMdmService {
} }
} }
} }
saveOption(dbname,mdmCode,saveData,id,msg); saveOption(dbname,mdmCode,saveData,id,msg);
} }
return str.toString(); return str.toString();
} }

27
service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
View File

@ -225,8 +225,8 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
//接口环境参数表 sys_application_api_para //接口环境参数表 sys_application_api_para
saveApiPara(entity, olderAppId); saveApiPara(entity, olderAppId);
//数据源表 sys_application_database //数据源表不保存，可能出现数据源编号重复问题 sys_application_database
saveDatabase(entity, olderAppId); //saveDatabase(entity, olderAppId);
//插件表 sys_application_plugin //插件表 sys_application_plugin
savePlugin(entity, olderAppId); savePlugin(entity, olderAppId);
@ -517,6 +517,27 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
if (entity.getUpdateType() == null || "".equals(entity.getUpdateType())) { if (entity.getUpdateType() == null || "".equals(entity.getUpdateType())) {
return BaseResult.getFailureMessageEntity("系统错误"); return BaseResult.getFailureMessageEntity("系统错误");
} }
//查看数据源编码是否存在
SysApplicationDatabaseEntity detailEntity = entity.getDatabaseEntity();
if(detailEntity != null && detailEntity.getSourceCode() != null && !"".equals(detailEntity.getSourceCode())){
SysApplicationDatabaseEntity checkData = new SysApplicationDatabaseEntity();
checkData.setSourceCode(detailEntity.getSourceCode());
checkData.setSts("Y");
List<SysApplicationDatabaseEntity> sysApplicationDatabaseEntities = sysApplicationDatabaseDao.queryBase(checkData);
if(detailEntity.getId() != null && !"".equals(detailEntity.getId())){
if(sysApplicationDatabaseEntities != null && sysApplicationDatabaseEntities.size() > 0){
for (int i = 0; i < sysApplicationDatabaseEntities.size(); i++) {
if(!detailEntity.getId().equals(sysApplicationDatabaseEntities.get(i).getId())){
return BaseResult.getFailureMessageEntity("数据源编码已经存在，请修改");
}
}
}
}else {
if(sysApplicationDatabaseEntities != null && sysApplicationDatabaseEntities.size() > 0){
return BaseResult.getFailureMessageEntity("数据源编码已经存在，请修改");
}
}
}
//修改应用基本信息 //修改应用基本信息
SysApplicationEntity sysApplicationEntity = doUpdateApp(entity); SysApplicationEntity sysApplicationEntity = doUpdateApp(entity);
if ("2".equals(entity.getUpdateType())) {//开发管理界面，需要保存 接口参数，和数据源 if ("2".equals(entity.getUpdateType())) {//开发管理界面，需要保存 接口参数，和数据源
@ -1691,7 +1712,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
SysApplicationApiEntity receiveApi = getApiByAppIdApiCode(receiveApp.getId(), apiCode); SysApplicationApiEntity receiveApi = getApiByAppIdApiCode(receiveApp.getId(), apiCode);
if (receiveApi == null) { if (receiveApi == null) {
saveLog(sendApp, receiveApp, receiveApi, oldbodys, null, oldheaderMap, null, null, oldquerys, null, null, false,receiveApp.getName() + ":" + apiCode + "未启用或者未创建" ); saveLog(sendApp, receiveApp, new SysApplicationApiEntity(), oldbodys, null, oldheaderMap, null, null, oldquerys, null, null, false,receiveApp.getName() + ":" + apiCode + "未启用或者未创建" );
return BaseResult.getFailureMessageEntity(receiveApp.getName() + ":" + apiCode + "未启用或者未创建"); return BaseResult.getFailureMessageEntity(receiveApp.getName() + ":" + apiCode + "未启用或者未创建");
} }

16
service/src/main/java/com/hzya/frame/web/quartz/QuartzJobFactory.java
View File

@ -4,6 +4,8 @@ package com.hzya.frame.web.quartz;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.base.PluginBaseEntity; import com.hzya.frame.base.PluginBaseEntity;
import com.hzya.frame.sysnew.application.database.dao.ISysApplicationDatabaseDao;
import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity;
import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity; import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity;
import com.hzya.frame.sysnew.integtationTask.IIntegrationTaskCacheableService; import com.hzya.frame.sysnew.integtationTask.IIntegrationTaskCacheableService;
import com.hzya.frame.sysnew.integtationTask.entity.IntegrationTaskEntity; import com.hzya.frame.sysnew.integtationTask.entity.IntegrationTaskEntity;
@ -19,6 +21,7 @@ import org.slf4j.LoggerFactory;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Date; import java.util.Date;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
@ -31,6 +34,8 @@ public class QuartzJobFactory implements Job {
private IIntegrationTaskCacheableService iIntegrationTaskCacheableService; private IIntegrationTaskCacheableService iIntegrationTaskCacheableService;
@Resource @Resource
private IIntegrationTaskLogDao integrationTaskLogDao; private IIntegrationTaskLogDao integrationTaskLogDao;
@Resource
private ISysApplicationDatabaseDao sysApplicationDatabaseDao;
@Override @Override
public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
//当前开始时间 //当前开始时间
@ -103,6 +108,16 @@ public class QuartzJobFactory implements Job {
"2","3","插件未启用，不执行任务",startTime,startTime,new Date()); "2","3","插件未启用，不执行任务",startTime,startTime,new Date());
return; return;
} }
String sourceCode = null;
//查找应用的数据源编码
SysApplicationDatabaseEntity sysApplicationDatabaseEntity = new SysApplicationDatabaseEntity();
sysApplicationDatabaseEntity.setAppId(sysApplicationPluginEntity.getAppId());
sysApplicationDatabaseEntity.setSts("Y");
List<SysApplicationDatabaseEntity> sysApplicationDatabaseEntities = sysApplicationDatabaseDao.queryBase(sysApplicationDatabaseEntity);
if(sysApplicationDatabaseEntities != null && sysApplicationDatabaseEntities.size() == 1){
sourceCode = sysApplicationDatabaseEntities.get(0).getSourceCode();
}
//查找插件 //查找插件
PluginBaseEntity pluginBaseEntity = PluginUtils.getPluginsById(sysApplicationPluginEntity.getPluginCode()); PluginBaseEntity pluginBaseEntity = PluginUtils.getPluginsById(sysApplicationPluginEntity.getPluginCode());
if(pluginBaseEntity == null ){ if(pluginBaseEntity == null ){
@ -114,6 +129,7 @@ public class QuartzJobFactory implements Job {
JSONObject req = new JSONObject(); JSONObject req = new JSONObject();
req.put("startTime",oldStartTime); req.put("startTime",oldStartTime);
req.put("endTime",startTime); req.put("endTime",startTime);
req.put("sourceCode",sourceCode);
try { try {
JsonResultEntity jsonResultEntity = pluginBaseEntity.executeBusiness(req); JsonResultEntity jsonResultEntity = pluginBaseEntity.executeBusiness(req);
if(jsonResultEntity.isFlag()){ if(jsonResultEntity.isFlag()){