ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

当资源库同时存在trans和job时:优化:新建转换的时候只能选择转换,新建job的时候只能选择job

This commit is contained in:
18326186802 2021-07-29 11:31:32 +08:00
parent a1b250e782
commit b2e512aa53
9 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bps-kettle/src/main/java/com/ruoyi/kettle/controller/XRepositoryController.java
View File

@ -57,15 +57,15 @@ public class XRepositoryController extends BaseController
List<XRepository> list = xRepositoryService.selectXRepositoryList(xRepository); List<XRepository> list = xRepositoryService.selectXRepositoryList(xRepository);
return getDataTable(list); return getDataTable(list);
} }
@GetMapping(value = { "/selectRepositoryTree", "/selectRepositoryTree/{excludeId}" }) @GetMapping(value = { "/selectRepositoryTree", "/selectRepositoryTree/{type}" })
public String selectRepositoryTree( @PathVariable(value = "excludeId", required = false) String excludeId, ModelMap mmap) public String selectRepositoryTree( @PathVariable(value = "type", required = false) String type, ModelMap mmap)
{ {
XRepository r=new XRepository(); XRepository r=new XRepository();
List<XRepository> repoTree = xRepositoryService.selectXRepositoryList(r); List<XRepository> repoTree = xRepositoryService.selectXRepositoryList(r);
XRepository repository=xRepositoryService.selectXRepositoryById(2L); //XRepository repository=xRepositoryService.selectXRepositoryById(2L);
mmap.put("repository", repository); //mmap.put("repository", repository);
mmap.put("repoTree", repoTree); mmap.put("repoTree", repoTree);
mmap.put("excludeId", excludeId); mmap.put("type", type);
return "kettle/common/repository_tree"; return "kettle/common/repository_tree";
} }
@GetMapping("/repositoryRoot") @GetMapping("/repositoryRoot")
@ -75,10 +75,10 @@ public class XRepositoryController extends BaseController
List<RepoTree> ztrees = xRepositoryService.selectRepoRoot(new XRepository()); List<RepoTree> ztrees = xRepositoryService.selectRepoRoot(new XRepository());
return ztrees; return ztrees;
} }
@PostMapping("/qryRepoSubTree/{id}") @PostMapping("/qryRepoSubTree/{id}/{type}")
@ResponseBody @ResponseBody
public List<RepoTree> qryRepoSubTree(@PathVariable("id") Long id, ModelMap mmapy) { public List<RepoTree> qryRepoSubTree(@PathVariable("id") Long id,@PathVariable("type") String type, ModelMap mmapy) {
List<RepoTree> ztrees = xRepositoryService.selectRepoTree(id); List<RepoTree> ztrees = xRepositoryService.selectRepoTree(id,type);
return ztrees; return ztrees;
} }
/** /**

12
bps-kettle/src/main/java/com/ruoyi/kettle/repo/XRepoManager.java
View File

@ -26,15 +26,15 @@ public class XRepoManager {
public XRepoManager() { public XRepoManager() {
} }
public static List<RepositoryTree> getAllDirectoryTreeList(String repoId, Repository repository, String path, List<RepositoryTree> allRepositoryTreeList) throws KettleException { public static List<RepositoryTree> getAllDirectoryTreeList(String repoId, Repository repository, String path, List<RepositoryTree> allRepositoryTreeList,String type) throws KettleException {
List<RepositoryTree> repositoryTreeList = getJobAndTrans(repoId, repository, path); List<RepositoryTree> repositoryTreeList = getJobAndTrans(repoId, repository, path,type);
if (repositoryTreeList.size() != 0) { if (repositoryTreeList.size() != 0) {
Iterator var5 = repositoryTreeList.iterator(); Iterator var5 = repositoryTreeList.iterator();
while(var5.hasNext()) { while(var5.hasNext()) {
RepositoryTree repositoryTree = (RepositoryTree)var5.next(); RepositoryTree repositoryTree = (RepositoryTree)var5.next();
if (!repositoryTree.isLasted()) { if (!repositoryTree.isLasted()) {
getAllDirectoryTreeList(repoId, repository, repositoryTree.getPath(), allRepositoryTreeList); getAllDirectoryTreeList(repoId, repository, repositoryTree.getPath(), allRepositoryTreeList,type);
allRepositoryTreeList.add(repositoryTree); allRepositoryTreeList.add(repositoryTree);
} else { } else {
allRepositoryTreeList.add(repositoryTree); allRepositoryTreeList.add(repositoryTree);
@ -44,7 +44,7 @@ public class XRepoManager {
return allRepositoryTreeList; return allRepositoryTreeList;
} }
public static List<RepositoryTree> getJobAndTrans(String repoId, Repository repository, String path) throws KettleException { public static List<RepositoryTree> getJobAndTrans(String repoId, Repository repository, String path,String type) throws KettleException {
RepositoryDirectoryInterface rDirectory = repository.loadRepositoryDirectoryTree().findDirectory(path); RepositoryDirectoryInterface rDirectory = repository.loadRepositoryDirectoryTree().findDirectory(path);
List<RepositoryTree> repositoryTreeList = getDirectory(repoId, repository, rDirectory); List<RepositoryTree> repositoryTreeList = getDirectory(repoId, repository, rDirectory);
List<RepositoryElementMetaInterface> li = repository.getJobAndTransformationObjects(rDirectory.getObjectId(), false); List<RepositoryElementMetaInterface> li = repository.getJobAndTransformationObjects(rDirectory.getObjectId(), false);
@ -55,7 +55,7 @@ public class XRepoManager {
RepositoryElementMetaInterface repel = (RepositoryElementMetaInterface)var6.next(); RepositoryElementMetaInterface repel = (RepositoryElementMetaInterface)var6.next();
RepositoryTree repositoryTree; RepositoryTree repositoryTree;
StringBuilder stringBuilder; StringBuilder stringBuilder;
if ("job".equals(repel.getObjectType().toString())) { if ("job".equals(repel.getObjectType().toString()) && type.equals("job")) {
repositoryTree = new RepositoryTree(); repositoryTree = new RepositoryTree();
stringBuilder = new StringBuilder(); stringBuilder = new StringBuilder();
stringBuilder.append("job").append(rDirectory.getObjectId().toString()).append("@").append(repel.getObjectId().toString()); stringBuilder.append("job").append(rDirectory.getObjectId().toString()).append("@").append(repel.getObjectId().toString());
@ -71,7 +71,7 @@ public class XRepoManager {
repositoryTree.setLasted(true); repositoryTree.setLasted(true);
repositoryTree.setPath(repel.getRepositoryDirectory().getPath()); repositoryTree.setPath(repel.getRepositoryDirectory().getPath());
repositoryTreeList.add(repositoryTree); repositoryTreeList.add(repositoryTree);
} else if ("transformation".equals(repel.getObjectType().toString())) { } else if ("transformation".equals(repel.getObjectType().toString())&& type.equals("trans")) {
repositoryTree = new RepositoryTree(); repositoryTree = new RepositoryTree();
stringBuilder = new StringBuilder(); stringBuilder = new StringBuilder();
stringBuilder.append("transformation").append(rDirectory.getObjectId().toString()).append("@").append(repel.getObjectId().toString()); stringBuilder.append("transformation").append(rDirectory.getObjectId().toString()).append("@").append(repel.getObjectId().toString());

2
bps-kettle/src/main/java/com/ruoyi/kettle/service/IXRepositoryService.java
View File

@ -63,7 +63,7 @@ public interface IXRepositoryService
*/ */
public int deleteXRepositoryById(Long id); public int deleteXRepositoryById(Long id);
List<RepoTree> selectRepoTree(Long id); List<RepoTree> selectRepoTree(Long id,String type);
List<RepoTree> selectRepoRoot(XRepository repository); List<RepoTree> selectRepoRoot(XRepository repository);
} }

