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

任务计划，添加查询数据源

This commit is contained in:
lvleigang 2024-06-24 17:48:12 +08:00
parent e3a6525c73
commit 08e0a56099
2 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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
saveApiPara(entity, olderAppId);
//数据源表 sys_application_database
saveDatabase(entity, olderAppId);
//数据源表不保存，可能出现数据源编号重复问题 sys_application_database
//saveDatabase(entity, olderAppId);
//插件表 sys_application_plugin
savePlugin(entity, olderAppId);
@ -517,6 +517,27 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
if (entity.getUpdateType() == null || "".equals(entity.getUpdateType())) {
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);
if ("2".equals(entity.getUpdateType())) {//开发管理界面，需要保存 接口参数，和数据源
@ -1691,7 +1712,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
SysApplicationApiEntity receiveApi = getApiByAppIdApiCode(receiveApp.getId(), apiCode);
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 + "未启用或者未创建");
}

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.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.integtationTask.IIntegrationTaskCacheableService;
import com.hzya.frame.sysnew.integtationTask.entity.IntegrationTaskEntity;
@ -19,6 +21,7 @@ import org.slf4j.LoggerFactory;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
@ -31,6 +34,8 @@ public class QuartzJobFactory implements Job {
private IIntegrationTaskCacheableService iIntegrationTaskCacheableService;
@Resource
private IIntegrationTaskLogDao integrationTaskLogDao;
@Resource
private ISysApplicationDatabaseDao sysApplicationDatabaseDao;
@Override
public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
//当前开始时间
@ -103,6 +108,16 @@ public class QuartzJobFactory implements Job {
"2","3","插件未启用，不执行任务",startTime,startTime,new Date());
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());
if(pluginBaseEntity == null ){
@ -114,6 +129,7 @@ public class QuartzJobFactory implements Job {
JSONObject req = new JSONObject();
req.put("startTime",oldStartTime);
req.put("endTime",startTime);
req.put("sourceCode",sourceCode);
try {
JsonResultEntity jsonResultEntity = pluginBaseEntity.executeBusiness(req);
if(jsonResultEntity.isFlag()){