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

增加app_id字段 

账户详情接口
This commit is contained in:
xiang2lin 2025-05-26 16:35:47 +08:00
parent 011f3e2a84
commit da1820e368
3 changed files with 89 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepConfigEntity.java
View File

@ -35,6 +35,8 @@ public class SysFlowStepConfigEntity extends BaseEntity {
/** 动态sql语句 */
private String sqlStatement;
//步骤账户表id
private String stepAccountId;
public String getFlowId() {
return flowId;
@ -132,5 +134,12 @@ public class SysFlowStepConfigEntity extends BaseEntity {
this.sqlStatement = sqlStatement;
}
public String getStepAccountId() {
return stepAccountId;
}
public void setStepAccountId(String stepAccountId) {
this.stepAccountId = stepAccountId;
}
}

55
base-service/src/main/java/com/hzya/frame/sys/flow/service/impl/SysFlowStepAccountServiceImpl.java
View File

@ -8,8 +8,11 @@ import com.hzya.frame.serviceUtil.DsDataSourceUtil;
import com.hzya.frame.sys.flow.entity.SysFlowStepAccountEntity;
import com.hzya.frame.sys.flow.dao.ISysFlowStepAccountDao;
import com.hzya.frame.sys.flow.service.ISysFlowStepAccountService;
import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity;
import com.hzya.frame.sysnew.application.database.service.ISysApplicationDatabaseService;
import com.hzya.frame.web.entity.BaseResult;
import com.hzya.frame.web.entity.JsonResultEntity;
import com.hzya.frame.web.exception.BaseSystemException;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
@ -34,6 +37,8 @@ public class SysFlowStepAccountServiceImpl extends BaseService<SysFlowStepAccoun
private ISysFlowStepAccountDao sysFlowStepAccountDao;
@Resource
private DsDataSourceUtil dsDataSourceUtil;
@Autowired
private ISysApplicationDatabaseService sysApplicationDatabaseService;
@Autowired
public void setSysFlowStepAccountDao(ISysFlowStepAccountDao dao) {
@ -53,18 +58,50 @@ public class SysFlowStepAccountServiceImpl extends BaseService<SysFlowStepAccoun
SysFlowStepAccountEntity entity = getData("jsonStr", object, SysFlowStepAccountEntity.class);
try {
checkParam(entity, "save");
} catch (Exception e) {
return BaseResult.getFailureMessageEntity(e.getMessage());
}
//控制一下名字不能重复
List<SysFlowStepAccountEntity> queryList = queryByName(entity);
if (CollectionUtils.isNotEmpty(queryList) && queryList.size() > 0) {
return BaseResult.getFailureMessageEntity(entity.getName() + "重复");
}
sysFlowStepAccountDao.save(entity);
//保存数据源表，测试sql的时候要用动态数据源，动态数据源是从sys_application_database表查数据的
saveOrDataBase(entity);
} catch (Exception e) {
return BaseResult.getFailureMessageEntity(e.getMessage());
}
return BaseResult.getSuccessMessageEntity("新增成功");
}
/**
* 保存数据源表，测试sql的时候要用动态数据源，动态数据源是从sys_application_database表查数据的
*
* @param entity
*/
private void saveOrDataBase(SysFlowStepAccountEntity entity) throws Exception {
Assert.notNull(entity, "参数不能为空");
Assert.notEmpty(entity.getName(), "账户名称不能为空");
SysApplicationDatabaseEntity db = new SysApplicationDatabaseEntity();
db.setSourceCode(entity.getName() + "_flow");
List<SysApplicationDatabaseEntity> queryList = sysApplicationDatabaseService.query(db);
if (CollectionUtils.isNotEmpty(queryList)) {
for (SysApplicationDatabaseEntity sys : queryList) {
sysApplicationDatabaseService.logicRemove(sys);
}
}
SysApplicationDatabaseEntity databaseEntity = new SysApplicationDatabaseEntity();
databaseEntity.setAppId(entity.getAppId());
databaseEntity.setSourceCode(entity.getName() + "_flow");
databaseEntity.setSourceName(entity.getName());
databaseEntity.setSourceType(entity.getDbType());
databaseEntity.setSourceIp(entity.getIpAddress());
databaseEntity.setSourcePort(entity.getPort());
databaseEntity.setLoginName(entity.getUserName());
databaseEntity.setPassword(entity.getPassword());
databaseEntity.setDbName(entity.getDbName());
databaseEntity.setDbStatus("1");
sysApplicationDatabaseService.save(databaseEntity);
}
/**
* 更新账户信息
*
@ -76,9 +113,6 @@ public class SysFlowStepAccountServiceImpl extends BaseService<SysFlowStepAccoun
SysFlowStepAccountEntity entity = getData("jsonStr", object, SysFlowStepAccountEntity.class);
try {
checkParam(entity, "update");
} catch (Exception e) {
return BaseResult.getFailureMessageEntity(e.getMessage());
}
//检查一下名字不能重复
List<SysFlowStepAccountEntity> queryList = queryByName(entity);
if (CollectionUtils.isNotEmpty(queryList) && queryList.size() > 0) {
@ -89,6 +123,11 @@ public class SysFlowStepAccountServiceImpl extends BaseService<SysFlowStepAccoun
}
}
sysFlowStepAccountDao.update(entity);
//保存数据源表，测试sql的时候要用动态数据源，动态数据源是从sys_application_database表查数据的
saveOrDataBase(entity);
} catch (Exception e) {
return BaseResult.getFailureMessageEntity(e.getMessage());
}
return BaseResult.getSuccessMessageEntity("更新成功");
}
@ -206,9 +245,9 @@ public class SysFlowStepAccountServiceImpl extends BaseService<SysFlowStepAccoun
//测试连接
Class.forName(driveClass);
Connection connection = DriverManager.getConnection(sourceUrl.toString(), entity.getUserName(), entity.getPassword());// 相当于连接数据库
if (null != connection){
if (null != connection) {
return BaseResult.getSuccessMessageEntity("验证成功");
}else {
} else {
return BaseResult.getFailureMessageEntity("验证失败");
}
}

24
base-service/src/main/java/com/hzya/frame/sys/flow/service/impl/SysFlowStepConfigServiceImpl.java
View File

@ -2,17 +2,26 @@ package com.hzya.frame.sys.flow.service.impl;
import cn.hutool.core.lang.Assert;
import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.sys.flow.entity.SysFlowStepAccountEntity;
import com.hzya.frame.sys.flow.entity.SysFlowStepConfigEntity;
import com.hzya.frame.sys.flow.dao.ISysFlowStepConfigDao;
import com.hzya.frame.sys.flow.service.ISysFlowStepAccountService;
import com.hzya.frame.sys.flow.service.ISysFlowStepConfigService;
import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity;
import com.hzya.frame.sysnew.application.database.service.ISysApplicationDatabaseService;
import com.hzya.frame.web.entity.BaseResult;
import com.hzya.frame.web.entity.JsonResultEntity;
import com.hzya.frame.web.exception.BaseSystemException;
import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource;
import com.hzya.frame.basedao.service.impl.BaseService;
import java.util.List;
/**
* 映射信息主表(SysFlowStepConfig)表服务实现类
*
@ -24,7 +33,10 @@ public class SysFlowStepConfigServiceImpl extends BaseService<SysFlowStepConfigE
Logger logger = LoggerFactory.getLogger(ISysFlowStepConfigService.class);
private ISysFlowStepConfigDao sysFlowStepConfigDao;
@Autowired
private ISysFlowStepAccountService sysFlowStepAccountService;
@Autowired
private ISysApplicationDatabaseService sysApplicationDatabaseService;
@Autowired
public void setSysFlowStepConfigDao(ISysFlowStepConfigDao dao) {
this.sysFlowStepConfigDao = dao;
@ -45,6 +57,15 @@ public class SysFlowStepConfigServiceImpl extends BaseService<SysFlowStepConfigE
}catch (Exception e){
return BaseResult.getFailureMessageEntity(e.getMessage());
}
SysFlowStepAccountEntity accountEntity = sysFlowStepAccountService.get(config.getId());
Assert.notNull(accountEntity,"没有找到对应账户");
//查询数据源
SysApplicationDatabaseEntity database = new SysApplicationDatabaseEntity();
database.setSourceCode(accountEntity.getName()+"_flow");
List<SysApplicationDatabaseEntity> databaseList = sysApplicationDatabaseService.query(database);
if (CollectionUtils.isEmpty(databaseList)){
throw new BaseSystemException("没有找到数据源");
}
return null;
}
@ -56,5 +77,6 @@ public class SysFlowStepConfigServiceImpl extends BaseService<SysFlowStepConfigE
private void checkParams(SysFlowStepConfigEntity entity, String type) {
Assert.notNull(entity,"参数不能为空");
Assert.notEmpty(entity.getTableName(),"tabName不能为空");
Assert.notEmpty(entity.getStepAccountId(),"tabName不能为空");
}
}