8
bps-kettle/src/main/java/com/ruoyi/kettle/service/impl/KettleTransServiceImpl.java
View File

@ -177,7 +177,13 @@ public class KettleTransServiceImpl implements IKettleTransService
return AjaxResult.success("执行成功!"); return AjaxResult.success("执行成功!");
} }
/**
* @Description:查询抓换执行日志
* @Author: Kone.wang
* @Date: 2021/7/28 16:24
* @param kettleTrans:
* @return: java.util.List<java.lang.String>
**/
@Override @Override
public List<String> queryTransLog(KettleTrans kettleTrans) { public List<String> queryTransLog(KettleTrans kettleTrans) {
List<String> transLogs=kettleTransMapper.queryTransLog(kettleTrans.getTransName()); List<String> transLogs=kettleTransMapper.queryTransLog(kettleTrans.getTransName());

9
bps-kettle/src/main/java/com/ruoyi/kettle/service/impl/XRepositoryServiceImpl.java
View File

@ -124,11 +124,10 @@ public class XRepositoryServiceImpl implements IXRepositoryService
} }
@Override @Override
public List<RepoTree> selectRepoTree(Long id) { public List<RepoTree> selectRepoTree(Long id,String type) {
XRepository xrs = xRepositoryMapper.selectXRepositoryById(id); XRepository xrs = xRepositoryMapper.selectXRepositoryById(id);
List<RepositoryTree> repositoryTrees = getRepoTress(xrs); List<RepositoryTree> repositoryTrees = getRepoTress(xrs,type);
List<RepositoryTree> subTrees = new ArrayList<>(); List<RepositoryTree> subTrees = new ArrayList<>();
String type=null;
String pId=String.valueOf(xrs.getId()); String pId=String.valueOf(xrs.getId());
// try // try
// { // {
@ -192,7 +191,7 @@ public class XRepositoryServiceImpl implements IXRepositoryService
} }
return ztrees; return ztrees;
} }
private List<RepositoryTree> getRepoTress(XRepository xr) { private List<RepositoryTree> getRepoTress(XRepository xr,String jobortrans) {
List<RepositoryTree> repositoryTrees = new ArrayList<>(); List<RepositoryTree> repositoryTrees = new ArrayList<>();
List<XRepository> xRepositoryList =xRepositoryMapper.selectXRepositoryList(xr); List<XRepository> xRepositoryList =xRepositoryMapper.selectXRepositoryList(xr);
@ -208,7 +207,7 @@ public class XRepositoryServiceImpl implements IXRepositoryService
try { try {
KettleFileRepository repository = (KettleFileRepository) KettleUtil_2. KettleFileRepository repository = (KettleFileRepository) KettleUtil_2.
conFileRep(String.valueOf(item.getId()), item.getRepoName(), baseDir); conFileRep(String.valueOf(item.getId()), item.getRepoName(), baseDir);
XRepoManager.getAllDirectoryTreeList(String.valueOf(item.getId()), repository, "/", tmpRepositoryList); XRepoManager.getAllDirectoryTreeList(String.valueOf(item.getId()), repository, "/", tmpRepositoryList,jobortrans);
if (tmpRepositoryList.size() > 0) { if (tmpRepositoryList.size() > 0) {
RepositoryDirectoryInterface rDirectory = repository.loadRepositoryDirectoryTree().findDirectory("/"); RepositoryDirectoryInterface rDirectory = repository.loadRepositoryDirectoryTree().findDirectory("/");
RepositoryTree repositoryTree = new RepositoryTree(); RepositoryTree repositoryTree = new RepositoryTree();

6
bps-kettle/src/main/java/com/ruoyi/kettle/tools/KettleUtil.java
View File

@ -43,9 +43,7 @@ public class KettleUtil {
public void callTrans(String transPath, String transName, Map<String,String> namedParams, String[] clParams) throws Exception { public void callTrans(String transPath, String transName, Map<String,String> namedParams, String[] clParams) throws Exception {
KettleEnv.init(); KettleEnv.init();
DatabaseMeta databaseMeta=new DatabaseMeta("kettle_trans_log", "mysql", "Native(JDBC)", DatabaseMeta databaseMeta=new DatabaseMeta("kettle_trans_log", "mysql", "Native(JDBC)",
"192.168.2.18","bps?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8", "3306", "root", "abc.123"); "xxx.xxx.x.xx","bps?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8", "3306", "root", "password");
// DatabaseMeta databaseMeta=new DatabaseMeta("kettle_trans_log", "mysql", "Native(JDBC)",
// "127.0.0.1","etl?useUniCode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=UTC","3306","root","2129");
String msg; String msg;
KettleFileRepository repo = this.fileRepositoryCon(); KettleFileRepository repo = this.fileRepositoryCon();
@ -100,7 +98,7 @@ public class KettleUtil {
KettleEnv.init(); KettleEnv.init();
String msg; String msg;
DatabaseMeta databaseMeta=new DatabaseMeta("kettle_job_log", "mysql", "Native(JDBC)", DatabaseMeta databaseMeta=new DatabaseMeta("kettle_job_log", "mysql", "Native(JDBC)",
"192.168.2.18","bps?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8", "3306", "root", "abc.123"); "xxx.xxx.x.xx","bps?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8", "3306", "root", "password");
KettleFileRepository repo = this.fileRepositoryCon(); KettleFileRepository repo = this.fileRepositoryCon();
JobMeta jobMeta = this.loadJob(repo, jobPath, jobName); JobMeta jobMeta = this.loadJob(repo, jobPath, jobName);
jobMeta.addDatabase(databaseMeta); jobMeta.addDatabase(databaseMeta);

7
bps-kettle/src/main/resources/templates/kettle/common/repository_tree.html
View File

@ -32,9 +32,9 @@
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "kettle/repository" var prefix = ctx + "kettle/repository"
var deptId = [[${deptId}]]; var deptId = [[${deptId}]];
var excludeId = [[${excludeId}]]; var type = [[${type}]];
$(function() { $(function() {
var url = $.common.isEmpty(excludeId) ? prefix + "/repositoryRoot": prefix + "/repositoryRoot/" + excludeId; var url = prefix + "/repositoryRoot";
var options = { var options = {
url: url, url: url,
expandLevel: 2, expandLevel: 2,
@ -70,8 +70,7 @@
function qryRepoSubTree(treeId){ function qryRepoSubTree(treeId){
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: prefix+ "/qryRepoSubTree/"+treeId, url: prefix+ "/qryRepoSubTree/"+treeId+"/"+type,
//data: {"id":treeId},
contentType: "application/json", contentType: "application/json",
dataType: "json", dataType: "json",
success: function (data) { success: function (data) {

3
bps-kettle/src/main/resources/templates/kettle/job/add.html
View File

@ -83,8 +83,9 @@
}); });
function chooseJob(){ function chooseJob(){
var treeId = $("#treeId").val(); var treeId = $("#treeId").val();
var type="job";
//var repoid = $.common.isEmpty(treeId) ? "999999" : $("#treeId").val(); //var repoid = $.common.isEmpty(treeId) ? "999999" : $("#treeId").val();
var url = ctx + "kettle/repository/selectRepositoryTree/" var url = ctx + "kettle/repository/selectRepositoryTree/"+type
var options = { var options = {
title: '选择资源库', title: '选择资源库',
width: "380", width: "380",

3
bps-kettle/src/main/resources/templates/kettle/trans/add.html
View File

@ -117,7 +117,8 @@
function chooseTrans(){ function chooseTrans(){
var treeId = $("#treeId").val(); var treeId = $("#treeId").val();
//var repoid = $.common.isEmpty(treeId) ? "999999" : $("#treeId").val(); //var repoid = $.common.isEmpty(treeId) ? "999999" : $("#treeId").val();
var url = ctx + "kettle/repository/selectRepositoryTree/" var type="trans";
var url = ctx + "kettle/repository/selectRepositoryTree/"+type
var options = { var options = {
title: '选择资源库', title: '选择资源库',
width: "380", width: "380",