diff --git "a/docs/zh_CN/ch4/DSS\345\267\245\347\250\213\345\217\221\345\270\203\350\260\203\345\272\246\347\263\273\347\273\237\346\236\266\346\236\204\350\256\276\350\256\241.md" "b/docs/zh_CN/ch4/DSS\345\267\245\347\250\213\345\217\221\345\270\203\350\260\203\345\272\246\347\263\273\347\273\237\346\236\266\346\236\204\350\256\276\350\256\241.md" index 14dbccac55..1dc37857d7 100644 --- "a/docs/zh_CN/ch4/DSS\345\267\245\347\250\213\345\217\221\345\270\203\350\260\203\345\272\246\347\263\273\347\273\237\346\236\266\346\236\204\350\256\276\350\256\241.md" +++ "b/docs/zh_CN/ch4/DSS\345\267\245\347\250\213\345\217\221\345\270\203\350\260\203\345\272\246\347\263\273\347\273\237\346\236\266\346\236\204\350\256\276\350\256\241.md" @@ -17,10 +17,10 @@ （1）从数据库读取最新版本的工程、工作流信息，获取所有的保存在BML库工作流JSON文件。 -（2）将上面的数据库内容，JSON文件内容分别转成DSS中的DWSProject，DWSFlow，如果存在子flow，则需要一并设置到flow中，保持原来的层级关系和依赖关系，构建好DWSProject，其中包含了工程下所有的DWSFlow。 +（2）将上面的数据库内容，JSON文件内容分别转成DSS中的DSSProject，DSSFlow，如果存在子flow，则需要一并设置到flow中，保持原来的层级关系和依赖关系，构建好DSSProject，其中包含了工程下所有的DSSFlow。 一个工作流JSON包含了所有节点的定义，并存储了节点之间的依赖关系，以及工作流自身的属性信息。 -（3）将DWSProject经过工程转换器转成SchedulerProject，转成SchedulerProject的过程中，同时完成了DWSJSONFlow到SchedulerFlow的转换，也完成了DWSNode到SchedulerNode的转换。 +（3）将DSSProject经过工程转换器转成SchedulerProject，转成SchedulerProject的过程中，同时完成了DSSJSONFlow到SchedulerFlow的转换，也完成了DSSNode到SchedulerNode的转换。 （4）使用ProjectTuning对整个SchedulerProject工程进行tuning操作，用于完成工程发布前的整体调整操作，在Azkaban的实现中主要完成了工程的路径设置和工作流的存储路径设置。 diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/DWSUserMapper.java b/dss-application/src/main/java/com/webank/wedatasphere/dss/application/dao/DSSApplicationUserMapper.java similarity index 63% rename from dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/DWSUserMapper.java rename to dss-application/src/main/java/com/webank/wedatasphere/dss/application/dao/DSSApplicationUserMapper.java index 25daa48acb..f2f59e06b1 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/DWSUserMapper.java +++ b/dss-application/src/main/java/com/webank/wedatasphere/dss/application/dao/DSSApplicationUserMapper.java @@ -15,13 +15,17 @@ * */ -package com.webank.wedatasphere.dss.server.dao; +package com.webank.wedatasphere.dss.application.dao; -import org.apache.ibatis.annotations.Mapper; +import com.webank.wedatasphere.dss.application.entity.DSSUser; +/** + * Created by chaogefeng on 2019/10/11. + */ +public interface DSSApplicationUserMapper { + DSSUser getUserByName(String username); -public interface DWSUserMapper { - Long getUserID(String userName); + void registerDssUser(DSSUser userDb); - String getuserName(Long userID); + void updateUserFirstLogin(Long userId); } diff --git a/dss-application/src/main/java/com/webank/wedatasphere/dss/application/dao/impl/DSSUserMapper.xml b/dss-application/src/main/java/com/webank/wedatasphere/dss/application/dao/impl/DSSApplicationUserMapper.xml similarity index 98% rename from dss-application/src/main/java/com/webank/wedatasphere/dss/application/dao/impl/DSSUserMapper.xml rename to dss-application/src/main/java/com/webank/wedatasphere/dss/application/dao/impl/DSSApplicationUserMapper.xml index ff731d7c64..39754b7b63 100644 --- a/dss-application/src/main/java/com/webank/wedatasphere/dss/application/dao/impl/DSSUserMapper.xml +++ b/dss-application/src/main/java/com/webank/wedatasphere/dss/application/dao/impl/DSSApplicationUserMapper.xml @@ -19,7 +19,7 @@ - + id,`username`,`name`,`is_first_login` diff --git a/dss-application/src/main/java/com/webank/wedatasphere/dss/application/handler/UserFirstLoginHandler.java b/dss-application/src/main/java/com/webank/wedatasphere/dss/application/handler/UserFirstLoginHandler.java index 5c5a93c775..f902c5ba3d 100644 --- a/dss-application/src/main/java/com/webank/wedatasphere/dss/application/handler/UserFirstLoginHandler.java +++ b/dss-application/src/main/java/com/webank/wedatasphere/dss/application/handler/UserFirstLoginHandler.java @@ -18,7 +18,7 @@ package com.webank.wedatasphere.dss.application.handler; import com.webank.wedatasphere.dss.application.entity.DSSUser; -import com.webank.wedatasphere.dss.application.service.DSSUserService; +import com.webank.wedatasphere.dss.application.service.DSSApplicationUserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -33,7 +33,7 @@ public class UserFirstLoginHandler implements Handler { private Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired - private DSSUserService dssUserService; + private DSSApplicationUserService dssApplicationUserService; @Override public int getOrder() { @@ -44,7 +44,7 @@ public int getOrder() { public void handle(DSSUser user) { logger.info("UserFirstLoginHandler:"); synchronized (user.getUsername().intern()){ - DSSUser userDb = dssUserService.getUserByName(user.getUsername()); + DSSUser userDb = dssApplicationUserService.getUserByName(user.getUsername()); if(userDb == null){ logger.info("User first enter dss, insert table dss_user"); userDb = new DSSUser(); @@ -52,7 +52,7 @@ public void handle(DSSUser user) { userDb.setName(user.getName()); userDb.setFirstLogin(true); userDb.setId(user.getId()); - dssUserService.registerDSSUser(userDb); + dssApplicationUserService.registerDssUser(userDb); } // TODO: 2019/11/29 update firstLogin user = userDb; diff --git a/dss-application/src/main/java/com/webank/wedatasphere/dss/application/restful/ApplicationRestfulApi.java b/dss-application/src/main/java/com/webank/wedatasphere/dss/application/restful/ApplicationRestfulApi.java index c0fa339629..2842487a1c 100644 --- a/dss-application/src/main/java/com/webank/wedatasphere/dss/application/restful/ApplicationRestfulApi.java +++ b/dss-application/src/main/java/com/webank/wedatasphere/dss/application/restful/ApplicationRestfulApi.java @@ -22,7 +22,7 @@ import com.webank.wedatasphere.dss.application.entity.DSSUserVO; import com.webank.wedatasphere.dss.application.handler.ApplicationHandlerChain; import com.webank.wedatasphere.dss.application.service.ApplicationService; -import com.webank.wedatasphere.dss.application.service.DSSUserService; +import com.webank.wedatasphere.dss.application.service.DSSApplicationUserService; import com.webank.wedatasphere.dss.application.util.ApplicationUtils; import com.webank.wedatasphere.linkis.server.Message; import com.webank.wedatasphere.linkis.server.security.SecurityFilter; @@ -51,7 +51,7 @@ public class ApplicationRestfulApi { @Autowired private ApplicationService applicationService; @Autowired - private DSSUserService dataworkisUserService; + private DSSApplicationUserService dataworkisUserService; @Autowired private ApplicationHandlerChain applicationHandlerChain; diff --git a/dss-application/src/main/java/com/webank/wedatasphere/dss/application/service/DSSUserService.java b/dss-application/src/main/java/com/webank/wedatasphere/dss/application/service/DSSApplicationUserService.java similarity index 90% rename from dss-application/src/main/java/com/webank/wedatasphere/dss/application/service/DSSUserService.java rename to dss-application/src/main/java/com/webank/wedatasphere/dss/application/service/DSSApplicationUserService.java index 3333fd4ffe..a798dc4357 100644 --- a/dss-application/src/main/java/com/webank/wedatasphere/dss/application/service/DSSUserService.java +++ b/dss-application/src/main/java/com/webank/wedatasphere/dss/application/service/DSSApplicationUserService.java @@ -22,11 +22,11 @@ /** * Created by chaogefeng on 2019/10/11. */ -public interface DSSUserService { +public interface DSSApplicationUserService { DSSUser getUserByName(String username); - void registerDSSUser(DSSUser userDb); + void registerDssUser(DSSUser userDb); void updateUserFirstLogin(Long id); } diff --git a/dss-application/src/main/java/com/webank/wedatasphere/dss/application/service/impl/DSSUserServiceImpl.java b/dss-application/src/main/java/com/webank/wedatasphere/dss/application/service/impl/DSSApplicationUserServiceImpl.java similarity index 66% rename from dss-application/src/main/java/com/webank/wedatasphere/dss/application/service/impl/DSSUserServiceImpl.java rename to dss-application/src/main/java/com/webank/wedatasphere/dss/application/service/impl/DSSApplicationUserServiceImpl.java index 71db0e5df1..c8fae7a631 100644 --- a/dss-application/src/main/java/com/webank/wedatasphere/dss/application/service/impl/DSSUserServiceImpl.java +++ b/dss-application/src/main/java/com/webank/wedatasphere/dss/application/service/impl/DSSApplicationUserServiceImpl.java @@ -17,9 +17,9 @@ package com.webank.wedatasphere.dss.application.service.impl; -import com.webank.wedatasphere.dss.application.dao.DSSUserMapper; +import com.webank.wedatasphere.dss.application.dao.DSSApplicationUserMapper; import com.webank.wedatasphere.dss.application.entity.DSSUser; -import com.webank.wedatasphere.dss.application.service.DSSUserService; +import com.webank.wedatasphere.dss.application.service.DSSApplicationUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,23 +27,23 @@ * Created by chaogefeng on 2019/10/11. */ @Service -public class DSSUserServiceImpl implements DSSUserService { +public class DSSApplicationUserServiceImpl implements DSSApplicationUserService { @Autowired - private DSSUserMapper dssUserMapper; + private DSSApplicationUserMapper dssApplicationUserMapper; @Override public DSSUser getUserByName(String username) { - return dssUserMapper.getUserByName(username); + return dssApplicationUserMapper.getUserByName(username); } @Override - public void registerDSSUser(DSSUser userDb) { - dssUserMapper.registerDSSUser( userDb); + public void registerDssUser(DSSUser userDb) { + dssApplicationUserMapper.registerDssUser( userDb); } @Override public void updateUserFirstLogin(Long id) { - dssUserMapper.updateUserFirstLogin(id); + dssApplicationUserMapper.updateUserFirstLogin(id); } } diff --git a/dss-application/src/main/java/com/webank/wedatasphere/dss/application/service/impl/LinkisUserServiceImpl.java b/dss-application/src/main/java/com/webank/wedatasphere/dss/application/service/impl/LinkisUserServiceImpl.java index 60f11bdf3d..f40f286ecc 100644 --- a/dss-application/src/main/java/com/webank/wedatasphere/dss/application/service/impl/LinkisUserServiceImpl.java +++ b/dss-application/src/main/java/com/webank/wedatasphere/dss/application/service/impl/LinkisUserServiceImpl.java @@ -16,7 +16,7 @@ */ package com.webank.wedatasphere.dss.application.service.impl; -import com.webank.wedatasphere.dss.application.dao.DSSUserMapper; +import com.webank.wedatasphere.dss.application.dao.DSSApplicationUserMapper; import com.webank.wedatasphere.dss.application.dao.LinkisUserMapper; import com.webank.wedatasphere.dss.application.entity.DSSUser; import com.webank.wedatasphere.dss.application.entity.LinkisUser; @@ -33,7 +33,7 @@ public class LinkisUserServiceImpl implements LinkisUserService { @Autowired private LinkisUserMapper linkisUserMapper; @Autowired - private DSSUserMapper dssUserMapper; + private DSSApplicationUserMapper dssApplicationUserMapper; @Override public LinkisUser getUserByName(String username) { @@ -55,6 +55,6 @@ public void registerDSSUser(LinkisUser userDb) { dssUser.setName(userDb.getName()); dssUser.setUsername(userDb.getUserName()); dssUser.setFirstLogin(userDb.getFirstLogin()); - dssUserMapper.registerDSSUser(dssUser); + dssApplicationUserMapper.registerDssUser(dssUser); } } diff --git a/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/hooks/LinkisAzkabanNodePublishHook.java b/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/hooks/LinkisAzkabanNodePublishHook.java index 852f9a817e..702275f40c 100644 --- a/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/hooks/LinkisAzkabanNodePublishHook.java +++ b/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/hooks/LinkisAzkabanNodePublishHook.java @@ -59,7 +59,7 @@ public void postPublish(SchedulerNode schedulerNode) { } private void writeNodeResourcesToLocal(SchedulerNode schedulerNode) throws DSSErrorException { - List nodeResources = schedulerNode.getDWSNode().getResources(); + List nodeResources = schedulerNode.getDssNode().getResources(); if(nodeResources == null || nodeResources.isEmpty()) {return;} FileOutputStream os = null; try { diff --git a/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/hooks/LinkisAzkabanProjectPublishHook.java b/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/hooks/LinkisAzkabanProjectPublishHook.java index e6eb9dd62c..40effab61b 100644 --- a/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/hooks/LinkisAzkabanProjectPublishHook.java +++ b/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/hooks/LinkisAzkabanProjectPublishHook.java @@ -75,7 +75,7 @@ private void removeProjectStoreDirAndzip(AzkabanSchedulerProject publishProject) } private void writeProjectResourcesToLocal(AzkabanSchedulerProject publishProject)throws DSSErrorException { - List resources = publishProject.getDWSProject().getProjectResources(); + List resources = publishProject.getDssProject().getProjectResources(); FileOutputStream os = null; try { String storePath = publishProject.getStorePath(); diff --git a/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/linkisjob/LinkisJobConverter.java b/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/linkisjob/LinkisJobConverter.java index b13044c6d7..ef6f3f3b1c 100644 --- a/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/linkisjob/LinkisJobConverter.java +++ b/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/linkisjob/LinkisJobConverter.java @@ -79,7 +79,7 @@ private void convertHead(LinkisAzkabanSchedulerNode schedulerNode,LinkisJob job) } private void convertDependencies(LinkisAzkabanSchedulerNode schedulerNode,LinkisJob job){ - List dependencys = schedulerNode.getDWSNode().getDependencys(); + List dependencys = schedulerNode.getDssNode().getDependencys(); if(dependencys != null && !dependencys.isEmpty()) { StringBuilder dependencies = new StringBuilder(); dependencys.forEach(d ->dependencies.append(d + ",")); @@ -88,12 +88,12 @@ private void convertDependencies(LinkisAzkabanSchedulerNode schedulerNode,Linkis } private void convertProxyUser(LinkisAzkabanSchedulerNode schedulerNode,LinkisJob job){ - String userProxy = schedulerNode.getDWSNode().getUserProxy(); + String userProxy = schedulerNode.getDssNode().getUserProxy(); if(!StringUtils.isEmpty(userProxy)) job.setProxyUser(userProxy); } private void convertConfiguration(LinkisAzkabanSchedulerNode schedulerNode,LinkisJob job){ - Map params = schedulerNode.getDWSNode().getParams(); + Map params = schedulerNode.getDssNode().getParams(); if (params != null && !params.isEmpty()) { Object configuration = params.get("configuration"); String confprefix = "node.conf."; @@ -103,7 +103,7 @@ private void convertConfiguration(LinkisAzkabanSchedulerNode schedulerNode,Linki } private void convertJobCommand(LinkisAzkabanSchedulerNode schedulerNode,LinkisJob job){ - Map jobContent = schedulerNode.getDWSNode().getJobContent(); + Map jobContent = schedulerNode.getDssNode().getJobContent(); if(jobContent != null) { jobContent.remove("jobParams"); job.setCommand(new Gson().toJson(jobContent)); diff --git a/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/parser/AzkabanFlowParser.java b/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/parser/AzkabanFlowParser.java index 3da66206d4..0fe7350837 100644 --- a/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/parser/AzkabanFlowParser.java +++ b/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/parser/AzkabanFlowParser.java @@ -3,7 +3,7 @@ import com.webank.wedatasphere.dss.appjoint.scheduler.parser.AbstractFlowParser; import com.webank.wedatasphere.dss.appjoint.scheduler.parser.NodeParser; import com.webank.wedatasphere.dss.appjoint.scheduler.azkaban.entity.AzkabanSchedulerFlow; -import com.webank.wedatasphere.dss.common.entity.flow.DWSJSONFlow; +import com.webank.wedatasphere.dss.common.entity.flow.DSSJSONFlow; import com.webank.wedatasphere.dss.appjoint.scheduler.entity.SchedulerFlow; import java.util.ArrayList; @@ -30,7 +30,7 @@ public void setNodeParsers(NodeParser[] nodeParsers) { } @Override - public Boolean ifFlowCanParse(DWSJSONFlow flow) { + public Boolean ifFlowCanParse(DSSJSONFlow flow) { return true; } diff --git a/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/parser/LinkisAzkabanNodeParser.java b/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/parser/LinkisAzkabanNodeParser.java index dcbd92d0fb..e9c8b86a90 100644 --- a/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/parser/LinkisAzkabanNodeParser.java +++ b/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/parser/LinkisAzkabanNodeParser.java @@ -1,7 +1,7 @@ package com.webank.wedatasphere.dss.appjoint.scheduler.azkaban.parser; import com.webank.wedatasphere.dss.appjoint.scheduler.azkaban.entity.LinkisAzkabanSchedulerNode; -import com.webank.wedatasphere.dss.common.entity.node.DWSNode; +import com.webank.wedatasphere.dss.common.entity.node.DSSNode; import com.webank.wedatasphere.dss.appjoint.scheduler.entity.SchedulerNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -12,14 +12,14 @@ public class LinkisAzkabanNodeParser extends AzkabanNodeParser { @Override - public SchedulerNode parseNode(DWSNode dwsNode) { + public SchedulerNode parseNode(DSSNode dssNode) { LinkisAzkabanSchedulerNode schedulerNode = new LinkisAzkabanSchedulerNode(); - schedulerNode.setDWSNode(dwsNode); + schedulerNode.setDssNode(dssNode); return schedulerNode; } @Override - public Boolean ifNodeCanParse(DWSNode dwsNode) { + public Boolean ifNodeCanParse(DSSNode dssNode) { //预留 return true; } diff --git a/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/tuning/AzkabanProjectTuning.java b/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/tuning/AzkabanProjectTuning.java index 55f0ddf599..b4cec7a03e 100644 --- a/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/tuning/AzkabanProjectTuning.java +++ b/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/tuning/AzkabanProjectTuning.java @@ -60,7 +60,7 @@ private void assignStorePath(AzkabanSchedulerProject azkabanSchedulerProject) { SimpleDateFormat dateFormat = new SimpleDateFormat(AzkabanSchedulerProject.DATE_FORMAT); Date date = new Date(); String dataStr = dateFormat.format(date); - String userName = azkabanSchedulerProject.getDWSProject().getUserName(); + String userName = azkabanSchedulerProject.getDssProject().getUserName(); String name = azkabanSchedulerProject.getName(); String storePath = AzkabanConf.DEFAULT_STORE_PATH.getValue() + File.separator + userName + File.separator + dataStr + File.separator +name; diff --git a/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/tuning/LinkisAzkabanFlowTuning.java b/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/tuning/LinkisAzkabanFlowTuning.java index 4f218ce7d7..42c9962f13 100644 --- a/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/tuning/LinkisAzkabanFlowTuning.java +++ b/dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/tuning/LinkisAzkabanFlowTuning.java @@ -9,7 +9,7 @@ import com.webank.wedatasphere.dss.appjoint.scheduler.entity.SchedulerNode; import com.webank.wedatasphere.dss.appjoint.scheduler.tuning.AbstractFlowTuning; import com.webank.wedatasphere.dss.appjoint.scheduler.tuning.NodeTuning; -import com.webank.wedatasphere.dss.common.entity.node.DWSNodeDefault; +import com.webank.wedatasphere.dss.common.entity.node.DSSNodeDefault; import java.io.File; import java.util.ArrayList; import java.util.List; @@ -58,7 +58,7 @@ public Boolean ifFlowCanTuning(SchedulerFlow schedulerFlow) { } private SchedulerFlow addEndNodeForFlowName(SchedulerFlow flow) { - DWSNodeDefault endNode = new DWSNodeDefault(); + DSSNodeDefault endNode = new DSSNodeDefault(); List endNodeList = getFlowEndJobList(flow); endNode.setId(flow.getName() + "_"); endNode.setName(flow.getName() + "_"); @@ -70,7 +70,7 @@ private SchedulerFlow addEndNodeForFlowName(SchedulerFlow flow) { endNodeList.forEach(tmpNode -> endNode.addDependency(tmpNode.getName())); } LinkisAzkabanSchedulerNode azkabanSchedulerNode = new LinkisAzkabanSchedulerNode(); - azkabanSchedulerNode.setDWSNode(endNode); + azkabanSchedulerNode.setDssNode(endNode); flow.getSchedulerNodes().add((azkabanSchedulerNode)); return flow; } @@ -80,7 +80,7 @@ private List getFlowEndJobList(SchedulerFlow flow) { for (SchedulerNode job : flow.getSchedulerNodes()) { int flag = 0; for (SchedulerEdge link : flow.getSchedulerEdges()) { - if (job.getId().equals(link.getDWSEdge().getSource())) { + if (job.getId().equals(link.getDssEdge().getSource())) { flag = 1; } } diff --git a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DWSFlow.java b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DSSFlow.java similarity index 86% rename from dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DWSFlow.java rename to dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DSSFlow.java index 15ca42b8ce..ff768f791e 100644 --- a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DWSFlow.java +++ b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DSSFlow.java @@ -24,7 +24,7 @@ /** * Created by enjoyyin on 2019/5/14. */ -public class DWSFlow implements Flow { +public class DSSFlow implements Flow { private Long id; private String name; private Boolean state; //0,1代表发布过和未发布过 @@ -38,11 +38,11 @@ public class DWSFlow implements Flow { private Boolean hasSaved;//0disable 1 enable 0表示工作流从来没存过，发布的时候忽略 private String uses; - private List versions; //为了前台不做修改，还是使用versions 而不使用flowVersions的变量名 - private List children; + private List versions; //为了前台不做修改，还是使用versions 而不使用flowVersions的变量名 + private List children; private String flowType; - private DWSFlowVersion latestVersion; + private DSSFlowVersion latestVersion; public Integer getRank() { @@ -86,27 +86,27 @@ public void setDescription(String description) { @Override public void addFlowVersion(FlowVersion flowVersion) { - this.versions.add((DWSFlowVersion) flowVersion); + this.versions.add((DSSFlowVersion) flowVersion); } @Override - public List getChildren() { + public List getChildren() { return children; } @Override public void setChildren(List children) { - this.children = children.stream().map(f ->(DWSFlow)f).collect(Collectors.toList()); + this.children = children.stream().map(f ->(DSSFlow)f).collect(Collectors.toList()); } @Override - public List getFlowVersions() { + public List getFlowVersions() { return this.versions; } @Override public void setFlowVersions(List flowVersions) { - this.versions = flowVersions.stream().map(f ->(DWSFlowVersion)f).collect(Collectors.toList()); + this.versions = flowVersions.stream().map(f ->(DSSFlowVersion)f).collect(Collectors.toList()); } @Override @@ -176,11 +176,11 @@ public void setHasSaved(Boolean hasSaved) { this.hasSaved = hasSaved; } - public DWSFlowVersion getLatestVersion() { + public DSSFlowVersion getLatestVersion() { return latestVersion; } - public void setLatestVersion(DWSFlowVersion latestVersion) { + public void setLatestVersion(DSSFlowVersion latestVersion) { this.latestVersion = latestVersion; } diff --git a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DWSFlowPublishHistory.java b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DSSFlowPublishHistory.java similarity index 94% rename from dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DWSFlowPublishHistory.java rename to dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DSSFlowPublishHistory.java index e9c4537b6c..7fe3e9ad42 100644 --- a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DWSFlowPublishHistory.java +++ b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DSSFlowPublishHistory.java @@ -20,5 +20,5 @@ /** * Created by enjoyyin on 2019/9/19. */ -public class DWSFlowPublishHistory { +public class DSSFlowPublishHistory { } diff --git a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DWSFlowVersion.java b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DSSFlowVersion.java similarity index 92% rename from dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DWSFlowVersion.java rename to dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DSSFlowVersion.java index 43c319541e..ce8559097a 100644 --- a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DWSFlowVersion.java +++ b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DSSFlowVersion.java @@ -22,7 +22,7 @@ /** * Created by enjoyyin on 2019/9/19. */ -public class DWSFlowVersion implements FlowVersion, Comparable { +public class DSSFlowVersion implements FlowVersion, Comparable { private Long id; private Long flowID; private String source; @@ -31,7 +31,7 @@ public class DWSFlowVersion implements FlowVersion, Comparable { private Date updateTime; private Long updatorID; private String version; - private DWSFlowPublishHistory publishHistory; + private DSSFlowPublishHistory publishHistory; private String json; private String updator; private Boolean isNotPublished; //true 未发过版，false已经过版 @@ -146,16 +146,16 @@ public void setUpdatorID(Long updatorID) { this.updatorID = updatorID; } - public DWSFlowPublishHistory getPublishHistory() { + public DSSFlowPublishHistory getPublishHistory() { return publishHistory; } - public void setPublishHistory(DWSFlowPublishHistory publishHistory) { + public void setPublishHistory(DSSFlowPublishHistory publishHistory) { this.publishHistory = publishHistory; } @Override - public int compareTo(DWSFlowVersion o) { + public int compareTo(DSSFlowVersion o) { Integer v1 = Integer.valueOf(this.version.substring(1, version.length())); Integer v2 = Integer.valueOf(o.version.substring(1,o.version.length())); return v2 - v1; diff --git a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DWSJSONFlow.java b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DSSJSONFlow.java similarity index 84% rename from dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DWSJSONFlow.java rename to dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DSSJSONFlow.java index 1c6e42cc67..ae9b986318 100644 --- a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DWSJSONFlow.java +++ b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/flow/DSSJSONFlow.java @@ -23,10 +23,10 @@ /** * Created by enjoyyin on 2019/5/14. */ -public class DWSJSONFlow extends DWSFlow { +public class DSSJSONFlow extends DSSFlow { private String json; - private List children; + private List children; public String getJson() { return json; @@ -38,11 +38,11 @@ public void setJson(String json) { @Override public void setChildren(List children) { - this.children = children.stream().map(f ->(DWSJSONFlow)f).collect(Collectors.toList()); + this.children = children.stream().map(f ->(DSSJSONFlow)f).collect(Collectors.toList()); } @Override - public List getChildren() { + public List getChildren() { return children; } } diff --git a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DWSEdge.java b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DSSEdge.java similarity index 97% rename from dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DWSEdge.java rename to dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DSSEdge.java index e255d2a917..c4b30593af 100644 --- a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DWSEdge.java +++ b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DSSEdge.java @@ -20,7 +20,7 @@ /** * Created by enjoyyin on 2019/5/14. */ -public interface DWSEdge { +public interface DSSEdge { String getSource(); diff --git a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DWSEdgeDefault.java b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DSSEdgeDefault.java similarity index 96% rename from dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DWSEdgeDefault.java rename to dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DSSEdgeDefault.java index 4cf094bb42..3e6bc8b139 100644 --- a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DWSEdgeDefault.java +++ b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DSSEdgeDefault.java @@ -20,7 +20,7 @@ /** * Created by enjoyyin on 2019/5/14. */ -public class DWSEdgeDefault implements DWSEdge { +public class DSSEdgeDefault implements DSSEdge { private String source; private String target; private String sourceLocation; @@ -68,7 +68,7 @@ public void setTargetLocation(String targetLocation) { @Override public String toString() { - return "DWSEdge{" + + return "DSSEdge{" + "source='" + source + '\'' + ", target='" + target + '\'' + ", sourceLocation='" + sourceLocation + '\'' + diff --git a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DWSNode.java b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DSSNode.java similarity index 96% rename from dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DWSNode.java rename to dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DSSNode.java index d7fa7e870e..8f6575c836 100644 --- a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DWSNode.java +++ b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DSSNode.java @@ -25,7 +25,7 @@ /** * Created by enjoyyin on 2019/5/14. */ -public interface DWSNode extends Node { +public interface DSSNode extends Node { Layout getLayout(); diff --git a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DWSNodeDefault.java b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DSSNodeDefault.java similarity index 98% rename from dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DWSNodeDefault.java rename to dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DSSNodeDefault.java index b7748016f5..2d416dfb02 100644 --- a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DWSNodeDefault.java +++ b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/DSSNodeDefault.java @@ -26,7 +26,7 @@ /** * Created by enjoyyin on 2019/5/14. */ -public class DWSNodeDefault implements DWSNode { +public class DSSNodeDefault implements DSSNode { private Layout layout; private String id; private String jobType; diff --git a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DWSJSONProject.java b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DSSJSONProject.java similarity index 69% rename from dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DWSJSONProject.java rename to dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DSSJSONProject.java index 05202dac48..ffd9026fc3 100644 --- a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DWSJSONProject.java +++ b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DSSJSONProject.java @@ -17,8 +17,8 @@ package com.webank.wedatasphere.dss.common.entity.project; -import com.webank.wedatasphere.dss.common.entity.flow.DWSFlow; -import com.webank.wedatasphere.dss.common.entity.flow.DWSJSONFlow; +import com.webank.wedatasphere.dss.common.entity.flow.DSSFlow; +import com.webank.wedatasphere.dss.common.entity.flow.DSSJSONFlow; import java.util.List; import java.util.stream.Collectors; @@ -26,16 +26,16 @@ /** * Created by allenlliu on 2019/9/16. */ -public class DWSJSONProject extends DWSProject { - private List flows; +public class DSSJSONProject extends DSSProject { + private List flows; @Override - public List getFlows() { + public List getFlows() { return this.flows; } @Override - public void setFlows(List flows) { - this.flows = flows.stream().map(f ->(DWSJSONFlow)f).collect(Collectors.toList()); + public void setFlows(List flows) { + this.flows = flows.stream().map(f ->(DSSJSONFlow)f).collect(Collectors.toList()); } } diff --git a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DWSProject.java b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DSSProject.java similarity index 90% rename from dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DWSProject.java rename to dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DSSProject.java index 3f7ad9c2eb..865b2d884b 100644 --- a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DWSProject.java +++ b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DSSProject.java @@ -18,7 +18,7 @@ package com.webank.wedatasphere.dss.common.entity.project; import com.webank.wedatasphere.dss.common.entity.Resource; -import com.webank.wedatasphere.dss.common.entity.flow.DWSFlow; +import com.webank.wedatasphere.dss.common.entity.flow.DSSFlow; import java.util.Date; import java.util.List; @@ -27,7 +27,7 @@ /** * Created by enjoyyin on 2019/9/16. */ -public class DWSProject implements Project { +public class DSSProject implements Project { private Long id; private String name; @@ -49,13 +49,13 @@ public class DWSProject implements Project { private Integer applicationArea; private String business; - private DWSProjectVersion latestVersion; + private DSSProjectVersion latestVersion; private Boolean isNotPublish; private String userName; private String projectGroup; private List projectVersions; - private List flows; + private List flows; private List projectResources; public List getProjectResources() { @@ -66,12 +66,12 @@ public void setProjectResources(List projectResources) { this.projectResources = projectResources; } - public List getFlows() { + public List getFlows() { return flows; } - public void setFlows(List flows) { - this.flows = flows.stream().map(f -> (DWSFlow) f).collect(Collectors.toList()); + public void setFlows(List flows) { + this.flows = flows.stream().map(f -> (DSSFlow) f).collect(Collectors.toList()); } public String getUserName() { @@ -122,11 +122,11 @@ public void setInitialOrgID(Long initialOrgID) { this.initialOrgID = initialOrgID; } - public DWSProjectVersion getLatestVersion() { + public DSSProjectVersion getLatestVersion() { return latestVersion; } - public void setLatestVersion(DWSProjectVersion latestVersion) { + public void setLatestVersion(DSSProjectVersion latestVersion) { this.latestVersion = latestVersion; } @@ -174,13 +174,13 @@ public List getProjectVersions() { @Override public void setProjectVersions(List projectVersions) { - this.projectVersions = projectVersions.stream().map(f -> (DWSProjectVersion) f).collect(Collectors.toList()); + this.projectVersions = projectVersions.stream().map(f -> (DSSProjectVersion) f).collect(Collectors.toList()); } @Override public void addProjectVersion(ProjectVersion projectVersion) { - this.projectVersions.add((DWSProjectVersion) projectVersion); + this.projectVersions.add((DSSProjectVersion) projectVersion); } @Override diff --git a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DWSProjectPublishHistory.java b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DSSProjectPublishHistory.java similarity index 98% rename from dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DWSProjectPublishHistory.java rename to dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DSSProjectPublishHistory.java index 7ea9b1ee0e..dca93dd487 100644 --- a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DWSProjectPublishHistory.java +++ b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DSSProjectPublishHistory.java @@ -22,7 +22,7 @@ /** * Created by enjoyyin on 2019/5/14. */ -public class DWSProjectPublishHistory { +public class DSSProjectPublishHistory { private Long id; private Long projectVersionID; private Date createTime; diff --git a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DWSProjectVersion.java b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DSSProjectVersion.java similarity index 91% rename from dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DWSProjectVersion.java rename to dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DSSProjectVersion.java index 534a9631f2..5731ecf8e3 100644 --- a/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DWSProjectVersion.java +++ b/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DSSProjectVersion.java @@ -22,7 +22,7 @@ /** * Created by enjoyyin on 2019/9/18. */ -public class DWSProjectVersion implements ProjectVersion { +public class DSSProjectVersion implements ProjectVersion { private Long id; private Long projectID; @@ -33,9 +33,7 @@ public class DWSProjectVersion implements ProjectVersion { private Integer lock; private String updator; private Boolean isNotPublish; - private DWSProjectPublishHistory publishHistory; - - + private DSSProjectPublishHistory publishHistory; @Override public String getVersion() { @@ -118,11 +116,11 @@ public void setNotPublish(Boolean notPublish) { isNotPublish = notPublish; } - public DWSProjectPublishHistory getPublishHistory() { + public DSSProjectPublishHistory getPublishHistory() { return publishHistory; } - public void setPublishHistory(DWSProjectPublishHistory publishHistory) { + public void setPublishHistory(DSSProjectPublishHistory publishHistory) { this.publishHistory = publishHistory; } } diff --git a/dss-common/src/main/scala/com/webank/wedatasphere/dss/common/protocol/RequestDWSProject.scala b/dss-common/src/main/scala/com/webank/wedatasphere/dss/common/protocol/RequestDSSProject.scala similarity index 90% rename from dss-common/src/main/scala/com/webank/wedatasphere/dss/common/protocol/RequestDWSProject.scala rename to dss-common/src/main/scala/com/webank/wedatasphere/dss/common/protocol/RequestDSSProject.scala index 92d01f765e..b9b3da46af 100644 --- a/dss-common/src/main/scala/com/webank/wedatasphere/dss/common/protocol/RequestDWSProject.scala +++ b/dss-common/src/main/scala/com/webank/wedatasphere/dss/common/protocol/RequestDSSProject.scala @@ -20,6 +20,6 @@ package com.webank.wedatasphere.dss.common.protocol /** * Created by enjoyyin on 2019/11/8. */ -case class RequestDWSProject(flowId:Long,version:String,projectVersionId:Long) +case class RequestDSSProject(flowId:Long, version:String, projectVersionId:Long) case class RequestDSSApplication(name:String) \ No newline at end of file diff --git a/dss-flow-execution-entrance/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/job/FlowExecutionAppJointSignalSharedJob.java b/dss-flow-execution-entrance/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/job/FlowExecutionAppJointSignalSharedJob.java index 6cfcf877be..d0d556aadf 100644 --- a/dss-flow-execution-entrance/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/job/FlowExecutionAppJointSignalSharedJob.java +++ b/dss-flow-execution-entrance/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/job/FlowExecutionAppJointSignalSharedJob.java @@ -17,7 +17,6 @@ package com.webank.wedatasphere.dss.flow.execution.entrance.job; -import com.webank.wedatasphere.dss.common.entity.node.DWSNode; import com.webank.wedatasphere.dss.flow.execution.entrance.conf.FlowExecutionEntranceConfiguration; import com.webank.wedatasphere.dss.linkis.node.execution.job.JobSignalKeyCreator; import com.webank.wedatasphere.dss.linkis.node.execution.job.SignalSharedJob; diff --git a/dss-flow-execution-entrance/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/parser/FlowExecutionFlowParser.java b/dss-flow-execution-entrance/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/parser/FlowExecutionFlowParser.java index 66388106e1..fbd8bdd762 100644 --- a/dss-flow-execution-entrance/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/parser/FlowExecutionFlowParser.java +++ b/dss-flow-execution-entrance/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/parser/FlowExecutionFlowParser.java @@ -19,7 +19,7 @@ import com.webank.wedatasphere.dss.appjoint.scheduler.parser.AbstractFlowParser; import com.webank.wedatasphere.dss.appjoint.scheduler.parser.NodeParser; -import com.webank.wedatasphere.dss.common.entity.flow.DWSJSONFlow; +import com.webank.wedatasphere.dss.common.entity.flow.DSSJSONFlow; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -36,7 +36,7 @@ public void setNodeParsers(NodeParser[] nodeParsers) { } @Override - public Boolean ifFlowCanParse(DWSJSONFlow flow) { + public Boolean ifFlowCanParse(DSSJSONFlow flow) { return true; } diff --git a/dss-flow-execution-entrance/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/parser/FlowExecutionNodeParser.java b/dss-flow-execution-entrance/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/parser/FlowExecutionNodeParser.java index 379aa14e5a..97c5824b98 100644 --- a/dss-flow-execution-entrance/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/parser/FlowExecutionNodeParser.java +++ b/dss-flow-execution-entrance/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/parser/FlowExecutionNodeParser.java @@ -19,7 +19,7 @@ import com.webank.wedatasphere.dss.appjoint.scheduler.entity.SchedulerNode; import com.webank.wedatasphere.dss.appjoint.scheduler.parser.AbstractNodeParser; -import com.webank.wedatasphere.dss.common.entity.node.DWSNode; +import com.webank.wedatasphere.dss.common.entity.node.DSSNode; import com.webank.wedatasphere.dss.flow.execution.entrance.entity.FlowExecutionNode; import org.springframework.stereotype.Component; @@ -31,14 +31,14 @@ public class FlowExecutionNodeParser extends AbstractNodeParser { @Override - public SchedulerNode parseNode(DWSNode dwsNode) { + public SchedulerNode parseNode(DSSNode dssNode) { FlowExecutionNode node = new FlowExecutionNode(); - node.setDWSNode(dwsNode); + node.setDssNode(dssNode); return node; } @Override - public Boolean ifNodeCanParse(DWSNode dwsNode) { + public Boolean ifNodeCanParse(DSSNode dssNode) { return true; } diff --git a/dss-flow-execution-entrance/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/parser/FlowExecutionReadNodeParser.java b/dss-flow-execution-entrance/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/parser/FlowExecutionReadNodeParser.java index 29f964c5d7..1c04fdfd2a 100644 --- a/dss-flow-execution-entrance/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/parser/FlowExecutionReadNodeParser.java +++ b/dss-flow-execution-entrance/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/parser/FlowExecutionReadNodeParser.java @@ -20,7 +20,7 @@ import com.webank.wedatasphere.dss.appjoint.scheduler.entity.ReadNode; import com.webank.wedatasphere.dss.appjoint.scheduler.entity.SchedulerNode; import com.webank.wedatasphere.dss.appjoint.scheduler.parser.AbstractReadNodeParser; -import com.webank.wedatasphere.dss.common.entity.node.DWSNode; +import com.webank.wedatasphere.dss.common.entity.node.DSSNode; import com.webank.wedatasphere.dss.flow.execution.entrance.entity.FlowExecutionNode; import com.webank.wedatasphere.dss.flow.execution.entrance.entity.FlowExecutonReadNode; import com.webank.wedatasphere.dss.flow.execution.entrance.utils.FlowExecutionUtils; @@ -39,8 +39,8 @@ public int getOrder() { } @Override - public Boolean ifNodeCanParse(DWSNode dwsNode) { - return FlowExecutionUtils.isReadNode(dwsNode.getNodeType()); + public Boolean ifNodeCanParse(DSSNode dssNode) { + return FlowExecutionUtils.isReadNode(dssNode.getNodeType()); } @Override diff --git a/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/FlowContext.scala b/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/FlowContext.scala index b0192fb544..f03081a5e1 100644 --- a/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/FlowContext.scala +++ b/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/FlowContext.scala @@ -53,7 +53,7 @@ object FlowContext { def changedNodeState(fromMap: util.Map[String, NodeRunner], toMap: util.Map[String, NodeRunner], node: SchedulerNode,info:String): Unit = { - val nodeName = node.getDWSNode.getName + val nodeName = node.getDssNode.getName if (fromMap.containsKey(nodeName)) { val runner = fromMap.get(nodeName) runner.setNodeExecutedInfo(info) diff --git a/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/execution/DefaultFlowExecution.scala b/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/execution/DefaultFlowExecution.scala index d5a9cbf797..c1164c9d3d 100644 --- a/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/execution/DefaultFlowExecution.scala +++ b/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/execution/DefaultFlowExecution.scala @@ -61,7 +61,7 @@ class DefaultFlowExecution extends FlowExecution with Logging { // submit node runner runningNodes.add(runner) } else { - info(s"This node ${runner.getNode.getDWSNode.getName} Skipped in execution") + info(s"This node ${runner.getNode.getDssNode.getName} Skipped in execution") runner.fromScheduledTunToState(NodeExecutionState.Skipped) } } diff --git a/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/job/FlowEntranceJob.scala b/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/job/FlowEntranceJob.scala index 225492781c..42bf395d46 100644 --- a/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/job/FlowEntranceJob.scala +++ b/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/job/FlowEntranceJob.scala @@ -18,7 +18,7 @@ package com.webank.wedatasphere.dss.flow.execution.entrance.job import com.webank.wedatasphere.dss.appjoint.scheduler.entity.{SchedulerFlow, SchedulerNode} -import com.webank.wedatasphere.dss.common.entity.project.DWSProject +import com.webank.wedatasphere.dss.common.entity.project.DSSProject import com.webank.wedatasphere.dss.flow.execution.entrance.exception.FlowExecutionErrorException import com.webank.wedatasphere.dss.flow.execution.entrance.{FlowContext, FlowContextImpl} import com.webank.wedatasphere.dss.flow.execution.entrance.listener.NodeRunnerListener @@ -44,7 +44,7 @@ class FlowEntranceJob extends EntranceExecutionJob with NodeRunnerListener { private val flowContext: FlowContext = new FlowContextImpl - @BeanProperty var dwsProject: DWSProject = _ + @BeanProperty var dwsProject: DSSProject = _ def setFlow(flow: SchedulerFlow): Unit = this.flow = flow @@ -80,7 +80,7 @@ class FlowEntranceJob extends EntranceExecutionJob with NodeRunnerListener { override def onStatusChanged(fromState: NodeExecutionState, toState: NodeExecutionState, node: SchedulerNode): Unit = { - val nodeName = node.getDWSNode.getName + val nodeName = node.getDssNode.getName toState match { case NodeExecutionState.Failed => printLog(s"Failed to execute node($nodeName),prepare to kill flow job", "ERROR") diff --git a/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/job/parser/FlowJobFlowParser.scala b/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/job/parser/FlowJobFlowParser.scala index 5c5bf8ede5..a088e146f7 100644 --- a/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/job/parser/FlowJobFlowParser.scala +++ b/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/job/parser/FlowJobFlowParser.scala @@ -18,8 +18,8 @@ package com.webank.wedatasphere.dss.flow.execution.entrance.job.parser import com.webank.wedatasphere.dss.appjoint.scheduler.entity.{AbstractSchedulerProject, SchedulerFlow} -import com.webank.wedatasphere.dss.common.entity.project.DWSProject -import com.webank.wedatasphere.dss.common.protocol.RequestDWSProject +import com.webank.wedatasphere.dss.common.entity.project.DSSProject +import com.webank.wedatasphere.dss.common.protocol.RequestDSSProject import com.webank.wedatasphere.dss.flow.execution.entrance.conf.FlowExecutionEntranceConfiguration import com.webank.wedatasphere.dss.flow.execution.entrance.entity.FlowExecutionCode import com.webank.wedatasphere.dss.flow.execution.entrance.job.FlowEntranceJob @@ -52,8 +52,8 @@ class FlowJobFlowParser extends FlowEntranceJobParser with Logging { val code = flowEntranceJob.jobToExecuteRequest().code val flowExecutionCode = LinkisJobExecutionUtils.gson.fromJson(code, classOf[FlowExecutionCode]) - getDWSProjectByCode(flowExecutionCode) match { - case dwsProject: DWSProject => + getDSSProjectByCode(flowExecutionCode) match { + case dwsProject: DSSProject => val project = this.flowExecutionProjectParser.parseProject(dwsProject) @@ -76,8 +76,8 @@ class FlowJobFlowParser extends FlowEntranceJobParser with Logging { info(s"${flowEntranceJob.getId} finished to parse flow") } - private def getDWSProjectByCode(flowExecutionCode: FlowExecutionCode) = { - val req = new RequestDWSProject(flowExecutionCode.getFlowId, flowExecutionCode.getVersion, flowExecutionCode.getProjectVersionId) + private def getDSSProjectByCode(flowExecutionCode: FlowExecutionCode) = { + val req = new RequestDSSProject(flowExecutionCode.getFlowId, flowExecutionCode.getVersion, flowExecutionCode.getProjectVersionId) Sender.getSender(FlowExecutionEntranceConfiguration.SCHEDULER_APPLICATION.getValue).ask(req) } diff --git a/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/job/parser/FlowJobNodeParser.scala b/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/job/parser/FlowJobNodeParser.scala index 6447e45eb2..2f18486fa3 100644 --- a/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/job/parser/FlowJobNodeParser.scala +++ b/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/job/parser/FlowJobNodeParser.scala @@ -53,7 +53,7 @@ class FlowJobNodeParser extends FlowEntranceJobParser with Logging{ val nodeName = node.getName val propsMap = new util.HashMap[String, String]() - val proxyUser = if (node.getDWSNode.getUserProxy == null) flowEntranceJob.getUser else node.getDWSNode.getUserProxy + val proxyUser = if (node.getDssNode.getUserProxy == null) flowEntranceJob.getUser else node.getDssNode.getUserProxy propsMap.put(PROJECT_NAME, project.getName) propsMap.put(FLOW_NAME, flow.getName) propsMap.put(JOB_ID, nodeName) @@ -62,12 +62,12 @@ class FlowJobNodeParser extends FlowEntranceJobParser with Logging{ propsMap.put(LinkisJobExecutionConfiguration.LINKIS_TYPE, node.getNodeType) propsMap.put(PROXY_USER, proxyUser) - propsMap.put(COMMAND, LinkisJobExecutionUtils.gson.toJson(node.getDWSNode.getJobContent)) + propsMap.put(COMMAND, LinkisJobExecutionUtils.gson.toJson(node.getDssNode.getJobContent)) - var params = node.getDWSNode.getParams + var params = node.getDssNode.getParams if (params == null) { params = new util.HashMap[String,AnyRef]() - node.getDWSNode.setParams(params) + node.getDssNode.setParams(params) } val flowVar = new util.HashMap[String, AnyRef]() val properties = flow.getFlowProperties diff --git a/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/node/AppJointJobBuilder.scala b/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/node/AppJointJobBuilder.scala index 440e6a4aa4..f8173adfb6 100644 --- a/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/node/AppJointJobBuilder.scala +++ b/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/node/AppJointJobBuilder.scala @@ -139,12 +139,12 @@ object AppJointJobBuilder { } override protected def fillLinkisJobInfo(linkisJob: LinkisJob): Unit = { - this.node.getDWSNode.getParams.get(FlowExecutionEntranceConfiguration.NODE_CONFIGURATION_KEY) match { + this.node.getDssNode.getParams.get(FlowExecutionEntranceConfiguration.NODE_CONFIGURATION_KEY) match { case configuration:util.Map[String, AnyRef] => linkisJob.setConfiguration(configuration) case _ => } - this.node.getDWSNode.getParams.remove(FlowExecutionEntranceConfiguration.FLOW_VAR_MAP) match { + this.node.getDssNode.getParams.remove(FlowExecutionEntranceConfiguration.FLOW_VAR_MAP) match { case flowVar:util.Map[String, AnyRef] => linkisJob.setVariables(flowVar) case _ => @@ -153,13 +153,13 @@ object AppJointJobBuilder { } override protected def fillCommonLinkisJobInfo(linkisAppjointJob: CommonLinkisJob): Unit = { - linkisAppjointJob.setJobResourceList(FlowExecutionUtils.resourcesAdaptation(this.node.getDWSNode.getResources)) - this.node.getDWSNode.getParams.remove(FlowExecutionEntranceConfiguration.PROJECT_RESOURCES) match { + linkisAppjointJob.setJobResourceList(FlowExecutionUtils.resourcesAdaptation(this.node.getDssNode.getResources)) + this.node.getDssNode.getParams.remove(FlowExecutionEntranceConfiguration.PROJECT_RESOURCES) match { case projectResources:util.List[Resource] => linkisAppjointJob.setProjectResourceList(FlowExecutionUtils.resourcesAdaptation(projectResources)) case _ => } - this.node.getDWSNode.getParams.remove(FlowExecutionEntranceConfiguration.FLOW_RESOURCES) match { + this.node.getDssNode.getParams.remove(FlowExecutionEntranceConfiguration.FLOW_RESOURCES) match { case flowResources:util.HashMap[String, util.List[BMLResource]] => linkisAppjointJob.setFlowNameAndResources(flowResources) case _ => diff --git a/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/node/DefaultNodeRunner.scala b/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/node/DefaultNodeRunner.scala index 89ddc910a4..ebed133096 100644 --- a/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/node/DefaultNodeRunner.scala +++ b/dss-flow-execution-entrance/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/node/DefaultNodeRunner.scala @@ -101,7 +101,7 @@ class DefaultNodeRunner extends NodeRunner with Logging { override def run(): Unit = { info(s"start to run node of ${node.getName}") try { - val jobProps = node.getDWSNode.getParams.remove(FlowExecutionEntranceConfiguration.PROPS_MAP) match { + val jobProps = node.getDssNode.getParams.remove(FlowExecutionEntranceConfiguration.PROPS_MAP) match { case propsMap: util.Map[String, String] => propsMap case _ => new util.HashMap[String, String]() } diff --git a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/AbstractSchedulerNode.java b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/AbstractSchedulerNode.java index 167d61fda6..a5139d7d9c 100644 --- a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/AbstractSchedulerNode.java +++ b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/AbstractSchedulerNode.java @@ -17,7 +17,7 @@ package com.webank.wedatasphere.dss.appjoint.scheduler.entity; -import com.webank.wedatasphere.dss.common.entity.node.DWSNode; +import com.webank.wedatasphere.dss.common.entity.node.DSSNode; import java.util.List; @@ -26,65 +26,65 @@ */ public abstract class AbstractSchedulerNode implements SchedulerNode { - private DWSNode dwsNode; + private DSSNode dssNode; @Override - public DWSNode getDWSNode() { - return this.dwsNode; + public DSSNode getDssNode() { + return this.dssNode; } @Override - public void setDWSNode(DWSNode dwsNode) { - this.dwsNode = dwsNode; + public void setDssNode(DSSNode dssNode) { + this.dssNode = dssNode; } @Override public String getId() { - return dwsNode.getId(); + return dssNode.getId(); } @Override public void setId(String id) { - dwsNode.setId(id); + dssNode.setId(id); } @Override public String getNodeType() { - return dwsNode.getNodeType(); + return dssNode.getNodeType(); } @Override public void setNodeType(String nodeType) { - dwsNode.setNodeType(nodeType); + dssNode.setNodeType(nodeType); } @Override public String getName() { - return dwsNode.getName(); + return dssNode.getName(); } @Override public void setName(String name) { - dwsNode.setName(name); + dssNode.setName(name); } @Override public void addDependency(String nodeName) { - dwsNode.addDependency(nodeName); + dssNode.addDependency(nodeName); } @Override public void setDependency(List dependency) { - dwsNode.setDependency(dependency); + dssNode.setDependency(dependency); } @Override public void removeDependency(String nodeName) { - dwsNode.removeDependency(nodeName); + dssNode.removeDependency(nodeName); } @Override public List getDependencys() { - return dwsNode.getDependencys(); + return dssNode.getDependencys(); } } diff --git a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/AbstractSchedulerProject.java b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/AbstractSchedulerProject.java index 6cfd51647f..3a8ad55eb8 100644 --- a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/AbstractSchedulerProject.java +++ b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/AbstractSchedulerProject.java @@ -17,7 +17,7 @@ package com.webank.wedatasphere.dss.appjoint.scheduler.entity; -import com.webank.wedatasphere.dss.common.entity.project.DWSProject; +import com.webank.wedatasphere.dss.common.entity.project.DSSProject; import com.webank.wedatasphere.dss.common.entity.project.ProjectVersion; import java.util.List; @@ -32,7 +32,7 @@ public abstract class AbstractSchedulerProject implements SchedulerProject { private String name; private String description; - private DWSProject dwsProject; + private DSSProject dssProject; private List schedulerFlows; private List projectVersions; @@ -101,12 +101,12 @@ public void addProjectVersion(ProjectVersion projectVersion) { } @Override - public DWSProject getDWSProject() { - return this.dwsProject; + public DSSProject getDssProject() { + return this.dssProject; } @Override - public void setDWSProject(DWSProject dwsProject) { - this.dwsProject = dwsProject; + public void setDssProject(DSSProject dssProject) { + this.dssProject = dssProject; } } diff --git a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/SchedulerEdge.java b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/SchedulerEdge.java index 582f0a4fb7..aee1e72292 100644 --- a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/SchedulerEdge.java +++ b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/SchedulerEdge.java @@ -17,13 +17,13 @@ package com.webank.wedatasphere.dss.appjoint.scheduler.entity; -import com.webank.wedatasphere.dss.common.entity.node.DWSEdge; +import com.webank.wedatasphere.dss.common.entity.node.DSSEdge; /** * Created by enjoyyin on 2019/9/7. */ public interface SchedulerEdge { - DWSEdge getDWSEdge(); + DSSEdge getDssEdge(); - void setDWSEdge(DWSEdge dwsEdge); + void setDssEdge(DSSEdge dssEdge); } diff --git a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/SchedulerEdgeDefault.java b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/SchedulerEdgeDefault.java index b9f9fb9601..db663fe540 100644 --- a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/SchedulerEdgeDefault.java +++ b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/SchedulerEdgeDefault.java @@ -17,22 +17,22 @@ package com.webank.wedatasphere.dss.appjoint.scheduler.entity; -import com.webank.wedatasphere.dss.common.entity.node.DWSEdge; +import com.webank.wedatasphere.dss.common.entity.node.DSSEdge; /** * Created by allenlliu on 2019/9/19. */ public class SchedulerEdgeDefault implements SchedulerEdge { - private DWSEdge dwsEdge; + private DSSEdge dssEdge; @Override - public DWSEdge getDWSEdge() { - return dwsEdge; + public DSSEdge getDssEdge() { + return dssEdge; } @Override - public void setDWSEdge(DWSEdge dwsEdge) { - this.dwsEdge = dwsEdge; + public void setDssEdge(DSSEdge dssEdge) { + this.dssEdge = dssEdge; } } diff --git a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/SchedulerNode.java b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/SchedulerNode.java index 1d756efdd2..612c2e25d6 100644 --- a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/SchedulerNode.java +++ b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/SchedulerNode.java @@ -18,14 +18,14 @@ package com.webank.wedatasphere.dss.appjoint.scheduler.entity; -import com.webank.wedatasphere.dss.common.entity.node.DWSNode; +import com.webank.wedatasphere.dss.common.entity.node.DSSNode; import com.webank.wedatasphere.dss.common.entity.node.Node; /** * Created by enjoyyin on 2019/9/7. */ public interface SchedulerNode extends Node { - DWSNode getDWSNode(); + DSSNode getDssNode(); - void setDWSNode(DWSNode dwsNode); + void setDssNode(DSSNode dssNode); } diff --git a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/SchedulerProject.java b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/SchedulerProject.java index ca3d8362e5..d4158b0f4c 100644 --- a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/SchedulerProject.java +++ b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/entity/SchedulerProject.java @@ -17,13 +17,13 @@ package com.webank.wedatasphere.dss.appjoint.scheduler.entity; -import com.webank.wedatasphere.dss.common.entity.project.DWSProject; +import com.webank.wedatasphere.dss.common.entity.project.DSSProject; import com.webank.wedatasphere.dss.common.entity.project.Project; /** * Created by enjoyyin on 2019/9/16. */ public interface SchedulerProject extends Project { - DWSProject getDWSProject(); - void setDWSProject(DWSProject dwsProject); + DSSProject getDssProject(); + void setDssProject(DSSProject dssProject); } diff --git a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/AbstractFlowParser.java b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/AbstractFlowParser.java index 546cb32ed6..96a9f2aed6 100644 --- a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/AbstractFlowParser.java +++ b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/AbstractFlowParser.java @@ -27,12 +27,12 @@ import com.webank.wedatasphere.dss.appjoint.scheduler.entity.SchedulerNode; import com.webank.wedatasphere.dss.common.entity.Resource; import com.webank.wedatasphere.dss.appjoint.scheduler.entity.SchedulerFlow; -import com.webank.wedatasphere.dss.common.entity.flow.DWSJSONFlow; +import com.webank.wedatasphere.dss.common.entity.flow.DSSJSONFlow; import com.webank.wedatasphere.dss.common.entity.flow.Flow; -import com.webank.wedatasphere.dss.common.entity.node.DWSEdge; -import com.webank.wedatasphere.dss.common.entity.node.DWSEdgeDefault; -import com.webank.wedatasphere.dss.common.entity.node.DWSNode; -import com.webank.wedatasphere.dss.common.entity.node.DWSNodeDefault; +import com.webank.wedatasphere.dss.common.entity.node.DSSEdge; +import com.webank.wedatasphere.dss.common.entity.node.DSSEdgeDefault; +import com.webank.wedatasphere.dss.common.entity.node.DSSNode; +import com.webank.wedatasphere.dss.common.entity.node.DSSNodeDefault; import org.springframework.beans.BeanUtils; import java.util.*; @@ -64,39 +64,39 @@ protected void dealFlowResources(){} protected void dealFlowProperties(Flow flow){} @Override - public SchedulerFlow parseFlow(DWSJSONFlow flow) { + public SchedulerFlow parseFlow(DSSJSONFlow flow) { downloadFlowResources(); dealFlowResources(); dealFlowProperties(flow); - return resolveDWSJSONFlow(flow); + return resolveDSSJSONFlow(flow); } - // 解析DWSJSONFlow，生成DWSNode - public SchedulerFlow resolveDWSJSONFlow(DWSJSONFlow jsonFlow){ + // 解析DSSJSONFlow，生成DSSNode + public SchedulerFlow resolveDSSJSONFlow(DSSJSONFlow jsonFlow){ SchedulerFlow schedulerFlow = createSchedulerFlow(); BeanUtils.copyProperties(jsonFlow,schedulerFlow,"children"); JsonParser parser = new JsonParser(); JsonObject jsonObject = parser.parse(jsonFlow.getJson()).getAsJsonObject(); JsonArray nodeJsonArray = jsonObject.getAsJsonArray("nodes"); Gson gson = new Gson(); - List dwsNodes = gson.fromJson(nodeJsonArray, new TypeToken>() { + List dssNodes = gson.fromJson(nodeJsonArray, new TypeToken>() { }.getType()); List schedulerNodeList = new ArrayList<>(); List schedulerEdgeList = new ArrayList<>(); - for (DWSNode dwsNode : dwsNodes) { + for (DSSNode dssNode : dssNodes) { Optional firstNodeParser = Arrays.stream(getNodeParsers()) - .filter(p -> p.ifNodeCanParse(dwsNode)) + .filter(p -> p.ifNodeCanParse(dssNode)) .sorted((p1, p2) -> p2.getOrder() - p1.getOrder()) .findFirst(); - SchedulerNode schedulerNode = firstNodeParser.orElseThrow(()->new IllegalArgumentException("NodeParser个数应该大于0")).parseNode(dwsNode); + SchedulerNode schedulerNode = firstNodeParser.orElseThrow(()->new IllegalArgumentException("NodeParser个数应该大于0")).parseNode(dssNode); schedulerNodeList.add(schedulerNode); } JsonArray edgeJsonArray = jsonObject.getAsJsonArray("edges"); - List dwsEdges = gson.fromJson(edgeJsonArray, new TypeToken>() { + List dssEdges = gson.fromJson(edgeJsonArray, new TypeToken>() { }.getType()); - for (DWSEdge dwsEdge : dwsEdges) { + for (DSSEdge dssEdge : dssEdges) { SchedulerEdge schedulerEdge = new SchedulerEdgeDefault(); - schedulerEdge.setDWSEdge(dwsEdge); + schedulerEdge.setDssEdge(dssEdge); schedulerEdgeList.add(schedulerEdge); } diff --git a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/AbstractProjectParser.java b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/AbstractProjectParser.java index 27ef1c1c25..a7d481d24b 100644 --- a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/AbstractProjectParser.java +++ b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/AbstractProjectParser.java @@ -21,10 +21,10 @@ import com.webank.wedatasphere.dss.appjoint.scheduler.entity.SchedulerProjectVersionForFlows; import com.webank.wedatasphere.dss.appjoint.scheduler.entity.SchedulerFlow; import com.webank.wedatasphere.dss.appjoint.scheduler.entity.SchedulerProject; -import com.webank.wedatasphere.dss.common.entity.flow.DWSFlow; -import com.webank.wedatasphere.dss.common.entity.flow.DWSJSONFlow; -import com.webank.wedatasphere.dss.common.entity.project.DWSJSONProject; -import com.webank.wedatasphere.dss.common.entity.project.DWSProject; +import com.webank.wedatasphere.dss.common.entity.flow.DSSFlow; +import com.webank.wedatasphere.dss.common.entity.flow.DSSJSONFlow; +import com.webank.wedatasphere.dss.common.entity.project.DSSProject; +import com.webank.wedatasphere.dss.common.entity.project.DSSJSONProject; import com.webank.wedatasphere.dss.common.entity.project.ProjectVersionForFlows; import org.springframework.beans.BeanUtils; @@ -50,27 +50,27 @@ public FlowParser[] getFlowParsers() { return flowParsers; } - public DWSJSONProject parseToDWSJSONProject(DWSProject dwsProject){ - DWSJSONProject dwsjsonProject = new DWSJSONProject(); - BeanUtils.copyProperties(dwsProject,dwsjsonProject,"flows","projectVersions"); - List dwsFlows = dwsProject.getFlows(); - List dwsjsonFlows = dwsFlows.stream().map(this::toDWSJsonFlow).collect(Collectors.toList()); - dwsjsonProject.setFlows(dwsjsonFlows); - return dwsjsonProject; + public DSSJSONProject parseToDssJsonProject(DSSProject dssProject){ + DSSJSONProject dssJsonProject = new DSSJSONProject(); + BeanUtils.copyProperties(dssProject, dssJsonProject,"flows","projectVersions"); + List dwsFlows = dssProject.getFlows(); + List dssJsonFlows = dwsFlows.stream().map(this::toDssJsonFlow).collect(Collectors.toList()); + dssJsonProject.setFlows(dssJsonFlows); + return dssJsonProject; } - private DWSJSONFlow toDWSJsonFlow(DWSFlow dwsFlow){ - DWSJSONFlow dwsjsonFlow = new DWSJSONFlow(); - BeanUtils.copyProperties(dwsFlow,dwsjsonFlow,"children","flowVersions"); - dwsjsonFlow.setJson(dwsFlow.getLatestVersion().getJson()); - if(dwsFlow.getChildren() != null){ - dwsjsonFlow.setChildren(dwsFlow.getChildren().stream().map(this::toDWSJsonFlow).collect(Collectors.toList())); + private DSSJSONFlow toDssJsonFlow(DSSFlow dssFlow){ + DSSJSONFlow dssJsonFlow = new DSSJSONFlow(); + BeanUtils.copyProperties(dssFlow, dssJsonFlow,"children","flowVersions"); + dssJsonFlow.setJson(dssFlow.getLatestVersion().getJson()); + if(dssFlow.getChildren() != null){ + dssJsonFlow.setChildren(dssFlow.getChildren().stream().map(this::toDssJsonFlow).collect(Collectors.toList())); } - return dwsjsonFlow; + return dssJsonFlow; } - public SchedulerProject parseProject(DWSJSONProject project){ + public SchedulerProject parseProject(DSSJSONProject project){ AbstractSchedulerProject schedulerProject = createSchedulerProject(); SchedulerProjectVersionForFlows projectVersionForFlows = new SchedulerProjectVersionForFlows(); schedulerProject.setProjectVersions(new ArrayList()); @@ -81,23 +81,23 @@ public SchedulerProject parseProject(DWSJSONProject project){ return schedulerProject; } - private SchedulerFlow invokeFlowParser(ProjectVersionForFlows projectVersionForFlows, DWSJSONFlow dwsjsonFlow, FlowParser[] flowParsers){ - List flowParsersF = Arrays.stream(flowParsers).filter(f -> f.ifFlowCanParse(dwsjsonFlow)).collect(Collectors.toList()); + private SchedulerFlow invokeFlowParser(ProjectVersionForFlows projectVersionForFlows, DSSJSONFlow dssJsonFlow, FlowParser[] flowParsers){ + List flowParsersF = Arrays.stream(flowParsers).filter(f -> f.ifFlowCanParse(dssJsonFlow)).collect(Collectors.toList()); // TODO: 2019/9/25 如果flowParsers数量>1 ||<=0抛出异常 - SchedulerFlow schedulerFlow = flowParsersF.get(0).parseFlow(dwsjsonFlow); + SchedulerFlow schedulerFlow = flowParsersF.get(0).parseFlow(dssJsonFlow); //收集所有的不分层级的flow？ projectVersionForFlows.addFlow(schedulerFlow); - if(dwsjsonFlow.getChildren() != null){ - List schedulerFlows = dwsjsonFlow.getChildren().stream().map(f -> invokeFlowParser(projectVersionForFlows,f, flowParsers)).collect(Collectors.toList()); + if(dssJsonFlow.getChildren() != null){ + List schedulerFlows = dssJsonFlow.getChildren().stream().map(f -> invokeFlowParser(projectVersionForFlows,f, flowParsers)).collect(Collectors.toList()); schedulerFlow.setChildren(schedulerFlows); } return schedulerFlow; } @Override - public SchedulerProject parseProject(DWSProject dwsProject) { - SchedulerProject schedulerProject = parseProject(parseToDWSJSONProject(dwsProject)); - schedulerProject.setDWSProject(dwsProject); + public SchedulerProject parseProject(DSSProject dssProject) { + SchedulerProject schedulerProject = parseProject(parseToDssJsonProject(dssProject)); + schedulerProject.setDssProject(dssProject); return schedulerProject; } diff --git a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/AbstractReadNodeParser.java b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/AbstractReadNodeParser.java index 6cd767f720..68e8d970e7 100644 --- a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/AbstractReadNodeParser.java +++ b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/AbstractReadNodeParser.java @@ -18,7 +18,7 @@ package com.webank.wedatasphere.dss.appjoint.scheduler.parser; import com.webank.wedatasphere.dss.appjoint.scheduler.entity.SchedulerNode; -import com.webank.wedatasphere.dss.common.entity.node.DWSNode; +import com.webank.wedatasphere.dss.common.entity.node.DSSNode; import com.webank.wedatasphere.dss.appjoint.scheduler.entity.ReadNode; import java.util.Arrays; @@ -32,7 +32,7 @@ public abstract class AbstractReadNodeParser implements ContextNodeParser { @Override public String[] getShareNodeIds(SchedulerNode node) { //需根据节点的参数进行解析生成 - Map jobParams = node.getDWSNode().getParams(); + Map jobParams = node.getDssNode().getParams(); if(jobParams == null) return null; Map configuration =(Map) jobParams.get("configuration"); Map runtime = (Map) configuration.get("runtime"); @@ -57,16 +57,16 @@ public void setReadNodeContext(SchedulerNode node) { @Override public ReadNode parseNode(SchedulerNode node) { ReadNode readNode = createReadNode(); - readNode.setDWSNode(node.getDWSNode()); + readNode.setDssNode(node.getDssNode()); readNode.setSchedulerNode(node); readNode.setShareNodeIds(getShareNodeIds(node)); return readNode; } @Override - public SchedulerNode parseNode(DWSNode dwsNode) { + public SchedulerNode parseNode(DSSNode dssNode) { SchedulerNode schedulerNode = createSchedulerNode(); - schedulerNode.setDWSNode(dwsNode); + schedulerNode.setDssNode(dssNode); return parseNode(schedulerNode); } diff --git a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/FlowParser.java b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/FlowParser.java index b6b49897c6..85369debce 100644 --- a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/FlowParser.java +++ b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/FlowParser.java @@ -19,18 +19,18 @@ import com.webank.wedatasphere.dss.appjoint.scheduler.entity.SchedulerFlow; -import com.webank.wedatasphere.dss.common.entity.flow.DWSJSONFlow; +import com.webank.wedatasphere.dss.common.entity.flow.DSSJSONFlow; /** * Created by enjoyyin on 2019/9/7. */ public interface FlowParser { - SchedulerFlow parseFlow(DWSJSONFlow flow); + SchedulerFlow parseFlow(DSSJSONFlow flow); void setNodeParsers(NodeParser[] nodeParsers); NodeParser[] getNodeParsers(); - Boolean ifFlowCanParse(DWSJSONFlow flow); + Boolean ifFlowCanParse(DSSJSONFlow flow); } diff --git a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/NodeParser.java b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/NodeParser.java index 602d386235..ebba917a16 100644 --- a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/NodeParser.java +++ b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/NodeParser.java @@ -18,14 +18,14 @@ package com.webank.wedatasphere.dss.appjoint.scheduler.parser; import com.webank.wedatasphere.dss.appjoint.scheduler.entity.SchedulerNode; -import com.webank.wedatasphere.dss.common.entity.node.DWSNode; +import com.webank.wedatasphere.dss.common.entity.node.DSSNode; import com.webank.wedatasphere.dss.appjoint.scheduler.order.Order; /** * Created by enjoyyin on 2019/9/7. */ public interface NodeParser extends Order { - SchedulerNode parseNode(DWSNode dwsNode); + SchedulerNode parseNode(DSSNode dssNode); - Boolean ifNodeCanParse(DWSNode dwsNode); + Boolean ifNodeCanParse(DSSNode dssNode); } diff --git a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/ProjectParser.java b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/ProjectParser.java index 13ffd4362c..db00db311a 100644 --- a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/ProjectParser.java +++ b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/ProjectParser.java @@ -18,13 +18,13 @@ package com.webank.wedatasphere.dss.appjoint.scheduler.parser; import com.webank.wedatasphere.dss.appjoint.scheduler.entity.SchedulerProject; -import com.webank.wedatasphere.dss.common.entity.project.DWSProject; +import com.webank.wedatasphere.dss.common.entity.project.DSSProject; /** * Created by enjoyyin on 2019/9/16. */ public interface ProjectParser { - SchedulerProject parseProject(DWSProject dwsProject); + SchedulerProject parseProject(DSSProject dssProject); void setFlowParsers(FlowParser[] flowParser); FlowParser[] getFlowParsers(); diff --git a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/SendEmailNodeParser.java b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/SendEmailNodeParser.java index f4511a8d39..1bd3606f0d 100644 --- a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/SendEmailNodeParser.java +++ b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/parser/SendEmailNodeParser.java @@ -18,7 +18,7 @@ package com.webank.wedatasphere.dss.appjoint.scheduler.parser; import com.webank.wedatasphere.dss.appjoint.scheduler.constant.SchedulerAppJointConstant; -import com.webank.wedatasphere.dss.common.entity.node.DWSNode; +import com.webank.wedatasphere.dss.common.entity.node.DSSNode; import java.util.Map; @@ -28,9 +28,9 @@ public abstract class SendEmailNodeParser extends AbstractReadNodeParser { @Override - public Boolean ifNodeCanParse(DWSNode dwsNode) { + public Boolean ifNodeCanParse(DSSNode dssNode) { //判断是sendemail 并且category是node - Map params = dwsNode.getParams(); + Map params = dssNode.getParams(); if(params != null && !params.isEmpty()){ Object configuration = params.get(SchedulerAppJointConstant.CONFIGURATION); if(configuration instanceof Map){ @@ -38,7 +38,7 @@ public Boolean ifNodeCanParse(DWSNode dwsNode) { if(runtime instanceof Map){ Object category = ((Map) runtime).get(SchedulerAppJointConstant.CATEGORY); if(category != null && SchedulerAppJointConstant.NODE.equals(category.toString())){ - return SchedulerAppJointConstant.SENDEMAIL_NODE_TYPE.equals(dwsNode.getNodeType()); + return SchedulerAppJointConstant.SENDEMAIL_NODE_TYPE.equals(dssNode.getNodeType()); } } } diff --git a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/tuning/AbstractFlowTuning.java b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/tuning/AbstractFlowTuning.java index f55ca135c8..42423a69d6 100644 --- a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/tuning/AbstractFlowTuning.java +++ b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/tuning/AbstractFlowTuning.java @@ -75,8 +75,8 @@ private void setDependencies(SchedulerNode node,List schedulerNod private List resolveDependencys(SchedulerNode node,List schedulerNodes, List flowEdges) { List dependencys = new ArrayList<>(); flowEdges.forEach(edge -> { - if (edge.getDWSEdge().getTarget().equals(node.getId())) { - dependencys.add(schedulerNodes.stream().filter(n ->edge.getDWSEdge().getSource().equals(n.getId())).findFirst().get().getName()); + if (edge.getDssEdge().getTarget().equals(node.getId())) { + dependencys.add(schedulerNodes.stream().filter(n ->edge.getDssEdge().getSource().equals(n.getId())).findFirst().get().getName()); } }); @@ -112,7 +112,7 @@ private String getProxyUser(SchedulerFlow schedulerFlow) { private void setProxyUser(SchedulerFlow schedulerFlow) { String proxyUser = getProxyUser(schedulerFlow); if(StringUtils.isNotBlank(proxyUser)) { - schedulerFlow.getSchedulerNodes().forEach(node -> node.getDWSNode().setUserProxy(proxyUser)); + schedulerFlow.getSchedulerNodes().forEach(node -> node.getDssNode().setUserProxy(proxyUser)); schedulerFlow.setUserProxy(proxyUser); } } diff --git a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/tuning/AbstractShareNodeFlowTuning.java b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/tuning/AbstractShareNodeFlowTuning.java index 7a1cb8bce2..81dc0d5d31 100644 --- a/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/tuning/AbstractShareNodeFlowTuning.java +++ b/dss-scheduler-appjoint-core/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/tuning/AbstractShareNodeFlowTuning.java @@ -83,7 +83,7 @@ public Map getShareNodes(SchedulerFlow flow, ReadNode[] read if(schedulerNode != null) { int shareTimes = (nameAndNumMap.get(key)).intValue(); ShareNode shareNode = createShareNode(); - shareNode.setDWSNode(schedulerNode.getDWSNode()); + shareNode.setDssNode(schedulerNode.getDssNode()); shareNode.setSchedulerNode(schedulerNode); shareNode.setShareTimes(shareTimes); res.put(shareNode, shareTimes); diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/constant/DSSServerConstant.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/constant/DSSServerConstant.java index 7fbe79fcf7..95ab683080 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/constant/DSSServerConstant.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/constant/DSSServerConstant.java @@ -19,10 +19,10 @@ public class DSSServerConstant { - public static final String DWS_PROJECT_FIRST_VERSION = "v000001"; - public static final String DWS_PROJECT_FIRST_VERSION_COMMENT = "first version"; - public static final String DWS_PROJECT_SOURCE = "create by user"; - public static final String DWS_WORKSPACE_SOURCE = "create by user"; + public static final String DSS_PROJECT_FIRST_VERSION = "v000001"; + public static final String DSS_PROJECT_FIRST_VERSION_COMMENT = "first version"; + public static final String DSS_PROJECT_SOURCE = "create by user"; + public static final String DSS_WORKSPACE_SOURCE = "create by user"; public static final String PROJECT_VERSION_ID = "projectVersionID"; public static final String PUBLISH_FLOW_REPORT_FORMATE = "工作流名:%s,版本号:%s，工作流内容为空,请自行修改或者删除"; public static final String EMVEDDEDFLOWID = "\"embeddedFlowId\":"; diff --git a/dss-application/src/main/java/com/webank/wedatasphere/dss/application/dao/DSSUserMapper.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/DSSUserMapper.java similarity index 86% rename from dss-application/src/main/java/com/webank/wedatasphere/dss/application/dao/DSSUserMapper.java rename to dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/DSSUserMapper.java index fe81ae46a4..31d4974e12 100644 --- a/dss-application/src/main/java/com/webank/wedatasphere/dss/application/dao/DSSUserMapper.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/DSSUserMapper.java @@ -15,14 +15,15 @@ * */ -package com.webank.wedatasphere.dss.application.dao; +package com.webank.wedatasphere.dss.server.dao; import com.webank.wedatasphere.dss.application.entity.DSSUser; -/** - * Created by chaogefeng on 2019/10/11. - */ public interface DSSUserMapper { + Long getUserID(String userName); + + String getuserName(Long userID); + DSSUser getUserByName(String username); void registerDSSUser(DSSUser userDb); diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/FlowMapper.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/FlowMapper.java index 52fa6fb2be..ea830d7cf8 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/FlowMapper.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/FlowMapper.java @@ -18,8 +18,8 @@ package com.webank.wedatasphere.dss.server.dao; -import com.webank.wedatasphere.dss.common.entity.flow.DWSFlow; -import com.webank.wedatasphere.dss.common.entity.flow.DWSFlowVersion; +import com.webank.wedatasphere.dss.common.entity.flow.DSSFlow; +import com.webank.wedatasphere.dss.common.entity.flow.DSSFlowVersion; import org.apache.ibatis.annotations.Param; import org.springframework.dao.DuplicateKeyException; @@ -27,23 +27,23 @@ public interface FlowMapper { - DWSFlow selectFlowByID(Long id); + DSSFlow selectFlowByID(Long id); - List listFlowByTaxonomyID(@Param("projectID") Long projectID, @Param("taxonomyID") Long taxonomyID, @Param("isRootFlow") Boolean isRootFlow); + List listFlowByTaxonomyID(@Param("projectID") Long projectID, @Param("taxonomyID") Long taxonomyID, @Param("isRootFlow") Boolean isRootFlow); - List listFlowVersionsByFlowID(@Param("flowID") Long flowID, @Param("projectVersionID") Long projectVersionID); + List listFlowVersionsByFlowID(@Param("flowID") Long flowID, @Param("projectVersionID") Long projectVersionID); - void insertFlow(DWSFlow dwsFlow) throws DuplicateKeyException; + void insertFlow(DSSFlow dssFlow) throws DuplicateKeyException; - void insertFlowVersion(DWSFlowVersion version); + void insertFlowVersion(DSSFlowVersion version); - void batchInsertFlowVersion(@Param("flowVersions") List flowVersions); + void batchInsertFlowVersion(@Param("flowVersions") List flowVersions); void insertFlowRelation(@Param("flowID") Long flowID, @Param("parentFlowID") Long parentFlowID); - DWSFlowVersion selectVersionByFlowID(@Param("flowID") Long flowID, @Param("version") String version, @Param("projectVersionID") Long projectVersionID); + DSSFlowVersion selectVersionByFlowID(@Param("flowID") Long flowID, @Param("version") String version, @Param("projectVersionID") Long projectVersionID); - void updateFlowBaseInfo(DWSFlow dwsFlow) throws DuplicateKeyException; + void updateFlowBaseInfo(DSSFlow dssFlow) throws DuplicateKeyException; List selectSubFlowIDByParentFlowID(Long parentFlowID); @@ -55,17 +55,17 @@ public interface FlowMapper { Long selectParentFlowIDByFlowID(Long flowID); - List listFlowByProjectID(Long projectID); + List listFlowByProjectID(Long projectID); - List listVersionByFlowIDAndProjectVersionID(@Param("flowID") Long flowID, @Param("projectVersionID") Long projectVersionID); + List listVersionByFlowIDAndProjectVersionID(@Param("flowID") Long flowID, @Param("projectVersionID") Long projectVersionID); Boolean noVersions(Long flowID); - List listLastFlowVersionsByProjectVersionID(@Param("projectVersionID") Long projectVersionId); + List listLastFlowVersionsByProjectVersionID(@Param("projectVersionID") Long projectVersionId); - List listLatestRootFlowVersionByProjectVersionID(Long projectVersionID); + List listLatestRootFlowVersionByProjectVersionID(Long projectVersionID); - void batchUpdateFlowVersion(List flowVersions); + void batchUpdateFlowVersion(List flowVersions); Long getParentFlowID(Long flowID); } diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/FlowTaxonomyMapper.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/FlowTaxonomyMapper.java index f5c3dc1ec1..640e8b7d03 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/FlowTaxonomyMapper.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/FlowTaxonomyMapper.java @@ -18,7 +18,7 @@ package com.webank.wedatasphere.dss.server.dao; -import com.webank.wedatasphere.dss.server.entity.DWSFlowTaxonomy; +import com.webank.wedatasphere.dss.server.entity.DSSFlowTaxonomy; import org.apache.ibatis.annotations.Param; import org.springframework.dao.DuplicateKeyException; @@ -26,11 +26,11 @@ public interface FlowTaxonomyMapper { - DWSFlowTaxonomy selectFlowTaxonomyByID(Long id); + DSSFlowTaxonomy selectFlowTaxonomyByID(Long id); - void insertFlowTaxonomy(DWSFlowTaxonomy dwsFlowTaxonomy) throws DuplicateKeyException; + void insertFlowTaxonomy(DSSFlowTaxonomy dssFlowTaxonomy) throws DuplicateKeyException; - void updateFlowTaxonomy(DWSFlowTaxonomy dwsFlowTaxonomy) throws DuplicateKeyException; + void updateFlowTaxonomy(DSSFlowTaxonomy dssFlowTaxonomy) throws DuplicateKeyException; Long hasFlows(Long flowTaxonomyID); @@ -47,5 +47,5 @@ public interface FlowTaxonomyMapper { void deleteFlowTaxonomyByProjectID(Long projectID); - List listFlowTaxonomyByProjectID(Long projectID); + List listFlowTaxonomyByProjectID(Long projectID); } diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/ProjectMapper.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/ProjectMapper.java index b5757d1f8b..c2ae56786d 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/ProjectMapper.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/ProjectMapper.java @@ -18,9 +18,9 @@ package com.webank.wedatasphere.dss.server.dao; -import com.webank.wedatasphere.dss.common.entity.project.DWSProject; -import com.webank.wedatasphere.dss.common.entity.project.DWSProjectPublishHistory; -import com.webank.wedatasphere.dss.common.entity.project.DWSProjectVersion; +import com.webank.wedatasphere.dss.common.entity.project.DSSProject; +import com.webank.wedatasphere.dss.common.entity.project.DSSProjectPublishHistory; +import com.webank.wedatasphere.dss.common.entity.project.DSSProjectVersion; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -28,19 +28,19 @@ public interface ProjectMapper { - DWSProject selectProjectByID(Long id); + DSSProject selectProjectByID(Long id); - DWSProjectVersion selectLatestVersionByProjectID(Long projectID); + DSSProjectVersion selectLatestVersionByProjectID(Long projectID); - DWSProject selectProjectByVersionID(Long projectVersionID); + DSSProject selectProjectByVersionID(Long projectVersionID); - void addProject(DWSProject dwsProject); + void addProject(DSSProject dssProject); - void addProjectVersion(DWSProjectVersion dwsProjectVersion); + void addProjectVersion(DSSProjectVersion dssProjectVersion); void updateDescription(@Param("projectID") Long projectID, @Param("description") String description, @Param("product")String product ,@Param("applicationArea")Integer applicationArea ,@Param("business")String business); - List listProjectVersionsByProjectID(Long projectID); + List listProjectVersionsByProjectID(Long projectID); Boolean noPublished(Long projectID); @@ -48,15 +48,15 @@ public interface ProjectMapper { void deleteProjectBaseInfo(long projectID); - DWSProjectVersion selectProjectVersionByID(Long id); + DSSProjectVersion selectProjectVersionByID(Long id); - DWSProjectVersion selectProjectVersionByProjectIDAndVersionID(@Param("projectID") Long projectId, @Param("version") String version); + DSSProjectVersion selectProjectVersionByProjectIDAndVersionID(@Param("projectID") Long projectId, @Param("version") String version); Integer updateLock(@Param("lock") Integer lock, @Param("projectVersionID") Long projectVersionID); - DWSProjectPublishHistory selectProjectPublishHistoryByProjectVersionID(Long projectVersionID); + DSSProjectPublishHistory selectProjectPublishHistoryByProjectVersionID(Long projectVersionID); - void insertPublishHistory(DWSProjectPublishHistory dwsProjectPublishHistory); + void insertPublishHistory(DSSProjectPublishHistory dssProjectPublishHistory); void updatePublishHistoryState(@Param("projectVersionID") Long projectVersionID, @Param("status") Integer status); diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/ProjectTaxonomyMapper.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/ProjectTaxonomyMapper.java index 3d87bde6b7..21fc44e41a 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/ProjectTaxonomyMapper.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/ProjectTaxonomyMapper.java @@ -17,8 +17,8 @@ package com.webank.wedatasphere.dss.server.dao; -import com.webank.wedatasphere.dss.server.entity.DWSProjectTaxonomy; -import com.webank.wedatasphere.dss.server.entity.DWSProjectTaxonomyRelation; +import com.webank.wedatasphere.dss.server.entity.DSSProjectTaxonomy; +import com.webank.wedatasphere.dss.server.entity.DSSProjectTaxonomyRelation; import org.apache.ibatis.annotations.Param; import org.springframework.dao.DuplicateKeyException; @@ -26,16 +26,16 @@ public interface ProjectTaxonomyMapper { - DWSProjectTaxonomy selectProjectTaxonomyByID(Long id); - DWSProjectTaxonomyRelation selectProjectTaxonomyRelationByTaxonomyIdOrProjectId(Long taxonomyIdOrProjectId); - List listProjectTaxonomyByUser(String userName); + DSSProjectTaxonomy selectProjectTaxonomyByID(Long id); + DSSProjectTaxonomyRelation selectProjectTaxonomyRelationByTaxonomyIdOrProjectId(Long taxonomyIdOrProjectId); + List listProjectTaxonomyByUser(String userName); //-------------------- List listProjectIDByTaxonomyID(@Param("taxonomyID") Long taxonomyID, @Param("userName") String userName); - void insertProjectTaxonomy(DWSProjectTaxonomy dwsProjectTaxonomy) throws DuplicateKeyException; + void insertProjectTaxonomy(DSSProjectTaxonomy dssProjectTaxonomy) throws DuplicateKeyException; - void updateProjectTaxonomy(DWSProjectTaxonomy dwsProjectTaxonomy) throws DuplicateKeyException; + void updateProjectTaxonomy(DSSProjectTaxonomy dssProjectTaxonomy) throws DuplicateKeyException; Long hasProjects(Long projectTaxonomyID); diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/WorkspaceMapper.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/WorkspaceMapper.java index 387c597ff8..c8fb47c3d2 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/WorkspaceMapper.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/WorkspaceMapper.java @@ -15,11 +15,11 @@ */ public interface WorkspaceMapper { - List getWorkspaces(); + List getWorkspaces(); - List findByWorkspaceName(String name); + List findByWorkspaceName(String name); - void addWorkSpace(DWSWorkspace dwsWorkspace); + void addWorkSpace(DSSWorkspace dssWorkspace); List getHomepageDemoMenusEn(); List getHomepageDemoMenusCn(); @@ -30,7 +30,7 @@ public interface WorkspaceMapper { List getHomepageVideosEn(); List getHomepageVideosCn(); - DWSWorkspace getWorkspaceById(Long workspaceId); + DSSWorkspace getWorkspaceById(Long workspaceId); List getManagementMenuCn(); List getManagementMenuEn(); @@ -45,7 +45,7 @@ public interface WorkspaceMapper { List getWorkspaceFavoritesEn(@Param("username") String username, @Param("workspaceId") Long workspaceId); - void addFavorite(DWSFavorite dwsFavorite); + void addFavorite(DSSFavorite dssFavorite); void deleteFavorite(Long favouritesId); } diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/dwsUserMapper.xml b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/dwsUserMapper.xml index 65fbd5eb2c..ac65dce4fc 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/dwsUserMapper.xml +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/dwsUserMapper.xml @@ -19,7 +19,7 @@ - + diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/flowMapper.xml b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/flowMapper.xml index 38d66f96cf..37dae091a4 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/flowMapper.xml +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/flowMapper.xml @@ -29,11 +29,11 @@ id,`flow_id`,`source`,`version`,`json_path`,`comment`,`update_time`,`updator_id`,`project_version_id` - SELECT * FROM `dss_flow` WHERE id = #{id} - SELECT f.* FROM @@ -44,7 +44,7 @@ AND f.project_id=#{projectID} - - - SELECT fv.*, bdu.`name` AS 'updator', ISNULL(fph.id) AS 'is_not_published' @@ -86,19 +86,19 @@ - + INSERT INTO dss_flow () VALUES (#{id},#{name},#{state},#{source},#{description},#{createTime},#{creatorID},#{isRootFlow},#{rank},#{projectID},#{hasSaved},#{uses}) - + INSERT INTO dss_flow_version () VALUES (#{id},#{flowID},#{source},#{version},#{jsonPath},#{comment},#{updateTime},#{updatorID},#{projectVersionID}) - + INSERT INTO dss_flow_version ( `flow_id`,`source`,`version`,`json_path`,`comment`,`update_time`,`updator_id`,`project_version_id`) VALUES @@ -107,7 +107,7 @@ - + UPDATE dss_flow_version source= #{fv.source} @@ -127,7 +127,7 @@ (#{flowID},#{parentFlowID}) - SELECT fv.*, bdu.`name` AS 'updator', ISNULL(fph.id) AS 'is_not_published' @@ -141,7 +141,7 @@ AND fv.project_version_id = #{projectVersionID} - + UPDATE dss_flow name=#{name}, @@ -186,7 +186,7 @@ flow_id = #{flowID} - SELECT * FROM @@ -195,7 +195,7 @@ project_id = #{projectID} - SELECT fv.*, bdu.`name` AS 'updator', ISNULL(fph.id) AS 'is_not_published' @@ -218,7 +218,7 @@ LIMIT 1 - select from dss_flow_version as fv where version = @@ -228,7 +228,7 @@ and fv.flow_id=flow_id ) ; - SELECT fv.* FROM diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/flowTaxonomyMapper.xml b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/flowTaxonomyMapper.xml index 60b04c3e77..c681f768ca 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/flowTaxonomyMapper.xml +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/flowTaxonomyMapper.xml @@ -25,17 +25,17 @@ id, `name`,`description`,`creator_id`,`create_time`,`update_time`,`project_id` - SELECT * FROM `dss_flow_taxonomy` WHERE id = #{id} - + INSERT INTO dss_flow_taxonomy () VALUES (#{id},#{name},#{description},#{creatorID},#{createTime},#{updateTime},#{projectID}) - + UPDATE dss_flow_taxonomy name=#{name}, @@ -84,7 +84,7 @@ - SELECT * FROM diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/projectMapper.xml b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/projectMapper.xml index 1ff0893b93..049b5ffb51 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/projectMapper.xml +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/projectMapper.xml @@ -33,7 +33,7 @@ id,`project_version_id`,`create_time`,`creator_id`,`update_time`,`comment`,`state`,`version_path`,`expire_time` - SELECT p.*, MIN(ISNULL(pph.id)) AS 'is_not_publish' FROM @@ -44,11 +44,11 @@ p.id = #{id} - SELECT * FROM dss_project_version WHERE project_id = #{projectID} ORDER BY id DESC LIMIT 1 - SELECT wp.* FROM @@ -58,13 +58,13 @@ wpv.id = #{projrctVersionID} - + INSERT INTO dss_project () VALUES (#{id},#{name},#{source},#{description},#{orgID},#{visibility},#{isTransfer},#{initialOrgID},#{userID},#{createTime},#{createBy},#{product},#{applicationArea},#{business}) - + INSERT INTO dss_project_version () VALUES (#{id},#{projectID},#{version},#{comment},#{updateTime},#{updatorID},#{lock}) @@ -76,11 +76,11 @@ WHERE id = #{projectID} - - SELECT pv.*, u.`name` AS 'updator', ( @@ -126,11 +126,11 @@ id = #{projectID} - SELECT * from dss_project_version WHERE id = #{id} - SELECT * from dss_project_version WHERE project_id = #{projectID} and version = #{version} @@ -138,7 +138,7 @@ UPDATE `dss_project_version` set `lock` = `lock` +1 WHERE id= #{projectVersionID} AND `lock` = #{lock} - SELECT pph.*, u.`name` as 'creator' FROM @@ -148,7 +148,7 @@ pph.project_version_id = #{projectVersionID} - + INSERT INTO dss_project_publish_history () VALUES (#{id},#{projectVersionID},#{createTime},#{createID},#{updateTime},#{comment},#{state},#{versionPath},#{expireTime}) diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/projectTaxonomyMapper.xml b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/projectTaxonomyMapper.xml index 418736c883..9c0333953c 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/projectTaxonomyMapper.xml +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/projectTaxonomyMapper.xml @@ -23,16 +23,16 @@ id, `name`,`description`,`creator_id`,`create_time`,`update_time` - SELECT * FROM `dss_project_taxonomy` WHERE id = #{id} - SELECT taxonomy_id as taxonomyId , project_id as projectId , creator_id as creatorId FROM `dss_project_taxonomy_relation` WHERE project_id = #{taxonomyIdOrProjectId} - SELECT pt.* FROM @@ -54,13 +54,13 @@ AND bdu.`name` = #{userName} - + INSERT INTO dss_project_taxonomy () VALUES (#{id},#{name},#{description},#{creatorID},#{createTime},#{updateTime}) - + UPDATE dss_project_taxonomy name=#{name}, diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/workspaceMapper.xml b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/workspaceMapper.xml index 854904bd9b..4b60c00143 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/workspaceMapper.xml +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/workspaceMapper.xml @@ -39,19 +39,19 @@ id,`username`,`workspace_id`,`menu_application_id`,`order`,`create_by`,`create_time`,`last_update_user`,`last_update_time` - SELECT * FROM dss_workspace ORDER BY dss_workspace.`create_time` DESC - SELECT * FROM dss_workspace WHERE id = #{workspaceId} - SELECT * FROM dss_workspace @@ -59,7 +59,7 @@ - + INSERT INTO dss_workspace () VALUES (#{id},#{name},#{label},#{description},#{department},#{product},#{source},#{createBy},#{createTime},#{lastUpdateUser},#{lastUpdateTime}) @@ -184,7 +184,7 @@ - + INSERT INTO dss_onestop_user_favorites () VALUES (#{id},#{username},#{workspaceId},#{menuApplicationId},#{order},#{createBy},#{createTime},#{lastUpdateUser},#{lastUpdateTime}) diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DWSFavorite.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DSSFavorite.java similarity index 95% rename from dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DWSFavorite.java rename to dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DSSFavorite.java index 07a1b48828..adf32fcba9 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DWSFavorite.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DSSFavorite.java @@ -3,7 +3,7 @@ /** * Created by Adamyuanyuan on 2020/6/25 */ -public class DWSFavorite extends BaseEntity{ +public class DSSFavorite extends BaseEntity{ private Long id; diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DWSFlowTaxonomy.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DSSFlowTaxonomy.java similarity index 86% rename from dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DWSFlowTaxonomy.java rename to dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DSSFlowTaxonomy.java index f5d20f659b..314e21ea5d 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DWSFlowTaxonomy.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DSSFlowTaxonomy.java @@ -17,13 +17,13 @@ package com.webank.wedatasphere.dss.server.entity; -import com.webank.wedatasphere.dss.common.entity.flow.DWSFlow; +import com.webank.wedatasphere.dss.common.entity.flow.DSSFlow; import java.util.Date; import java.util.List; -public class DWSFlowTaxonomy { +public class DSSFlowTaxonomy { private Long id; private String name; private String description; @@ -31,14 +31,14 @@ public class DWSFlowTaxonomy { private Date createTime; private Date updateTime; private Long projectID; - private List dwsFlowList; + private List dssFlowList; - public List getDwsFlowList() { - return dwsFlowList; + public List getDssFlowList() { + return dssFlowList; } - public void setDwsFlowList(List dwsFlowList) { - this.dwsFlowList = dwsFlowList; + public void setDssFlowList(List dssFlowList) { + this.dssFlowList = dssFlowList; } public Long getId() { diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DWSProjectTaxonomy.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DSSProjectTaxonomy.java similarity index 84% rename from dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DWSProjectTaxonomy.java rename to dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DSSProjectTaxonomy.java index eccf702a04..302b806752 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DWSProjectTaxonomy.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DSSProjectTaxonomy.java @@ -17,27 +17,27 @@ package com.webank.wedatasphere.dss.server.entity; -import com.webank.wedatasphere.dss.common.entity.project.DWSProject; +import com.webank.wedatasphere.dss.common.entity.project.DSSProject; import java.util.Date; import java.util.List; -public class DWSProjectTaxonomy { +public class DSSProjectTaxonomy { private Long id; private String name; private String description; private Long creatorID; private Date createTime; private Date updateTime; - private List dwsProjectList; + private List dssProjectList; - public List getDwsProjectList() { - return dwsProjectList; + public List getDssProjectList() { + return dssProjectList; } - public void setDwsProjectList(List dwsProjectList) { - this.dwsProjectList = dwsProjectList; + public void setDssProjectList(List dssProjectList) { + this.dssProjectList = dssProjectList; } public Long getId() { diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DWSProjectTaxonomyRelation.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DSSProjectTaxonomyRelation.java similarity index 96% rename from dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DWSProjectTaxonomyRelation.java rename to dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DSSProjectTaxonomyRelation.java index 80f38328ae..accdf3e4b1 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DWSProjectTaxonomyRelation.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DSSProjectTaxonomyRelation.java @@ -17,7 +17,7 @@ package com.webank.wedatasphere.dss.server.entity; -public class DWSProjectTaxonomyRelation { +public class DSSProjectTaxonomyRelation { private Long taxonomyId; private Long projectId; private Long creatorId; diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DWSWorkspace.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DSSWorkspace.java similarity index 96% rename from dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DWSWorkspace.java rename to dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DSSWorkspace.java index 11ce3a9e77..8bc1756711 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DWSWorkspace.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DSSWorkspace.java @@ -3,7 +3,7 @@ /** * Created by schumiyi on 2020/6/22 */ -public class DWSWorkspace extends BaseEntity{ +public class DSSWorkspace extends BaseEntity { private Long id; diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/function/FunctionInvoker.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/function/FunctionInvoker.java index be5232f51d..d4ef8bc4bd 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/function/FunctionInvoker.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/function/FunctionInvoker.java @@ -25,7 +25,7 @@ import com.webank.wedatasphere.dss.appjoint.service.session.Session; import com.webank.wedatasphere.dss.application.entity.Application; import com.webank.wedatasphere.dss.application.service.ApplicationService; -import com.webank.wedatasphere.dss.common.entity.project.DWSProject; +import com.webank.wedatasphere.dss.common.entity.project.DSSProject; import com.webank.wedatasphere.dss.common.entity.project.Project; import com.webank.wedatasphere.dss.server.dao.ProjectMapper; import org.apache.commons.math3.util.Pair; @@ -66,7 +66,7 @@ public Map nodeServiceFunction(String userName, Map> projectServiceAddFunction(DWSProject project, ProjectServiceAddFunction projectServiceAddFunction, List appJoints) throws AppJointErrorException { + public List> projectServiceAddFunction(DSSProject project, ProjectServiceAddFunction projectServiceAddFunction, List appJoints) throws AppJointErrorException { ArrayList> projects = new ArrayList<>(); for (AppJoint appJoint : appJoints) { Project appJointProject = null; @@ -84,7 +84,7 @@ public List> projectServiceAddFunction(DWSProject project, return projects; } - public void projectServiceFunction(DWSProject project, ProjectServiceFunction projectServiceFunction, List appJoints) throws AppJointErrorException { + public void projectServiceFunction(DSSProject project, ProjectServiceFunction projectServiceFunction, List appJoints) throws AppJointErrorException { for (AppJoint appJoint : appJoints) { Session session = null; if(appJoint.getSecurityService() != null){ diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/lock/LockAspect.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/lock/LockAspect.java index b41287dddc..473f224c51 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/lock/LockAspect.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/lock/LockAspect.java @@ -19,7 +19,7 @@ import com.webank.wedatasphere.dss.server.constant.DSSServerConstant; import com.webank.wedatasphere.dss.server.dao.ProjectMapper; -import com.webank.wedatasphere.dss.common.entity.project.DWSProjectVersion; +import com.webank.wedatasphere.dss.common.entity.project.DSSProjectVersion; import com.webank.wedatasphere.dss.common.exception.DSSErrorException; import org.apache.commons.lang.ArrayUtils; import org.aspectj.lang.ProceedingJoinPoint; @@ -70,11 +70,11 @@ public Object around(ProceedingJoinPoint point) throws Throwable { return point.proceed(); } logger.info("projectVersionID为：" + projectVersionID); - DWSProjectVersion dwsProjectVersion = projectMapper.selectProjectVersionByID(projectVersionID); - Integer lock = dwsProjectVersion.getLock(); + DSSProjectVersion dssProjectVersion = projectMapper.selectProjectVersionByID(projectVersionID); + Integer lock = dssProjectVersion.getLock(); try { Object proceed = point.proceed(); - judge(lockAnnotation, dwsProjectVersion, lock, projectVersionID); + judge(lockAnnotation, dssProjectVersion, lock, projectVersionID); return proceed; } catch (Exception e) { logger.info("执行过程出现异常", e); @@ -82,16 +82,16 @@ public Object around(ProceedingJoinPoint point) throws Throwable { } } - private void judge(Lock lockAnnotation, DWSProjectVersion dwsProjectVersion, Integer lock, Long projectVersionID) throws DSSErrorException { + private void judge(Lock lockAnnotation, DSSProjectVersion dssProjectVersion, Integer lock, Long projectVersionID) throws DSSErrorException { if (lockAnnotation.type().equals(LockEnum.ADD)) { logger.info("projectVersion会增加"); - List dwsProjectVersions = projectMapper.listProjectVersionsByProjectID(dwsProjectVersion.getProjectID()); - if (dwsProjectVersions.size() < 2 || !dwsProjectVersions.get(1).getId().equals(projectVersionID)) { + List dssProjectVersions = projectMapper.listProjectVersionsByProjectID(dssProjectVersion.getProjectID()); + if (dssProjectVersions.size() < 2 || !dssProjectVersions.get(1).getId().equals(projectVersionID)) { throw new DSSErrorException(67457, "已经有别的用户对此project进行了版本更新操作，不能进行此操作！"); } } else { logger.info("projectVersion不会增加"); - DWSProjectVersion latest = projectMapper.selectLatestVersionByProjectID(dwsProjectVersion.getProjectID()); + DSSProjectVersion latest = projectMapper.selectLatestVersionByProjectID(dssProjectVersion.getProjectID()); if (!latest.getId().equals(projectVersionID)) { throw new DSSErrorException(67455, "目前project版本已经不是最新，不能进行此操作！"); } diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/operate/AppJointNodeOperate.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/operate/AppJointNodeOperate.java index 5c7dd7ab4b..276e99d3e2 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/operate/AppJointNodeOperate.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/operate/AppJointNodeOperate.java @@ -20,11 +20,10 @@ import com.webank.wedatasphere.dss.appjoint.exception.AppJointErrorException; import com.webank.wedatasphere.dss.appjoint.execution.core.CommonAppJointNode; -import com.webank.wedatasphere.dss.appjoint.service.NodeService; import com.webank.wedatasphere.dss.server.function.FunctionInvoker; import com.webank.wedatasphere.dss.server.function.FunctionPool; import com.webank.wedatasphere.dss.server.function.NodeServiceFunction; -import com.webank.wedatasphere.dss.server.service.DWSFlowService; +import com.webank.wedatasphere.dss.server.service.DSSFlowService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -41,17 +40,17 @@ public boolean canInvokeOperate(Op op) { } @Override - public void add(DWSFlowService dwsFlowService, Op op) throws AppJointErrorException { + public void add(DSSFlowService dssFlowService, Op op) throws AppJointErrorException { invokeNodeServiceFunction(op,FunctionPool.createNode); } @Override - public void update(DWSFlowService dwsFlowService,Op op) throws AppJointErrorException { + public void update(DSSFlowService dssFlowService, Op op) throws AppJointErrorException { invokeNodeServiceFunction(op,FunctionPool.updateNode); } @Override - public void delete(DWSFlowService dwsFlowService,Op op) throws AppJointErrorException { + public void delete(DSSFlowService dssFlowService, Op op) throws AppJointErrorException { invokeNodeServiceFunction(op, FunctionPool.deleteNode); } @@ -64,7 +63,4 @@ private void invokeNodeServiceFunction(Op op,NodeServiceFunction function) throw node.setNodeType(op.getNodeType()); functionInvoker.nodeServiceFunction(userName,op.getParams(),node,function); } - - - } diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/operate/Operate.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/operate/Operate.java index 75beee6d01..ec44935c8d 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/operate/Operate.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/operate/Operate.java @@ -20,7 +20,7 @@ import com.webank.wedatasphere.dss.appjoint.exception.AppJointErrorException; -import com.webank.wedatasphere.dss.server.service.DWSFlowService; +import com.webank.wedatasphere.dss.server.service.DSSFlowService; import com.webank.wedatasphere.dss.common.exception.DSSErrorException; @@ -28,9 +28,9 @@ public interface Operate { boolean canInvokeOperate(Op op); - void add(DWSFlowService dwsFlowService, Op op) throws DSSErrorException, AppJointErrorException; + void add(DSSFlowService dssFlowService, Op op) throws DSSErrorException, AppJointErrorException; - void update(DWSFlowService dwsFlowService, Op op) throws DSSErrorException, AppJointErrorException; + void update(DSSFlowService dssFlowService, Op op) throws DSSErrorException, AppJointErrorException; - void delete(DWSFlowService dwsFlowService, Op op) throws DSSErrorException, AppJointErrorException; + void delete(DSSFlowService dssFlowService, Op op) throws DSSErrorException, AppJointErrorException; } diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/operate/SubFlowOperate.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/operate/SubFlowOperate.java index 96db7ba623..8f3d28661a 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/operate/SubFlowOperate.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/operate/SubFlowOperate.java @@ -18,8 +18,8 @@ package com.webank.wedatasphere.dss.server.operate; -import com.webank.wedatasphere.dss.server.service.DWSFlowService; -import com.webank.wedatasphere.dss.common.entity.flow.DWSFlow; +import com.webank.wedatasphere.dss.common.entity.flow.DSSFlow; +import com.webank.wedatasphere.dss.server.service.DSSFlowService; import com.webank.wedatasphere.dss.common.exception.DSSErrorException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,33 +41,33 @@ public boolean canInvokeOperate(Op op) { } @Override - public void add(DWSFlowService dwsFlowService, Op op)throws DSSErrorException { - afterOperateSubFlow(dwsFlowService,op); + public void add(DSSFlowService dssFlowService, Op op)throws DSSErrorException { + afterOperateSubFlow(dssFlowService,op); } @Override - public void update(DWSFlowService dwsFlowService,Op op) throws DSSErrorException { + public void update(DSSFlowService dssFlowService, Op op) throws DSSErrorException { logger.info("name:{},description:{}",op.getParams().get("name"),op.getParams().get("description")); - DWSFlow dwsFlow = new DWSFlow(); - dwsFlow.setId(op.getId()); - dwsFlow.setName(op.getParams().get("name").toString()); - dwsFlow.setDescription(op.getParams().get("description").toString()); - dwsFlowService.updateFlowBaseInfo(dwsFlow, Long.valueOf(op.getParams().get("projectVersionID").toString()), null); - afterOperateSubFlow(dwsFlowService,op); + DSSFlow dssFlow = new DSSFlow(); + dssFlow.setId(op.getId()); + dssFlow.setName(op.getParams().get("name").toString()); + dssFlow.setDescription(op.getParams().get("description").toString()); + dssFlowService.updateFlowBaseInfo(dssFlow, Long.valueOf(op.getParams().get("projectVersionID").toString()), null); + afterOperateSubFlow(dssFlowService,op); } @Override - public void delete(DWSFlowService dwsFlowService,Op op) throws DSSErrorException { + public void delete(DSSFlowService dssFlowService, Op op) throws DSSErrorException { logger.info("delete subFlow{}",op.getId()); - dwsFlowService.batchDeleteFlow(Arrays.asList(op.getId()), Long.valueOf(op.getParams().get("projectVersionID").toString())); - afterOperateSubFlow(dwsFlowService,op); + dssFlowService.batchDeleteFlow(Arrays.asList(op.getId()), Long.valueOf(op.getParams().get("projectVersionID").toString())); + afterOperateSubFlow(dssFlowService,op); } - private void afterOperateSubFlow(DWSFlowService dwsFlowService,Op op) throws DSSErrorException { + private void afterOperateSubFlow(DSSFlowService dssFlowService, Op op) throws DSSErrorException { //更新工作流基本信息 - DWSFlow dwsFlow = new DWSFlow(); - dwsFlow.setId(op.getId()); - dwsFlow.setHasSaved(true); - dwsFlowService.updateFlowBaseInfo(dwsFlow, Long.valueOf(op.getParams().get("projectVersionID").toString()), null); + DSSFlow dssFlow = new DSSFlow(); + dssFlow.setId(op.getId()); + dssFlow.setHasSaved(true); + dssFlowService.updateFlowBaseInfo(dssFlow, Long.valueOf(op.getParams().get("projectVersionID").toString()), null); } } diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/publish/PublishJobFactory.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/publish/PublishJobFactory.java index 304fc444e8..fff4859104 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/publish/PublishJobFactory.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/publish/PublishJobFactory.java @@ -19,7 +19,7 @@ import com.webank.wedatasphere.dss.server.conf.DSSServerConf; -import com.webank.wedatasphere.dss.server.service.DWSProjectService; +import com.webank.wedatasphere.dss.server.service.DSSProjectService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -31,7 +31,7 @@ public class PublishJobFactory { @Autowired private PublishManager publishManager; @Autowired - private DWSProjectService projectService; + private DSSProjectService projectService; public PublishSubmitJob createSubmitPublishJob(Long projectVersionID, String user, String comment){ PublishSubmitJob job = new PublishSubmitJob(projectService, user, comment, projectVersionID); diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/publish/PublishManager.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/publish/PublishManager.java index 60e9205de2..c1f29c4e29 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/publish/PublishManager.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/publish/PublishManager.java @@ -18,8 +18,8 @@ package com.webank.wedatasphere.dss.server.publish; -import com.webank.wedatasphere.dss.server.service.DWSProjectService; -import com.webank.wedatasphere.dss.common.entity.project.DWSProjectPublishHistory; +import com.webank.wedatasphere.dss.server.service.DSSProjectService; +import com.webank.wedatasphere.dss.common.entity.project.DSSProjectPublishHistory; import com.webank.wedatasphere.dss.common.exception.DSSErrorException; import com.webank.wedatasphere.linkis.common.utils.Utils; import org.slf4j.Logger; @@ -40,7 +40,7 @@ public class PublishManager implements PublishListner { private Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired - private DWSProjectService projectService; + private DSSProjectService projectService; private Map cacheMap = new ConcurrentHashMap<>(); @@ -105,7 +105,7 @@ public void addPublishCache(Long projectVersionID, Long creatorID, String commen if (cacheMap.get(projectVersionID) == null) { synchronized (cacheMap) { if (cacheMap.get(projectVersionID) == null) { - DWSProjectPublishHistory history = projectService.getPublishHistoryByID(projectVersionID); + DSSProjectPublishHistory history = projectService.getPublishHistoryByID(projectVersionID); if (history == null) { logger.info("创建一个发布job" + projectVersionID); projectService.createPublishHistory(comment, creatorID, projectVersionID); diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/publish/PublishSubmitJob.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/publish/PublishSubmitJob.java index 769bd9dbfd..af04335f5e 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/publish/PublishSubmitJob.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/publish/PublishSubmitJob.java @@ -18,16 +18,16 @@ package com.webank.wedatasphere.dss.server.publish; -import com.webank.wedatasphere.dss.server.service.DWSProjectService; +import com.webank.wedatasphere.dss.server.service.DSSProjectService; public class PublishSubmitJob extends PublishJob { - private DWSProjectService projectService; + private DSSProjectService projectService; private String comment; - public PublishSubmitJob(DWSProjectService projectService, String user, String comment, Long projectVersionID) { + public PublishSubmitJob(DSSProjectService projectService, String user, String comment, Long projectVersionID) { this.projectService = projectService; this.user = user; this.comment = comment; diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/FlowRestfulApi.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/FlowRestfulApi.java index 74b8520342..102518263b 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/FlowRestfulApi.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/FlowRestfulApi.java @@ -19,11 +19,11 @@ import com.webank.wedatasphere.dss.appjoint.exception.AppJointErrorException; -import com.webank.wedatasphere.dss.server.service.DWSFlowService; -import com.webank.wedatasphere.dss.server.service.DWSProjectService; -import com.webank.wedatasphere.dss.server.service.DWSUserService; -import com.webank.wedatasphere.dss.common.entity.flow.DWSFlow; -import com.webank.wedatasphere.dss.common.entity.flow.DWSFlowVersion; +import com.webank.wedatasphere.dss.common.entity.flow.DSSFlow; +import com.webank.wedatasphere.dss.server.service.DSSFlowService; +import com.webank.wedatasphere.dss.server.service.DSSProjectService; +import com.webank.wedatasphere.dss.server.service.DSSUserService; +import com.webank.wedatasphere.dss.common.entity.flow.DSSFlowVersion; import com.webank.wedatasphere.dss.common.exception.DSSErrorException; import com.webank.wedatasphere.dss.server.operate.Op; import com.webank.wedatasphere.dss.server.publish.PublishManager; @@ -54,9 +54,9 @@ public class FlowRestfulApi { @Autowired - private DWSFlowService flowService; + private DSSFlowService flowService; @Autowired - private DWSUserService dwsUserService; + private DSSUserService dssUserService; @Autowired private PublishManager publishManager; @@ -65,7 +65,7 @@ public class FlowRestfulApi { @GET @Path("/listAllFlowVersions") public Response listAllVersions(@Context HttpServletRequest req, @QueryParam("id")Long flowID,@QueryParam("projectVersionID")Long projectVersionID) { - List versions = flowService.listAllFlowVersions(flowID,projectVersionID); + List versions = flowService.listAllFlowVersions(flowID,projectVersionID); return Message.messageToResponse(Message.ok().data("versions",versions)); } @@ -83,30 +83,30 @@ public Response addFlow(@Context HttpServletRequest req, JsonNode json) throws D String uses = json.get("uses") == null?null:json.get("uses").getTextValue(); if(taxonomyID == null && parentFlowID == null) throw new DSSErrorException(90009,"请求选择工作流分类"); publishManager.checkeIsPublishing(projectVersionID); - DWSFlow dwsFlow = new DWSFlow(); - dwsFlow.setProjectID(projectService.getProjectByProjectVersionID(projectVersionID).getId()); - dwsFlow.setName(name); - dwsFlow.setDescription(description); - dwsFlow.setCreatorID(dwsUserService.getUserID(userName)); - dwsFlow.setCreateTime(new Date()); - dwsFlow.setState(false); - dwsFlow.setSource("create by user"); - dwsFlow.setUses(uses); + DSSFlow dssFlow = new DSSFlow(); + dssFlow.setProjectID(projectService.getProjectByProjectVersionID(projectVersionID).getId()); + dssFlow.setName(name); + dssFlow.setDescription(description); + dssFlow.setCreatorID(dssUserService.getUserID(userName)); + dssFlow.setCreateTime(new Date()); + dssFlow.setState(false); + dssFlow.setSource("create by user"); + dssFlow.setUses(uses); if(parentFlowID == null){ - dwsFlow.setRootFlow(true); - dwsFlow.setRank(0); - dwsFlow.setHasSaved(true); - dwsFlow = flowService.addRootFlow(dwsFlow,taxonomyID,projectVersionID); + dssFlow.setRootFlow(true); + dssFlow.setRank(0); + dssFlow.setHasSaved(true); + dssFlow = flowService.addRootFlow(dssFlow,taxonomyID,projectVersionID); }else { - dwsFlow.setRootFlow(false); + dssFlow.setRootFlow(false); Integer rank = flowService.getParentRank(parentFlowID); // TODO: 2019/6/3 并发问题考虑for update - dwsFlow.setRank(rank+1); - dwsFlow.setHasSaved(false); - dwsFlow = flowService.addSubFlow(dwsFlow,parentFlowID,projectVersionID); + dssFlow.setRank(rank+1); + dssFlow.setHasSaved(false); + dssFlow = flowService.addSubFlow(dssFlow,parentFlowID,projectVersionID); } // TODO: 2019/5/16 空值校验，重复名校验 - return Message.messageToResponse(Message.ok().data("flow",dwsFlow)); + return Message.messageToResponse(Message.ok().data("flow", dssFlow)); } @POST @@ -121,12 +121,12 @@ public Response updateFlowBaseInfo(@Context HttpServletRequest req, JsonNode jso publishManager.checkeIsPublishing(projectVersionID); // TODO: 2019/6/13 projectVersionID的更新校验 //这里可以不做事务 - DWSFlow dwsFlow = new DWSFlow(); - dwsFlow.setId(flowID); - dwsFlow.setName(name); - dwsFlow.setDescription(description); - dwsFlow.setUses(uses); - flowService.updateFlowBaseInfo(dwsFlow,projectVersionID,taxonomyID); + DSSFlow dssFlow = new DSSFlow(); + dssFlow.setId(flowID); + dssFlow.setName(name); + dssFlow.setDescription(description); + dssFlow.setUses(uses); + flowService.updateFlowBaseInfo(dssFlow,projectVersionID,taxonomyID); return Message.messageToResponse(Message.ok()); } @@ -134,14 +134,14 @@ public Response updateFlowBaseInfo(@Context HttpServletRequest req, JsonNode jso @Path("/get") public Response get(@Context HttpServletRequest req, @QueryParam("id")Long flowID,@QueryParam("version")String version,@QueryParam("projectVersionID")Long projectVersionID) throws DSSErrorException { // TODO: 2019/5/23 id空值判断 - DWSFlow dwsFlow; + DSSFlow dssFlow; if (StringUtils.isEmpty(version)){ - dwsFlow = flowService.getLatestVersionFlow(flowID,projectVersionID); - dwsFlow.setFlowVersions(Arrays.asList(dwsFlow.getLatestVersion())); + dssFlow = flowService.getLatestVersionFlow(flowID,projectVersionID); + dssFlow.setFlowVersions(Arrays.asList(dssFlow.getLatestVersion())); }else { - dwsFlow = flowService.getOneVersionFlow(flowID, version,projectVersionID); + dssFlow = flowService.getOneVersionFlow(flowID, version,projectVersionID); } - return Message.messageToResponse(Message.ok().data("flow",dwsFlow)); + return Message.messageToResponse(Message.ok().data("flow", dssFlow)); } @POST @@ -175,6 +175,6 @@ public Response saveFlow(@Context HttpServletRequest req, JsonNode json) throws } @Autowired - private DWSProjectService projectService; + private DSSProjectService projectService; } diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/FlowTaxonomyRestfulApi.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/FlowTaxonomyRestfulApi.java index 5e6f3be564..bc43c5ab68 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/FlowTaxonomyRestfulApi.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/FlowTaxonomyRestfulApi.java @@ -18,10 +18,10 @@ package com.webank.wedatasphere.dss.server.restful; -import com.webank.wedatasphere.dss.server.service.DWSFlowTaxonomyService; -import com.webank.wedatasphere.dss.server.service.DWSProjectService; -import com.webank.wedatasphere.dss.server.service.DWSUserService; -import com.webank.wedatasphere.dss.server.entity.DWSFlowTaxonomy; +import com.webank.wedatasphere.dss.server.service.DSSFlowTaxonomyService; +import com.webank.wedatasphere.dss.server.service.DSSProjectService; +import com.webank.wedatasphere.dss.server.service.DSSUserService; +import com.webank.wedatasphere.dss.server.entity.DSSFlowTaxonomy; import com.webank.wedatasphere.dss.common.exception.DSSErrorException; import com.webank.wedatasphere.dss.server.publish.PublishManager; import com.webank.wedatasphere.linkis.server.Message; @@ -48,11 +48,11 @@ public class FlowTaxonomyRestfulApi { @Autowired - private DWSFlowTaxonomyService flowTaxonomyService; + private DSSFlowTaxonomyService flowTaxonomyService; @Autowired - private DWSUserService dwsUserService; + private DSSUserService dssUserService; @Autowired - private DWSProjectService projectService; + private DSSProjectService projectService; @Autowired private PublishManager publishManager; @@ -65,15 +65,15 @@ public Response addFlowTaxonomy(@Context HttpServletRequest req, JsonNode json) Long projectVersionID = json.get("projectVersionID").getLongValue(); publishManager.checkeIsPublishing(projectVersionID); // TODO: 2019/5/16 空值校验，重复名校验 - DWSFlowTaxonomy dwsFlowTaxonomy = new DWSFlowTaxonomy(); + DSSFlowTaxonomy dssFlowTaxonomy = new DSSFlowTaxonomy(); Date date = new Date(); - dwsFlowTaxonomy.setName(name); - dwsFlowTaxonomy.setDescription(description); - dwsFlowTaxonomy.setCreatorID(dwsUserService.getUserID(userName)); - dwsFlowTaxonomy.setCreateTime(date); - dwsFlowTaxonomy.setUpdateTime(date); - dwsFlowTaxonomy.setProjectID(projectService.getProjectByProjectVersionID(projectVersionID).getId()); - flowTaxonomyService.addFlowTaxonomy(dwsFlowTaxonomy,projectVersionID); + dssFlowTaxonomy.setName(name); + dssFlowTaxonomy.setDescription(description); + dssFlowTaxonomy.setCreatorID(dssUserService.getUserID(userName)); + dssFlowTaxonomy.setCreateTime(date); + dssFlowTaxonomy.setUpdateTime(date); + dssFlowTaxonomy.setProjectID(projectService.getProjectByProjectVersionID(projectVersionID).getId()); + flowTaxonomyService.addFlowTaxonomy(dssFlowTaxonomy,projectVersionID); return Message.messageToResponse(Message.ok()); } @POST @@ -86,12 +86,12 @@ public Response updateFlowTaxonomy(@Context HttpServletRequest req, JsonNode jso publishManager.checkeIsPublishing(projectVersionID); // TODO: 2019/6/13 projectVersionID的更新校验 // TODO: 2019/5/16 空值校验，重复名校验 - DWSFlowTaxonomy dwsFlowTaxonomy = new DWSFlowTaxonomy(); - dwsFlowTaxonomy.setId(id); - dwsFlowTaxonomy.setName(name); - dwsFlowTaxonomy.setDescription(description); - dwsFlowTaxonomy.setUpdateTime(new Date()); - flowTaxonomyService.updateFlowTaxonomy(dwsFlowTaxonomy,projectVersionID); + DSSFlowTaxonomy dssFlowTaxonomy = new DSSFlowTaxonomy(); + dssFlowTaxonomy.setId(id); + dssFlowTaxonomy.setName(name); + dssFlowTaxonomy.setDescription(description); + dssFlowTaxonomy.setUpdateTime(new Date()); + flowTaxonomyService.updateFlowTaxonomy(dssFlowTaxonomy,projectVersionID); return Message.messageToResponse(Message.ok()); } diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/NodeRestfulApi.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/NodeRestfulApi.java index 69df321266..ec1c43a228 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/NodeRestfulApi.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/NodeRestfulApi.java @@ -20,7 +20,6 @@ import com.webank.wedatasphere.dss.appjoint.exception.AppJointErrorException; import com.webank.wedatasphere.dss.appjoint.execution.core.CommonAppJointNode; -import com.webank.wedatasphere.dss.appjoint.service.NodeService; import com.webank.wedatasphere.dss.application.entity.Application; import com.webank.wedatasphere.dss.application.service.ApplicationService; import com.webank.wedatasphere.dss.application.util.ApplicationUtils; @@ -28,7 +27,7 @@ import com.webank.wedatasphere.dss.server.function.FunctionInvoker; import com.webank.wedatasphere.dss.server.function.FunctionPool; import com.webank.wedatasphere.dss.server.function.NodeServiceFunction; -import com.webank.wedatasphere.dss.server.service.DWSNodeInfoService; +import com.webank.wedatasphere.dss.server.service.DSSNodeInfoService; import com.webank.wedatasphere.linkis.server.Message; import com.webank.wedatasphere.linkis.server.security.SecurityFilter; import org.slf4j.Logger; @@ -54,7 +53,7 @@ public class NodeRestfulApi { private Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired - private DWSNodeInfoService nodeInfoService; + private DSSNodeInfoService nodeInfoService; @Autowired private ApplicationService applicationService; diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/ProjectRestfulApi.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/ProjectRestfulApi.java index f8ef9237fa..ec0e7ea9fc 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/ProjectRestfulApi.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/ProjectRestfulApi.java @@ -19,16 +19,16 @@ import com.webank.wedatasphere.dss.appjoint.exception.AppJointErrorException; -import com.webank.wedatasphere.dss.common.entity.project.DWSProject; -import com.webank.wedatasphere.dss.common.entity.project.DWSProjectVersion; +import com.webank.wedatasphere.dss.common.entity.project.DSSProject; +import com.webank.wedatasphere.dss.common.entity.project.DSSProjectVersion; import com.webank.wedatasphere.dss.common.exception.DSSErrorException; -import com.webank.wedatasphere.dss.server.dao.DWSUserMapper; +import com.webank.wedatasphere.dss.server.dao.DSSUserMapper; import com.webank.wedatasphere.dss.server.dao.ProjectMapper; import com.webank.wedatasphere.dss.server.entity.ApplicationArea; import com.webank.wedatasphere.dss.server.publish.*; -import com.webank.wedatasphere.dss.server.service.DWSProjectService; -import com.webank.wedatasphere.dss.server.service.DWSProjectTaxonomyService; -import com.webank.wedatasphere.dss.server.service.DWSUserService; +import com.webank.wedatasphere.dss.server.service.DSSProjectService; +import com.webank.wedatasphere.dss.server.service.DSSProjectTaxonomyService; +import com.webank.wedatasphere.dss.server.service.DSSUserService; import com.webank.wedatasphere.linkis.server.Message; import com.webank.wedatasphere.linkis.server.security.SecurityFilter; import org.codehaus.jackson.JsonNode; @@ -53,11 +53,11 @@ public class ProjectRestfulApi { @Autowired - private DWSProjectTaxonomyService projectTaxonomyService; + private DSSProjectTaxonomyService projectTaxonomyService; @Autowired - private DWSProjectService projectService; + private DSSProjectService projectService; @Autowired - private DWSUserService dwsUserService; + private DSSUserService dssUserService; @Autowired private ProjectMapper projectMapper; @Autowired @@ -66,12 +66,12 @@ public class ProjectRestfulApi { private PublishManager publishManager; @Autowired - private DWSUserMapper dwsUserMapper; + private DSSUserMapper dssUserMapper; @GET @Path("/listAllProjectVersions") public Response listAllVersions(@Context HttpServletRequest req, @QueryParam("id") Long projectID) { - List versions = projectService.listAllProjectVersions(projectID); + List versions = projectService.listAllProjectVersions(projectID); return Message.messageToResponse(Message.ok().data("versions", versions)); } @@ -144,7 +144,7 @@ public Response copyProject(@Context HttpServletRequest req, JsonNode json) thro String userName = SecurityFilter.getLoginUsername(req); Long projectID = json.get("projectID").getLongValue(); String projectName = json.get("projectName") == null ? null : json.get("projectName").getTextValue(); - DWSProjectVersion maxVersion = projectMapper.selectLatestVersionByProjectID(projectID); + DSSProjectVersion maxVersion = projectMapper.selectLatestVersionByProjectID(projectID); projectService.copyProject( maxVersion.getId(),projectID, projectName, userName); return Message.messageToResponse(Message.ok()); } @@ -154,8 +154,8 @@ public Response copyProject(@Context HttpServletRequest req, JsonNode json) thro public Response copyProjectVersion(@Context HttpServletRequest req, JsonNode json) throws InterruptedException, DSSErrorException { String userName = SecurityFilter.getLoginUsername(req); Long copyprojectVersionID = json.get("projectVersionID").getLongValue(); - DWSProjectVersion currentVersion = projectMapper.selectProjectVersionByID(copyprojectVersionID); - DWSProjectVersion maxVersion = projectMapper.selectLatestVersionByProjectID(currentVersion.getProjectID()); + DSSProjectVersion currentVersion = projectMapper.selectProjectVersionByID(copyprojectVersionID); + DSSProjectVersion maxVersion = projectMapper.selectLatestVersionByProjectID(currentVersion.getProjectID()); projectService.copyProjectVersionMax( maxVersion.getId(), maxVersion,currentVersion,userName,null); return Message.messageToResponse(Message.ok()); @@ -167,8 +167,8 @@ public Response publish(@Context HttpServletRequest req, JsonNode json) throws D String userName = SecurityFilter.getLoginUsername(req); Long projectID = json.get("id").getLongValue(); String comment = json.get("comment").getTextValue(); - DWSProject latestVersionProject = projectService.getLatestVersionProject(projectID); - publishManager.addPublishCache(latestVersionProject.getLatestVersion().getId(),dwsUserService.getUserID(userName),comment); + DSSProject latestVersionProject = projectService.getLatestVersionProject(projectID); + publishManager.addPublishCache(latestVersionProject.getLatestVersion().getId(), dssUserService.getUserID(userName),comment); PublishSubmitJob job = publishJobFactory.createSubmitPublishJob(latestVersionProject.getLatestVersion().getId(), userName, comment); Future submit = PublishThreadPool.get().submit(job); PublishSubmitJobDeamon deamon = publishJobFactory.createSubmitPublishJobDeamon(submit, job); diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/ProjectTaxonomyRestfulApi.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/ProjectTaxonomyRestfulApi.java index f29e1a147b..4852c0fe9b 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/ProjectTaxonomyRestfulApi.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/ProjectTaxonomyRestfulApi.java @@ -18,9 +18,9 @@ package com.webank.wedatasphere.dss.server.restful; -import com.webank.wedatasphere.dss.server.service.DWSProjectTaxonomyService; -import com.webank.wedatasphere.dss.server.service.DWSUserService; -import com.webank.wedatasphere.dss.server.entity.DWSProjectTaxonomy; +import com.webank.wedatasphere.dss.server.service.DSSProjectTaxonomyService; +import com.webank.wedatasphere.dss.server.service.DSSUserService; +import com.webank.wedatasphere.dss.server.entity.DSSProjectTaxonomy; import com.webank.wedatasphere.dss.common.exception.DSSErrorException; import com.webank.wedatasphere.linkis.server.Message; import com.webank.wedatasphere.linkis.server.security.SecurityFilter; @@ -46,9 +46,9 @@ public class ProjectTaxonomyRestfulApi { @Autowired - private DWSProjectTaxonomyService projectTaxonomyService; + private DSSProjectTaxonomyService projectTaxonomyService; @Autowired - private DWSUserService dwsUserService; + private DSSUserService dssUserService; @POST @Path("/addProjectTaxonomy") @@ -57,14 +57,14 @@ public Response addProjectTaxonomy(@Context HttpServletRequest req, JsonNode jso String name = json.get("name").getTextValue(); String description = json.get("description").getTextValue(); // TODO: 2019/5/16 空值校验，重复名校验 - DWSProjectTaxonomy dwsProjectTaxonomy = new DWSProjectTaxonomy(); + DSSProjectTaxonomy dssProjectTaxonomy = new DSSProjectTaxonomy(); Date date = new Date(); - dwsProjectTaxonomy.setName(name); - dwsProjectTaxonomy.setDescription(description); - dwsProjectTaxonomy.setCreatorID(dwsUserService.getUserID(userName)); - dwsProjectTaxonomy.setCreateTime(date); - dwsProjectTaxonomy.setUpdateTime(date); - projectTaxonomyService.addProjectTaxonomy(dwsProjectTaxonomy); + dssProjectTaxonomy.setName(name); + dssProjectTaxonomy.setDescription(description); + dssProjectTaxonomy.setCreatorID(dssUserService.getUserID(userName)); + dssProjectTaxonomy.setCreateTime(date); + dssProjectTaxonomy.setUpdateTime(date); + projectTaxonomyService.addProjectTaxonomy(dssProjectTaxonomy); return Message.messageToResponse(Message.ok()); } @POST @@ -74,12 +74,12 @@ public Response updateProjectTaxonomy(@Context HttpServletRequest req, JsonNode String description = json.get("description") == null?null:json.get("description").getTextValue(); Long id = json.get("id").getLongValue(); // TODO: 2019/5/16 空值校验，重复名校验 - DWSProjectTaxonomy dwsProjectTaxonomy = new DWSProjectTaxonomy(); - dwsProjectTaxonomy.setId(id); - dwsProjectTaxonomy.setName(name); - dwsProjectTaxonomy.setDescription(description); - dwsProjectTaxonomy.setUpdateTime(new Date()); - projectTaxonomyService.updateProjectTaxonomy(dwsProjectTaxonomy); + DSSProjectTaxonomy dssProjectTaxonomy = new DSSProjectTaxonomy(); + dssProjectTaxonomy.setId(id); + dssProjectTaxonomy.setName(name); + dssProjectTaxonomy.setDescription(description); + dssProjectTaxonomy.setUpdateTime(new Date()); + projectTaxonomyService.updateProjectTaxonomy(dssProjectTaxonomy); return Message.messageToResponse(Message.ok()); } diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/WorkspaceRestfulApi.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/WorkspaceRestfulApi.java index 7fb0e12943..8efce52c73 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/WorkspaceRestfulApi.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/WorkspaceRestfulApi.java @@ -3,11 +3,11 @@ import com.webank.wedatasphere.dss.server.dto.response.HomepageDemoMenuVo; import com.webank.wedatasphere.dss.server.dto.response.HomepageVideoVo; import com.webank.wedatasphere.dss.server.dto.response.OnestopMenuVo; -import com.webank.wedatasphere.dss.server.entity.DWSWorkspace; +import com.webank.wedatasphere.dss.server.entity.DSSWorkspace; import com.webank.wedatasphere.dss.server.dto.response.WorkspaceDepartmentVo; -import com.webank.wedatasphere.dss.application.service.DSSUserService; import com.webank.wedatasphere.dss.server.dto.response.*; -import com.webank.wedatasphere.dss.server.service.DWSWorkspaceService; +import com.webank.wedatasphere.dss.server.service.DSSUserService; +import com.webank.wedatasphere.dss.server.service.DSSWorkspaceService; import com.webank.wedatasphere.linkis.server.Message; import com.webank.wedatasphere.linkis.server.security.SecurityFilter; import org.codehaus.jackson.JsonNode; @@ -31,7 +31,7 @@ public class WorkspaceRestfulApi { @Autowired - private DWSWorkspaceService dwsWorkspaceService; + private DSSWorkspaceService dssWorkspaceService; @Autowired private DSSUserService dssUserService; @@ -40,28 +40,28 @@ public class WorkspaceRestfulApi { @Path("/workspaces") public Response getAllWorkspaces(@Context HttpServletRequest req) { // TODO: Order By time - List workspaces = dwsWorkspaceService.getWorkspaces(); + List workspaces = dssWorkspaceService.getWorkspaces(); return Message.messageToResponse(Message.ok().data("workspaces", workspaces)); } @GET @Path("/workspaces/{id}") public Response getWorkspacesById(@Context HttpServletRequest req, @PathParam("id") Long id) { - DWSWorkspace workspace = dwsWorkspaceService.getWorkspacesById(id); + DSSWorkspace workspace = dssWorkspaceService.getWorkspacesById(id); return Message.messageToResponse(Message.ok().data("workspace", workspace)); } @GET @Path("/workspaces/departments") public Response getAllWorkspaceDepartments(@Context HttpServletRequest req) { - List departments = dwsWorkspaceService.getWorkSpaceDepartments(); + List departments = dssWorkspaceService.getWorkSpaceDepartments(); return Message.messageToResponse(Message.ok().data("departments", departments)); } @GET @Path("/workspaces/exists") public Response getUsernameExistence(@Context HttpServletRequest req, @QueryParam("name") String name) { - boolean exists = dwsWorkspaceService.existWorkspaceName(name); + boolean exists = dssWorkspaceService.existWorkspaceName(name); return Message.messageToResponse(Message.ok().data("workspaceNameExists", exists)); } @@ -70,13 +70,13 @@ public Response getUsernameExistence(@Context HttpServletRequest req, @QueryPara public Response addWorkspace(@Context HttpServletRequest req, JsonNode json) { String userName = SecurityFilter.getLoginUsername(req); String name = json.get("name").getTextValue(); - if (dwsWorkspaceService.existWorkspaceName(name)) { + if (dssWorkspaceService.existWorkspaceName(name)) { return Message.messageToResponse(Message.error("工作空间名重复")); } String department = json.get("department").getTextValue(); String label = json.get("label").getTextValue(); String description = json.get("description").getTextValue(); - Long workspaceId = dwsWorkspaceService.addWorkspace(userName, name, department, label, description); + Long workspaceId = dssWorkspaceService.addWorkspace(userName, name, department, label, description); return Message.messageToResponse(Message.ok().data("workspaceId", workspaceId)); } @@ -85,7 +85,7 @@ public Response addWorkspace(@Context HttpServletRequest req, JsonNode json) { public Response getAllHomepageDemos(@Context HttpServletRequest req) { String header = req.getHeader("Content-language").trim(); boolean isChinese = "zh-CN".equals(header); - List homepageDemos = dwsWorkspaceService.getHomepageDemos(isChinese); + List homepageDemos = dssWorkspaceService.getHomepageDemos(isChinese); return Message.messageToResponse(Message.ok().data("demos", homepageDemos)); } @@ -94,7 +94,7 @@ public Response getAllHomepageDemos(@Context HttpServletRequest req) { public Response getAllVideos(@Context HttpServletRequest req) { String header = req.getHeader("Content-language").trim(); boolean isChinese = "zh-CN".equals(header); - List homepageVideos = dwsWorkspaceService.getHomepageVideos(isChinese); + List homepageVideos = dssWorkspaceService.getHomepageVideos(isChinese); return Message.messageToResponse(Message.ok().data("videos", homepageVideos)); } @@ -105,7 +105,7 @@ public Response getWorkspaceManagements(@Context HttpServletRequest req, @PathPa boolean isChinese = "zh-CN".equals(header); String username = SecurityFilter.getLoginUsername(req); - List managements = dwsWorkspaceService.getWorkspaceManagements(workspaceId, username, isChinese); + List managements = dssWorkspaceService.getWorkspaceManagements(workspaceId, username, isChinese); return Message.messageToResponse(Message.ok().data("managements", managements)); } @@ -115,7 +115,7 @@ public Response getWorkspaceApplications(@Context HttpServletRequest req, @PathP String header = req.getHeader("Content-language").trim(); boolean isChinese = "zh-CN".equals(header); String username = SecurityFilter.getLoginUsername(req); - List applications = dwsWorkspaceService.getWorkspaceApplications(workspaceId, username, isChinese); + List applications = dssWorkspaceService.getWorkspaceApplications(workspaceId, username, isChinese); return Message.messageToResponse(Message.ok().data("applications", applications)); } @@ -125,7 +125,7 @@ public Response getWorkspaceFavorites(@Context HttpServletRequest req, @PathPara String header = req.getHeader("Content-language").trim(); boolean isChinese = "zh-CN".equals(header); String username = SecurityFilter.getLoginUsername(req); - List favorites = dwsWorkspaceService.getWorkspaceFavorites(workspaceId, username, isChinese); + List favorites = dssWorkspaceService.getWorkspaceFavorites(workspaceId, username, isChinese); return Message.messageToResponse(Message.ok().data("favorites", favorites)); } @@ -141,7 +141,7 @@ public Response getWorkspaceFavorites(@Context HttpServletRequest req, @PathPara public Response addFavorite(@Context HttpServletRequest req, @PathParam("workspaceId") Long workspaceId, JsonNode json) { String username = SecurityFilter.getLoginUsername(req); Long menuApplicationId = json.get("menuApplicationId").getLongValue(); - Long favoriteId = dwsWorkspaceService.addFavorite(username, workspaceId, menuApplicationId); + Long favoriteId = dssWorkspaceService.addFavorite(username, workspaceId, menuApplicationId); return Message.messageToResponse(Message.ok().data("favoriteId", favoriteId)); } @@ -149,7 +149,7 @@ public Response addFavorite(@Context HttpServletRequest req, @PathParam("workspa @Path("/workspaces/{workspaceId}/favorites/{favouritesId}") public Response deleteFavorite(@Context HttpServletRequest req, @PathParam("workspaceId") Long workspaceId, @PathParam("favouritesId") Long favouritesId) { String username = SecurityFilter.getLoginUsername(req); - Long favoriteId = dwsWorkspaceService.deleteFavorite(username, favouritesId); + Long favoriteId = dssWorkspaceService.deleteFavorite(username, favouritesId); return Message.messageToResponse(Message.ok().data("favoriteId", favoriteId)); } } diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DWSFlowService.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSFlowService.java similarity index 64% rename from dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DWSFlowService.java rename to dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSFlowService.java index 384748ee4b..12d0f57709 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DWSFlowService.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSFlowService.java @@ -17,52 +17,48 @@ package com.webank.wedatasphere.dss.server.service; - - - - import com.webank.wedatasphere.dss.appjoint.exception.AppJointErrorException; -import com.webank.wedatasphere.dss.common.entity.flow.DWSFlow; -import com.webank.wedatasphere.dss.common.entity.flow.DWSFlowVersion; +import com.webank.wedatasphere.dss.common.entity.flow.DSSFlow; +import com.webank.wedatasphere.dss.common.entity.flow.DSSFlowVersion; import com.webank.wedatasphere.dss.common.exception.DSSErrorException; import com.webank.wedatasphere.dss.server.operate.Op; import java.util.List; -public interface DWSFlowService { - DWSFlow getFlowByID(Long id); +public interface DSSFlowService { + DSSFlow getFlowByID(Long id); - List listAllFlowVersions(Long flowID, Long projectVersionID); + List listAllFlowVersions(Long flowID, Long projectVersionID); - DWSFlow addRootFlow(DWSFlow dwsFlow, Long taxonomyID, Long projectVersionID) throws DSSErrorException; + DSSFlow addRootFlow(DSSFlow dssFlow, Long taxonomyID, Long projectVersionID) throws DSSErrorException; - DWSFlow addSubFlow(DWSFlow dwsFlow, Long parentFlowID, Long projectVersionID) throws DSSErrorException; + DSSFlow addSubFlow(DSSFlow dssFlow, Long parentFlowID, Long projectVersionID) throws DSSErrorException; /** - * 通过flowID获取最新版本的dwsFlow，版本信息在latestVersion + * 通过flowID获取最新版本的DSSFlow，版本信息在latestVersion * @param flowID * @return */ - DWSFlow getLatestVersionFlow(Long flowID, Long projectVersionID) throws DSSErrorException; + DSSFlow getLatestVersionFlow(Long flowID, Long projectVersionID) throws DSSErrorException; /** - * 通过flowID和某个版本号，获取一个dwsFlow，版本信息在versions数组中的第一个元素 + * 通过flowID和某个版本号，获取一个DSSFlow，版本信息在versions数组中的第一个元素 * @param flowID * @return */ - DWSFlow getOneVersionFlow(Long flowID, String version, Long projectVersionID); + DSSFlow getOneVersionFlow(Long flowID, String version, Long projectVersionID); /** - * 通过dwsFlow对象拿到最新的json，其实这里只要个flowID应该就可以了 - * @param dwsFlow + * 通过DSSFlow对象拿到最新的json，其实这里只要个flowID应该就可以了 + * @param dssFlow * @return */ -/* String getLatestJsonByFlow(DWSFlow dwsFlow); +/* String getLatestJsonByFlow(dssFlow dssFlow); - DWSFlow getLatestVersionFlow(Long ProjectID,String flowName);*/ + dssFlow getLatestVersionFlow(Long ProjectID,String flowName);*/ - void updateFlowBaseInfo(DWSFlow dwsFlow, Long projectVersionID, Long taxonomyID) throws DSSErrorException; + void updateFlowBaseInfo(DSSFlow dssFlow, Long projectVersionID, Long taxonomyID) throws DSSErrorException; void updateFlowTaxonomyRelation(Long flowID, Long taxonomyID) throws DSSErrorException; @@ -72,7 +68,7 @@ public interface DWSFlowService { Integer getParentRank(Long flowID); - DWSFlowVersion getLatestVersionByFlowIDAndProjectVersionID(Long flowID, Long projectVersionID); + DSSFlowVersion getLatestVersionByFlowIDAndProjectVersionID(Long flowID, Long projectVersionID); Long getParentFlowID(Long id); } diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DWSFlowTaxonomyService.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSFlowTaxonomyService.java similarity index 71% rename from dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DWSFlowTaxonomyService.java rename to dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSFlowTaxonomyService.java index db0fcf3a8e..f105779a35 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DWSFlowTaxonomyService.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSFlowTaxonomyService.java @@ -18,22 +18,22 @@ package com.webank.wedatasphere.dss.server.service; -import com.webank.wedatasphere.dss.server.entity.DWSFlowTaxonomy; +import com.webank.wedatasphere.dss.server.entity.DSSFlowTaxonomy; import com.webank.wedatasphere.dss.common.exception.DSSErrorException; import java.util.List; -public interface DWSFlowTaxonomyService { - DWSFlowTaxonomy getFlowTaxonomyByID(Long id); +public interface DSSFlowTaxonomyService { + DSSFlowTaxonomy getFlowTaxonomyByID(Long id); //--------- - List listAllFlowTaxonomy(Long projectVersionID, Boolean isRootFlow); - List listFlowTaxonomy(Long projectVersionID, Long flowTaxonomyID, Boolean isRootFlow); + List listAllFlowTaxonomy(Long projectVersionID, Boolean isRootFlow); + List listFlowTaxonomy(Long projectVersionID, Long flowTaxonomyID, Boolean isRootFlow); - void addFlowTaxonomy(DWSFlowTaxonomy dwsFlowTaxonomy, Long projectVersionID) throws DSSErrorException; + void addFlowTaxonomy(DSSFlowTaxonomy dssFlowTaxonomy, Long projectVersionID) throws DSSErrorException; - void updateFlowTaxonomy(DWSFlowTaxonomy dwsFlowTaxonomy, Long projectVersionID) throws DSSErrorException; + void updateFlowTaxonomy(DSSFlowTaxonomy dssFlowTaxonomy, Long projectVersionID) throws DSSErrorException; boolean hasFlows(Long flowTaxonomyID); diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DWSNodeInfoService.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSNodeInfoService.java similarity index 95% rename from dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DWSNodeInfoService.java rename to dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSNodeInfoService.java index 846c69f4b0..dc7303f52f 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DWSNodeInfoService.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSNodeInfoService.java @@ -26,7 +26,7 @@ import java.util.List; -public interface DWSNodeInfoService { +public interface DSSNodeInfoService { List getNodeType(String f); diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DWSProjectService.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSProjectService.java similarity index 72% rename from dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DWSProjectService.java rename to dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSProjectService.java index 1f40d20887..abf21a88f7 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DWSProjectService.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSProjectService.java @@ -17,22 +17,20 @@ package com.webank.wedatasphere.dss.server.service; - - import com.webank.wedatasphere.dss.appjoint.exception.AppJointErrorException; -import com.webank.wedatasphere.dss.common.entity.project.DWSProject; -import com.webank.wedatasphere.dss.common.entity.project.DWSProjectPublishHistory; -import com.webank.wedatasphere.dss.common.entity.project.DWSProjectVersion; +import com.webank.wedatasphere.dss.common.entity.project.DSSProject; +import com.webank.wedatasphere.dss.common.entity.project.DSSProjectPublishHistory; +import com.webank.wedatasphere.dss.common.entity.project.DSSProjectVersion; import com.webank.wedatasphere.dss.common.exception.DSSErrorException; -import com.webank.wedatasphere.dss.common.protocol.RequestDWSProject; +import com.webank.wedatasphere.dss.common.protocol.RequestDSSProject; import java.util.Date; import java.util.List; -public interface DWSProjectService { +public interface DSSProjectService { - DWSProject getProjectByID(Long id); + DSSProject getProjectByID(Long id); Long addProject(String userName, String name, String description, Long taxonomyID,String product,Integer applicationArea,String business) throws DSSErrorException, AppJointErrorException; @@ -40,17 +38,17 @@ public interface DWSProjectService { void deleteProject(long projectID, String userName, Boolean ifDelScheduler) throws DSSErrorException; - DWSProject getLatestVersionProject(Long projectID); + DSSProject getLatestVersionProject(Long projectID); - DWSProject getProjectByProjectVersionID(Long projectVersionID); + DSSProject getProjectByProjectVersionID(Long projectVersionID); Boolean isPublished(Long projectID); - List listAllProjectVersions(Long projectID); + List listAllProjectVersions(Long projectID); Long copyProject(Long projectVersionID, Long projectID, String projectName, String userName) throws DSSErrorException, InterruptedException, AppJointErrorException; - void copyProjectVersionMax(Long projectVersionID, DWSProjectVersion maxVersion, DWSProjectVersion copyVersion, String userName, Long WTSSprojectID) throws DSSErrorException, InterruptedException; + void copyProjectVersionMax(Long projectVersionID, DSSProjectVersion maxVersion, DSSProjectVersion copyVersion, String userName, Long WTSSprojectID) throws DSSErrorException, InterruptedException; void publish(Long projectVersionID, String userName, String comment) throws DSSErrorException, InterruptedException, AppJointErrorException; @@ -58,9 +56,9 @@ public interface DWSProjectService { void updatePublishHistory(Long projectVersionID, Integer status, Date updateTime); - DWSProjectPublishHistory getPublishHistoryByID(Long projectVersionID); + DSSProjectPublishHistory getPublishHistoryByID(Long projectVersionID); - DWSProject getExecutionDWSProject(RequestDWSProject requestDWSProject) throws DSSErrorException; + DSSProject getExecutionDSSProject(RequestDSSProject requestDSSProject) throws DSSErrorException; Long getAppjointProjectID(Long projectID, String nodeType); diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DWSProjectTaxonomyService.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSProjectTaxonomyService.java similarity index 68% rename from dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DWSProjectTaxonomyService.java rename to dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSProjectTaxonomyService.java index 77161fac66..08b1e57750 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DWSProjectTaxonomyService.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSProjectTaxonomyService.java @@ -17,29 +17,26 @@ package com.webank.wedatasphere.dss.server.service; - - - -import com.webank.wedatasphere.dss.server.entity.DWSProjectTaxonomy; +import com.webank.wedatasphere.dss.server.entity.DSSProjectTaxonomy; import com.webank.wedatasphere.dss.common.exception.DSSErrorException; import java.util.List; -public interface DWSProjectTaxonomyService { +public interface DSSProjectTaxonomyService { - DWSProjectTaxonomy getProjectTaxonomyByID(Long id); + DSSProjectTaxonomy getProjectTaxonomyByID(Long id); - List listProjectTaxonomyByUser(String userName); + List listProjectTaxonomyByUser(String userName); //---------------------- - List listAllProjectTaxonomy(String userName); + List listAllProjectTaxonomy(String userName); - List listProjectTaxonomy(Long taxonomyID, String userName); + List listProjectTaxonomy(Long taxonomyID, String userName); - void addProjectTaxonomy(DWSProjectTaxonomy dwsProjectTaxonomy) throws DSSErrorException; + void addProjectTaxonomy(DSSProjectTaxonomy dssProjectTaxonomy) throws DSSErrorException; - void updateProjectTaxonomy(DWSProjectTaxonomy dwsProjectTaxonomy) throws DSSErrorException; + void updateProjectTaxonomy(DSSProjectTaxonomy dssProjectTaxonomy) throws DSSErrorException; boolean hasProjects(Long projectTaxonomyID); diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DWSUserService.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSUserService.java similarity index 95% rename from dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DWSUserService.java rename to dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSUserService.java index fe279df24c..2c2760297c 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DWSUserService.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSUserService.java @@ -18,6 +18,6 @@ package com.webank.wedatasphere.dss.server.service; -public interface DWSUserService { +public interface DSSUserService { Long getUserID(String userName); } diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DWSWorkspaceService.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSWorkspaceService.java similarity index 89% rename from dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DWSWorkspaceService.java rename to dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSWorkspaceService.java index c88779a4c3..b234a67ed7 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DWSWorkspaceService.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSWorkspaceService.java @@ -3,7 +3,7 @@ import com.webank.wedatasphere.dss.server.dto.response.HomepageDemoMenuVo; import com.webank.wedatasphere.dss.server.dto.response.HomepageVideoVo; import com.webank.wedatasphere.dss.server.dto.response.OnestopMenuVo; -import com.webank.wedatasphere.dss.server.entity.DWSWorkspace; +import com.webank.wedatasphere.dss.server.entity.DSSWorkspace; import com.webank.wedatasphere.dss.server.dto.response.WorkspaceDepartmentVo; import com.webank.wedatasphere.dss.server.dto.response.*; @@ -12,8 +12,8 @@ /** * Created by schumiyi on 2020/6/22 */ -public interface DWSWorkspaceService { - List getWorkspaces(); +public interface DSSWorkspaceService { + List getWorkspaces(); Long addWorkspace(String userName, String name, String department, String label, String description); @@ -29,7 +29,7 @@ public interface DWSWorkspaceService { List getWorkspaceApplications(Long workspaceId, String username, boolean isChinese); - DWSWorkspace getWorkspacesById(Long id); + DSSWorkspace getWorkspacesById(Long id); /** * 查询用户收藏的应用，如果是新用户，就在数据库给它插入默认两个收藏：脚本开发与工作流 workflow scriptis diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DWSFlowServiceImpl.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSFlowServiceImpl.java similarity index 70% rename from dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DWSFlowServiceImpl.java rename to dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSFlowServiceImpl.java index c4ce9228a3..218aacc449 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DWSFlowServiceImpl.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSFlowServiceImpl.java @@ -19,18 +19,18 @@ import com.webank.wedatasphere.dss.appjoint.exception.AppJointErrorException; -import com.webank.wedatasphere.dss.common.entity.flow.DWSFlow; -import com.webank.wedatasphere.dss.common.entity.flow.DWSFlowVersion; +import com.webank.wedatasphere.dss.common.entity.flow.DSSFlow; +import com.webank.wedatasphere.dss.common.entity.flow.DSSFlowVersion; import com.webank.wedatasphere.dss.common.exception.DSSErrorException; -import com.webank.wedatasphere.dss.server.dao.DWSUserMapper; +import com.webank.wedatasphere.dss.server.dao.DSSUserMapper; import com.webank.wedatasphere.dss.server.dao.FlowMapper; import com.webank.wedatasphere.dss.server.dao.FlowTaxonomyMapper; import com.webank.wedatasphere.dss.server.lock.Lock; import com.webank.wedatasphere.dss.server.operate.Op; import com.webank.wedatasphere.dss.server.operate.Operate; import com.webank.wedatasphere.dss.server.service.BMLService; -import com.webank.wedatasphere.dss.server.service.DWSFlowService; -import com.webank.wedatasphere.dss.server.service.DWSProjectService; +import com.webank.wedatasphere.dss.server.service.DSSFlowService; +import com.webank.wedatasphere.dss.server.service.DSSProjectService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -43,7 +43,7 @@ @Service -public class DWSFlowServiceImpl implements DWSFlowService { +public class DSSFlowServiceImpl implements DSSFlowService { private Logger logger = LoggerFactory.getLogger(this.getClass()); @@ -52,23 +52,23 @@ public class DWSFlowServiceImpl implements DWSFlowService { @Autowired private FlowTaxonomyMapper flowTaxonomyMapper; @Autowired - private DWSUserMapper dwsUserMapper; + private DSSUserMapper dssUserMapper; @Autowired - private DWSProjectService projectService; + private DSSProjectService projectService; @Autowired private Operate[] operates; @Autowired private BMLService bmlService; @Override - public DWSFlow getFlowByID(Long id) { + public DSSFlow getFlowByID(Long id) { return flowMapper.selectFlowByID(id); } @Override - public List listAllFlowVersions(Long flowID, Long projectVersionID) { - List versions = flowMapper.listFlowVersionsByFlowID(flowID, projectVersionID).stream().sorted((v1, v2) -> { + public List listAllFlowVersions(Long flowID, Long projectVersionID) { + List versions = flowMapper.listFlowVersionsByFlowID(flowID, projectVersionID).stream().sorted((v1, v2) -> { return v1.compareTo(v2); }).collect(Collectors.toList()); return versions; @@ -77,76 +77,76 @@ public List listAllFlowVersions(Long flowID, Long projectVersion @Lock @Transactional(rollbackFor = DSSErrorException.class) @Override - public DWSFlow addRootFlow(DWSFlow dwsFlow, Long taxonomyID, Long projectVersionID) throws DSSErrorException { + public DSSFlow addRootFlow(DSSFlow dssFlow, Long taxonomyID, Long projectVersionID) throws DSSErrorException { try { - flowMapper.insertFlow(dwsFlow); + flowMapper.insertFlow(dssFlow); } catch (DuplicateKeyException e) { logger.info(e.getMessage()); throw new DSSErrorException(90003, "工作流名不能重复"); } //通过resource上传空文件，获取resourceId(jsonPath)和version - Map bmlReturnMap = bmlService.upload(dwsUserMapper.getuserName(dwsFlow.getCreatorID()), "", UUID.randomUUID().toString() + ".json"); + Map bmlReturnMap = bmlService.upload(dssUserMapper.getuserName(dssFlow.getCreatorID()), "", UUID.randomUUID().toString() + ".json"); //数据库中插入版本信息 - DWSFlowVersion version = new DWSFlowVersion(); - version.setFlowID(dwsFlow.getId()); + DSSFlowVersion version = new DSSFlowVersion(); + version.setFlowID(dssFlow.getId()); version.setSource("create by user"); version.setJsonPath(bmlReturnMap.get("resourceId").toString()); version.setVersion(bmlReturnMap.get("version").toString()); version.setUpdateTime(new Date()); - version.setUpdatorID(dwsFlow.getCreatorID()); + version.setUpdatorID(dssFlow.getCreatorID()); // TODO: 2019/6/12 这里应该由前台传入 version.setProjectVersionID(projectVersionID); flowMapper.insertFlowVersion(version); //数据库中插入分类关联信息 - flowTaxonomyMapper.insertFlowTaxonomyRelation(taxonomyID, dwsFlow.getId()); - return dwsFlow; + flowTaxonomyMapper.insertFlowTaxonomyRelation(taxonomyID, dssFlow.getId()); + return dssFlow; } @Lock @Transactional(rollbackFor = DSSErrorException.class) @Override - public DWSFlow addSubFlow(DWSFlow dwsFlow, Long parentFlowID, Long projectVersionID) throws DSSErrorException { + public DSSFlow addSubFlow(DSSFlow dssFlow, Long parentFlowID, Long projectVersionID) throws DSSErrorException { Long taxonomyID = flowTaxonomyMapper.selectTaxonomyIDByFlowID(parentFlowID); - DWSFlow parentFlow = flowMapper.selectFlowByID(parentFlowID); - dwsFlow.setProjectID(parentFlow.getProjectID()); - DWSFlow subFlow = addRootFlow(dwsFlow, taxonomyID, projectVersionID); + DSSFlow parentFlow = flowMapper.selectFlowByID(parentFlowID); + dssFlow.setProjectID(parentFlow.getProjectID()); + DSSFlow subFlow = addRootFlow(dssFlow, taxonomyID, projectVersionID); //数据库中插入关联信息 flowMapper.insertFlowRelation(subFlow.getId(), parentFlowID); return subFlow; } @Override - public DWSFlow getLatestVersionFlow(Long flowID, Long projectVersionID) throws DSSErrorException { - DWSFlow dwsFlow = getFlowByID(flowID); - DWSFlowVersion dwsFlowVersion = getLatestVersionByFlowIDAndProjectVersionID(flowID, projectVersionID); - if (dwsFlowVersion == null) throw new DSSErrorException(90011, "该工作流已经被删除，请重新创建"); - String userName = dwsUserMapper.getuserName(dwsFlowVersion.getUpdatorID()); - Map query = bmlService.query(userName, dwsFlowVersion.getJsonPath(), dwsFlowVersion.getVersion()); - dwsFlowVersion.setJson(query.get("string").toString()); - dwsFlow.setLatestVersion(dwsFlowVersion); - return dwsFlow; + public DSSFlow getLatestVersionFlow(Long flowID, Long projectVersionID) throws DSSErrorException { + DSSFlow dssFlow = getFlowByID(flowID); + DSSFlowVersion dssFlowVersion = getLatestVersionByFlowIDAndProjectVersionID(flowID, projectVersionID); + if (dssFlowVersion == null) throw new DSSErrorException(90011, "该工作流已经被删除，请重新创建"); + String userName = dssUserMapper.getuserName(dssFlowVersion.getUpdatorID()); + Map query = bmlService.query(userName, dssFlowVersion.getJsonPath(), dssFlowVersion.getVersion()); + dssFlowVersion.setJson(query.get("string").toString()); + dssFlow.setLatestVersion(dssFlowVersion); + return dssFlow; } @Override - public DWSFlow getOneVersionFlow(Long flowID, String version, Long projectVersionID) { - DWSFlow dwsFlow = getFlowByID(flowID); - DWSFlowVersion dwsFlowVersion = flowMapper.selectVersionByFlowID(flowID, version, projectVersionID); - String userName = dwsUserMapper.getuserName(dwsFlowVersion.getUpdatorID()); - Map query = bmlService.query(userName, dwsFlowVersion.getJsonPath(), dwsFlowVersion.getVersion()); - dwsFlowVersion.setJson(query.get("string").toString()); - dwsFlow.setFlowVersions(Arrays.asList(dwsFlowVersion)); - dwsFlow.setLatestVersion(dwsFlowVersion); - return dwsFlow; + public DSSFlow getOneVersionFlow(Long flowID, String version, Long projectVersionID) { + DSSFlow dssFlow = getFlowByID(flowID); + DSSFlowVersion dssFlowVersion = flowMapper.selectVersionByFlowID(flowID, version, projectVersionID); + String userName = dssUserMapper.getuserName(dssFlowVersion.getUpdatorID()); + Map query = bmlService.query(userName, dssFlowVersion.getJsonPath(), dssFlowVersion.getVersion()); + dssFlowVersion.setJson(query.get("string").toString()); + dssFlow.setFlowVersions(Arrays.asList(dssFlowVersion)); + dssFlow.setLatestVersion(dssFlowVersion); + return dssFlow; } /* @Override - public String getLatestJsonByFlow(DWSFlow dwsFlow) { - DWSFlow latestVersionFlow = getLatestVersionFlow(dwsFlow.getId()); + public String getLatestJsonByFlow(DSSFlow DSSFlow) { + DSSFlow latestVersionFlow = getLatestVersionFlow(DSSFlow.getId()); return latestVersionFlow.getLatestVersion().getJson(); } @Override - public DWSFlow getLatestVersionFlow(Long ProjectID, String flowName) { + public DSSFlow getLatestVersionFlow(Long ProjectID, String flowName) { Long flowID = flowMapper.selectFlowIDByProjectIDAndFlowName(ProjectID, flowName); return getLatestVersionFlow(flowID); }*/ @@ -154,22 +154,22 @@ public DWSFlow getLatestVersionFlow(Long ProjectID, String flowName) { @Lock @Transactional(rollbackFor = DSSErrorException.class) @Override - public void updateFlowBaseInfo(DWSFlow dwsFlow, Long projectVersionID, Long taxonomyID) throws DSSErrorException { + public void updateFlowBaseInfo(DSSFlow dssFlow, Long projectVersionID, Long taxonomyID) throws DSSErrorException { try { - flowMapper.updateFlowBaseInfo(dwsFlow); + flowMapper.updateFlowBaseInfo(dssFlow); } catch (DuplicateKeyException e) { logger.info(e.getMessage()); throw new DSSErrorException(90003, "工作流名不能重复"); } - if (taxonomyID != null) updateFlowTaxonomyRelation(dwsFlow.getId(), taxonomyID); + if (taxonomyID != null) updateFlowTaxonomyRelation(dssFlow.getId(), taxonomyID); } @Override public void updateFlowTaxonomyRelation(Long flowID, Long taxonomyID) throws DSSErrorException { - DWSFlow dwsFlow = getFlowByID(flowID); + DSSFlow dssFlow = getFlowByID(flowID); Long oldTaxonomyID = flowTaxonomyMapper.selectTaxonomyIDByFlowID(flowID); - if (!dwsFlow.getRootFlow() && (!oldTaxonomyID.equals(taxonomyID))) throw new DSSErrorException(90010, "子工作流不允许更新分类id"); - if (!dwsFlow.getRootFlow() && (oldTaxonomyID.equals(taxonomyID))) return; + if (!dssFlow.getRootFlow() && (!oldTaxonomyID.equals(taxonomyID))) throw new DSSErrorException(90010, "子工作流不允许更新分类id"); + if (!dssFlow.getRootFlow() && (oldTaxonomyID.equals(taxonomyID))) return; //这里也要同时更新子工作流的分类id List subFlowIDList = flowMapper.selectSubFlowIDByParentFlowID(flowID); subFlowIDList.add(flowID); @@ -213,17 +213,17 @@ public String saveFlow(Long flowID, String jsonFlow, String comment, String user String resourceId = getLatestVersionByFlowIDAndProjectVersionID(flowID, projectVersionID).getJsonPath(); //上传文件获取resourceId和version save应该是已经有 Map bmlReturnMap = bmlService.update(userName, resourceId, jsonFlow); - DWSFlowVersion dwsFlowVersion = new DWSFlowVersion(); - dwsFlowVersion.setUpdatorID(dwsUserMapper.getUserID(userName)); - dwsFlowVersion.setUpdateTime(new Date()); - dwsFlowVersion.setVersion(bmlReturnMap.get("version").toString()); - dwsFlowVersion.setJsonPath(resourceId); - dwsFlowVersion.setComment(comment); - dwsFlowVersion.setFlowID(flowID); - dwsFlowVersion.setSource("保存更新"); - dwsFlowVersion.setProjectVersionID(projectVersionID); + DSSFlowVersion dssFlowVersion = new DSSFlowVersion(); + dssFlowVersion.setUpdatorID(dssUserMapper.getUserID(userName)); + dssFlowVersion.setUpdateTime(new Date()); + dssFlowVersion.setVersion(bmlReturnMap.get("version").toString()); + dssFlowVersion.setJsonPath(resourceId); + dssFlowVersion.setComment(comment); + dssFlowVersion.setFlowID(flowID); + dssFlowVersion.setSource("保存更新"); + dssFlowVersion.setProjectVersionID(projectVersionID); //version表中插入数据 - flowMapper.insertFlowVersion(dwsFlowVersion); + flowMapper.insertFlowVersion(dssFlowVersion); return bmlReturnMap.get("version").toString(); } @@ -233,8 +233,8 @@ public Integer getParentRank(Long parentFlowID) { } @Override - public DWSFlowVersion getLatestVersionByFlowIDAndProjectVersionID(Long flowID, Long projectVersionID) { - List versions = flowMapper.listVersionByFlowIDAndProjectVersionID(flowID, projectVersionID) + public DSSFlowVersion getLatestVersionByFlowIDAndProjectVersionID(Long flowID, Long projectVersionID) { + List versions = flowMapper.listVersionByFlowIDAndProjectVersionID(flowID, projectVersionID) .stream().sorted((v1, v2) -> { return v1.compareTo(v2); }).collect(Collectors.toList()); @@ -262,21 +262,21 @@ public void deleteFlow(Long flowId, Long projectVersionID) { deleteFlow(subFlowID, projectVersionID); } for (Long subFlowID : subFlowIDs) { - deleteDWSDB(subFlowID, projectVersionID); + deleteDSSDB(subFlowID, projectVersionID); // TODO: 2019/6/5 wtss发布过的工作流的删除？ // TODO: 2019/6/5 json中资源的删除 // TODO: 2019/6/5 事务的保证 } - deleteDWSDB(flowId, projectVersionID); + deleteDSSDB(flowId, projectVersionID); } - private void deleteDWSDB(Long flowID, Long projectVersionID) { + private void deleteDSSDB(Long flowID, Long projectVersionID) { flowMapper.deleteFlowVersions(flowID, projectVersionID); if (projectVersionID == null || (flowMapper.noVersions(flowID) != null && flowMapper.noVersions(flowID))) { flowMapper.deleteFlowBaseInfo(flowID); flowMapper.deleteFlowRelation(flowID); flowTaxonomyMapper.deleteFlowTaxonomyRelation(flowID); } - //第一期没有工作流的发布，所以不需要删除dws工作流的发布表 + //第一期没有工作流的发布，所以不需要删除DSS工作流的发布表 } } diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DWSFlowTaxonomyServiceImpl.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSFlowTaxonomyServiceImpl.java similarity index 58% rename from dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DWSFlowTaxonomyServiceImpl.java rename to dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSFlowTaxonomyServiceImpl.java index 6d2d4d56b1..0cbba745b2 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DWSFlowTaxonomyServiceImpl.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSFlowTaxonomyServiceImpl.java @@ -17,15 +17,15 @@ package com.webank.wedatasphere.dss.server.service.impl; -import com.webank.wedatasphere.dss.server.service.DWSFlowService; -import com.webank.wedatasphere.dss.server.service.DWSFlowTaxonomyService; -import com.webank.wedatasphere.dss.server.service.DWSProjectService; +import com.webank.wedatasphere.dss.server.service.DSSFlowService; +import com.webank.wedatasphere.dss.server.service.DSSFlowTaxonomyService; +import com.webank.wedatasphere.dss.server.service.DSSProjectService; import com.webank.wedatasphere.dss.server.dao.FlowMapper; import com.webank.wedatasphere.dss.server.dao.FlowTaxonomyMapper; -import com.webank.wedatasphere.dss.server.entity.DWSFlowTaxonomy; -import com.webank.wedatasphere.dss.common.entity.flow.DWSFlow; -import com.webank.wedatasphere.dss.common.entity.flow.DWSFlowVersion; -import com.webank.wedatasphere.dss.common.entity.project.DWSProject; +import com.webank.wedatasphere.dss.server.entity.DSSFlowTaxonomy; +import com.webank.wedatasphere.dss.common.entity.flow.DSSFlow; +import com.webank.wedatasphere.dss.common.entity.flow.DSSFlowVersion; +import com.webank.wedatasphere.dss.common.entity.project.DSSProject; import com.webank.wedatasphere.dss.common.exception.DSSErrorException; import com.webank.wedatasphere.dss.server.lock.Lock; import org.slf4j.Logger; @@ -41,7 +41,7 @@ @Service -public class DWSFlowTaxonomyServiceImpl implements DWSFlowTaxonomyService { +public class DSSFlowTaxonomyServiceImpl implements DSSFlowTaxonomyService { private Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired @@ -51,60 +51,60 @@ public class DWSFlowTaxonomyServiceImpl implements DWSFlowTaxonomyService { private FlowMapper flowMapper; @Autowired - private DWSProjectService projectService; + private DSSProjectService projectService; @Autowired - private DWSFlowService flowService; + private DSSFlowService flowService; @Override - public DWSFlowTaxonomy getFlowTaxonomyByID(Long id) { + public DSSFlowTaxonomy getFlowTaxonomyByID(Long id) { return flowTaxonomyMapper.selectFlowTaxonomyByID(id); } - private List listFlowByTaxonomyID(Long projectID, Long taxonomyID, Boolean isRootFlow){ + private List listFlowByTaxonomyID(Long projectID, Long taxonomyID, Boolean isRootFlow){ return flowMapper.listFlowByTaxonomyID(projectID,taxonomyID,isRootFlow); } // TODO: 2019/5/16 级联查询返回json序列化好像有问题，暂时只能循环查 @Override - public List listAllFlowTaxonomy(Long projectVersionID,Boolean isRootFlow) { - DWSProject dwsProject = projectService.getProjectByProjectVersionID(projectVersionID); - List dwsFlowTaxonomies = listFlowTaxonomyByProjectID(dwsProject.getId()); - for (DWSFlowTaxonomy dwsFlowTaxonomy : dwsFlowTaxonomies) { - List dwsFlowList = listFlowByTaxonomyID(dwsProject.getId(),dwsFlowTaxonomy.getId(),isRootFlow); - for (DWSFlow dwsFlow : dwsFlowList) { - DWSFlowVersion version = flowService.getLatestVersionByFlowIDAndProjectVersionID(dwsFlow.getId(),projectVersionID); - dwsFlow.setLatestVersion(version); + public List listAllFlowTaxonomy(Long projectVersionID, Boolean isRootFlow) { + DSSProject dssProject = projectService.getProjectByProjectVersionID(projectVersionID); + List dwsFlowTaxonomies = listFlowTaxonomyByProjectID(dssProject.getId()); + for (DSSFlowTaxonomy dssFlowTaxonomy : dwsFlowTaxonomies) { + List dssFlowList = listFlowByTaxonomyID(dssProject.getId(), dssFlowTaxonomy.getId(),isRootFlow); + for (DSSFlow dssFlow : dssFlowList) { + DSSFlowVersion version = flowService.getLatestVersionByFlowIDAndProjectVersionID(dssFlow.getId(),projectVersionID); + dssFlow.setLatestVersion(version); } - dwsFlowTaxonomy.setDwsFlowList(dwsFlowList.stream().filter(f ->f.getLatestVersion() !=null).collect(Collectors.toList())); + dssFlowTaxonomy.setDssFlowList(dssFlowList.stream().filter(f ->f.getLatestVersion() !=null).collect(Collectors.toList())); } return dwsFlowTaxonomies; } - private List listFlowTaxonomyByProjectID(Long projectID) { + private List listFlowTaxonomyByProjectID(Long projectID) { return flowTaxonomyMapper.listFlowTaxonomyByProjectID(projectID); } //有projectID应该可以同时过滤不同用户中的，我的工作流分类下的工作流 @Override - public List listFlowTaxonomy(Long projectVersionID,Long flowTaxonomyID, Boolean isRootFlow) { - DWSFlowTaxonomy flowTaxonomy = getFlowTaxonomyByID(flowTaxonomyID); - DWSProject dwsProject = projectService.getProjectByProjectVersionID(projectVersionID); - List dwsFlowList = listFlowByTaxonomyID(dwsProject.getId(),flowTaxonomyID,isRootFlow); - for (DWSFlow dwsFlow : dwsFlowList) { - DWSFlowVersion version = flowService.getLatestVersionByFlowIDAndProjectVersionID(dwsFlow.getId(),projectVersionID); - dwsFlow.setLatestVersion(version); + public List listFlowTaxonomy(Long projectVersionID, Long flowTaxonomyID, Boolean isRootFlow) { + DSSFlowTaxonomy flowTaxonomy = getFlowTaxonomyByID(flowTaxonomyID); + DSSProject dssProject = projectService.getProjectByProjectVersionID(projectVersionID); + List dssFlowList = listFlowByTaxonomyID(dssProject.getId(),flowTaxonomyID,isRootFlow); + for (DSSFlow dssFlow : dssFlowList) { + DSSFlowVersion version = flowService.getLatestVersionByFlowIDAndProjectVersionID(dssFlow.getId(),projectVersionID); + dssFlow.setLatestVersion(version); } - flowTaxonomy.setDwsFlowList(dwsFlowList.stream().filter(f ->f.getLatestVersion() !=null).collect(Collectors.toList())); + flowTaxonomy.setDssFlowList(dssFlowList.stream().filter(f ->f.getLatestVersion() !=null).collect(Collectors.toList())); return Arrays.asList(flowTaxonomy); } @Lock @Transactional(rollbackFor = DSSErrorException.class) @Override - public void addFlowTaxonomy(DWSFlowTaxonomy dwsFlowTaxonomy,Long projectVersionID) throws DSSErrorException { + public void addFlowTaxonomy(DSSFlowTaxonomy dssFlowTaxonomy, Long projectVersionID) throws DSSErrorException { try { - flowTaxonomyMapper.insertFlowTaxonomy(dwsFlowTaxonomy); + flowTaxonomyMapper.insertFlowTaxonomy(dssFlowTaxonomy); }catch (DuplicateKeyException e){ logger.info(e.getMessage()); throw new DSSErrorException(90005,"工作流名分类名不能重复"); @@ -114,9 +114,9 @@ public void addFlowTaxonomy(DWSFlowTaxonomy dwsFlowTaxonomy,Long projectVersionI @Lock @Transactional(rollbackFor = DSSErrorException.class) @Override - public void updateFlowTaxonomy(DWSFlowTaxonomy dwsFlowTaxonomy,Long projectVersionID) throws DSSErrorException { + public void updateFlowTaxonomy(DSSFlowTaxonomy dssFlowTaxonomy, Long projectVersionID) throws DSSErrorException { try { - flowTaxonomyMapper.updateFlowTaxonomy(dwsFlowTaxonomy); + flowTaxonomyMapper.updateFlowTaxonomy(dssFlowTaxonomy); }catch (DuplicateKeyException e){ logger.info(e.getMessage()); throw new DSSErrorException(90005,"工作流名分类名不能重复"); diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DWSNodeInfoServiceImpl.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSNodeInfoServiceImpl.java similarity index 85% rename from dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DWSNodeInfoServiceImpl.java rename to dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSNodeInfoServiceImpl.java index bfbdfa5d51..0b9571f265 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DWSNodeInfoServiceImpl.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSNodeInfoServiceImpl.java @@ -17,10 +17,9 @@ package com.webank.wedatasphere.dss.server.service.impl; -import com.webank.wedatasphere.dss.application.entity.Application; import com.webank.wedatasphere.dss.server.dao.NodeInfoMapper; import com.webank.wedatasphere.dss.server.entity.NodeInfo; -import com.webank.wedatasphere.dss.server.service.DWSNodeInfoService; +import com.webank.wedatasphere.dss.server.service.DSSNodeInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,7 +27,7 @@ @Service -public class DWSNodeInfoServiceImpl implements DWSNodeInfoService { +public class DSSNodeInfoServiceImpl implements DSSNodeInfoService { @Autowired private NodeInfoMapper nodeInfoMapper; diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DWSProjectServiceImpl.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSProjectServiceImpl.java similarity index 73% rename from dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DWSProjectServiceImpl.java rename to dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSProjectServiceImpl.java index 3d0393e0c4..b77c56bd80 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DWSProjectServiceImpl.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSProjectServiceImpl.java @@ -27,25 +27,25 @@ import com.webank.wedatasphere.dss.appjoint.service.ProjectService; import com.webank.wedatasphere.dss.application.entity.Application; import com.webank.wedatasphere.dss.application.service.ApplicationService; -import com.webank.wedatasphere.dss.common.entity.flow.DWSFlow; -import com.webank.wedatasphere.dss.common.entity.flow.DWSFlowVersion; -import com.webank.wedatasphere.dss.common.entity.project.DWSProject; -import com.webank.wedatasphere.dss.common.entity.project.DWSProjectPublishHistory; -import com.webank.wedatasphere.dss.common.entity.project.DWSProjectVersion; +import com.webank.wedatasphere.dss.common.entity.flow.DSSFlow; +import com.webank.wedatasphere.dss.common.entity.flow.DSSFlowVersion; +import com.webank.wedatasphere.dss.common.entity.project.DSSProject; +import com.webank.wedatasphere.dss.common.entity.project.DSSProjectPublishHistory; +import com.webank.wedatasphere.dss.common.entity.project.DSSProjectVersion; import com.webank.wedatasphere.dss.common.entity.project.Project; import com.webank.wedatasphere.dss.common.exception.DSSErrorException; -import com.webank.wedatasphere.dss.common.protocol.RequestDWSProject; +import com.webank.wedatasphere.dss.common.protocol.RequestDSSProject; import com.webank.wedatasphere.dss.common.utils.DSSExceptionUtils; import com.webank.wedatasphere.dss.server.constant.DSSServerConstant; import com.webank.wedatasphere.dss.server.dao.*; -import com.webank.wedatasphere.dss.server.entity.DWSFlowTaxonomy; -import com.webank.wedatasphere.dss.server.entity.DWSProjectTaxonomyRelation; +import com.webank.wedatasphere.dss.server.entity.DSSFlowTaxonomy; +import com.webank.wedatasphere.dss.server.entity.DSSProjectTaxonomyRelation; import com.webank.wedatasphere.dss.server.function.FunctionInvoker; import com.webank.wedatasphere.dss.server.lock.Lock; import com.webank.wedatasphere.dss.server.lock.LockEnum; import com.webank.wedatasphere.dss.server.service.BMLService; -import com.webank.wedatasphere.dss.server.service.DWSFlowService; -import com.webank.wedatasphere.dss.server.service.DWSProjectService; +import com.webank.wedatasphere.dss.server.service.DSSFlowService; +import com.webank.wedatasphere.dss.server.service.DSSProjectService; import com.webank.wedatasphere.dss.server.util.ThreadPoolTool; import org.apache.commons.lang.StringUtils; import org.apache.commons.math3.util.Pair; @@ -63,20 +63,20 @@ @Service -public class DWSProjectServiceImpl implements DWSProjectService { +public class DSSProjectServiceImpl implements DSSProjectService { private Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private ProjectTaxonomyMapper projectTaxonomyMapper; @Autowired - private DWSUserMapper dwsUserMapper; + private DSSUserMapper dssUserMapper; @Autowired private FlowMapper flowMapper; @Autowired private FlowTaxonomyMapper flowTaxonomyMapper; @Autowired - private DWSFlowService flowService; + private DSSFlowService flowService; @Autowired private ProjectMapper projectMapper; @@ -90,29 +90,29 @@ public class DWSProjectServiceImpl implements DWSProjectService { private SchedulerAppJoint schedulerAppJoint=null; @Override - public DWSProject getProjectByID(Long id) { + public DSSProject getProjectByID(Long id) { /*JdbcProjectImpl instance = wtssdbConnector.getInjector().getInstance(JdbcProjectImpl.class); Project project = instance.fetchProjectById(id.intValue()); - DWSProject dwsProject = EntityUtils.Project2DWSProject(project);*/ + DSSProject DSSProject = EntityUtils.Project2DSSProject(project);*/ return projectMapper.selectProjectByID(id); } @Transactional(rollbackFor = {DSSErrorException.class,AppJointErrorException.class}) @Override public Long addProject(String userName, String name, String description, Long taxonomyID,String product,Integer applicationArea,String business) throws DSSErrorException, AppJointErrorException { - DWSProject dwsProject = new DWSProject(); - dwsProject.setUserName(userName); - dwsProject.setName(name); - dwsProject.setDescription(description); + DSSProject dssProject = new DSSProject(); + dssProject.setUserName(userName); + dssProject.setName(name); + dssProject.setDescription(description); //创建scheduler的project if(existSchesulis()){ - createSchedulerProject(dwsProject); + createSchedulerProject(dssProject); } //创建appjoint的project - Map appjointProjectIDAndAppID = createAppjointProject(dwsProject); - Long userID = dwsUserMapper.getUserID(userName); + Map appjointProjectIDAndAppID = createAppjointProject(dssProject); + Long userID = dssUserMapper.getUserID(userName); //创建dss自己的project - Pair pair = addDWSProject(userID, name, description,product,applicationArea,business); + Pair pair = addDSSProject(userID, name, description,product,applicationArea,business); //添加关联 projectTaxonomyMapper.addProjectTaxonomyRelation(pair.getFirst(), taxonomyID, userID); if(!appjointProjectIDAndAppID.isEmpty())projectMapper.addAccessProjectRelation(appjointProjectIDAndAppID,pair.getFirst()); @@ -121,7 +121,7 @@ public Long addProject(String userName, String name, String description, Long ta - private Map createAppjointProject(DWSProject project) throws DSSErrorException, AppJointErrorException { + private Map createAppjointProject(DSSProject project) throws DSSErrorException, AppJointErrorException { Map applicationProjectIDs = new HashMap(); List> pairs = functionInvoker.projectServiceAddFunction(project, ProjectService::createProject, applicationService.listAppjoint()); for (Pair pair : pairs) { @@ -132,33 +132,33 @@ private Map createAppjointProject(DWSProject project) throws DSSError return applicationProjectIDs; } - private Pair addDWSProject(Long userID, String name, String description,String product,Integer applicationArea,String business) { - DWSProject dwsProject = new DWSProject(); - dwsProject.setUserID(userID); - dwsProject.setName(name); - dwsProject.setDescription(description); - dwsProject.setSource(DSSServerConstant.DWS_PROJECT_SOURCE); - dwsProject.setCreateTime(new Date()); - dwsProject.setCreateBy(userID); - dwsProject.setProduct(product); - dwsProject.setApplicationArea(applicationArea); - dwsProject.setBusiness(business); - projectMapper.addProject(dwsProject); - DWSProjectVersion dwsProjectVersion = new DWSProjectVersion(); - dwsProjectVersion.setComment(DSSServerConstant.DWS_PROJECT_FIRST_VERSION_COMMENT); - dwsProjectVersion.setProjectID(dwsProject.getId()); - dwsProjectVersion.setUpdateTime(new Date()); - dwsProjectVersion.setUpdatorID(userID); - dwsProjectVersion.setVersion(DSSServerConstant.DWS_PROJECT_FIRST_VERSION); - dwsProjectVersion.setLock(0); - projectMapper.addProjectVersion(dwsProjectVersion); - return new Pair(dwsProject.getId(),dwsProjectVersion.getId()); + private Pair addDSSProject(Long userID, String name, String description,String product,Integer applicationArea,String business) { + DSSProject dssProject = new DSSProject(); + dssProject.setUserID(userID); + dssProject.setName(name); + dssProject.setDescription(description); + dssProject.setSource(DSSServerConstant.DSS_PROJECT_SOURCE); + dssProject.setCreateTime(new Date()); + dssProject.setCreateBy(userID); + dssProject.setProduct(product); + dssProject.setApplicationArea(applicationArea); + dssProject.setBusiness(business); + projectMapper.addProject(dssProject); + DSSProjectVersion dssProjectVersion = new DSSProjectVersion(); + dssProjectVersion.setComment(DSSServerConstant.DSS_PROJECT_FIRST_VERSION_COMMENT); + dssProjectVersion.setProjectID(dssProject.getId()); + dssProjectVersion.setUpdateTime(new Date()); + dssProjectVersion.setUpdatorID(userID); + dssProjectVersion.setVersion(DSSServerConstant.DSS_PROJECT_FIRST_VERSION); + dssProjectVersion.setLock(0); + projectMapper.addProjectVersion(dssProjectVersion); + return new Pair(dssProject.getId(), dssProjectVersion.getId()); } - private void createSchedulerProject(DWSProject dwsProject) throws DSSErrorException { + private void createSchedulerProject(DSSProject dssProject) throws DSSErrorException { try { if(getSchedulerAppJoint() != null) { - functionInvoker.projectServiceAddFunction(dwsProject, ProjectService::createProject, Arrays.asList(getSchedulerAppJoint())); + functionInvoker.projectServiceAddFunction(dssProject, ProjectService::createProject, Arrays.asList(getSchedulerAppJoint())); }else{ logger.error("Add scheduler project failed for scheduler appjoint is null"); } @@ -174,7 +174,7 @@ public void updateProject(long projectID, String name, String description, Strin //无法修改名字 //更新wtssProject中的description if(!StringUtils.isBlank(description)){ - DWSProject project = getProjectByID(projectID); + DSSProject project = getProjectByID(projectID); project.setUserName(userName); project.setDescription(description); if(existSchesulis()){ @@ -193,7 +193,7 @@ public void updateProject(long projectID, String name, String description, Strin @Override public void deleteProject(long projectID, String userName, Boolean ifDelScheduler) throws DSSErrorException { try { - DWSProject project = getProjectByID(projectID); + DSSProject project = getProjectByID(projectID); project.setUserName(userName); if(ifDelScheduler){ if(existSchesulis()){ @@ -212,19 +212,19 @@ public void deleteProject(long projectID, String userName, Boolean ifDelSchedule throw new DSSErrorException(90012, errorMsg); } flowTaxonomyMapper.deleteFlowTaxonomyByProjectID(projectID); - List dwsFlowList = flowMapper.listFlowByProjectID(projectID); - flowService.batchDeleteFlow(dwsFlowList.stream().map(f -> f.getId()).distinct().collect(Collectors.toList()), null); + List dssFlowList = flowMapper.listFlowByProjectID(projectID); + flowService.batchDeleteFlow(dssFlowList.stream().map(f -> f.getId()).distinct().collect(Collectors.toList()), null); projectMapper.deleteProjectVersions(projectID); projectMapper.deleteProjectBaseInfo(projectID); projectTaxonomyMapper.deleteProjectTaxonomyRelationByProjectID(projectID); } @Override - public DWSProject getLatestVersionProject(Long projectID) { - DWSProject dwsProject = getProjectByID(projectID); - DWSProjectVersion dwsProjectVersion = projectMapper.selectLatestVersionByProjectID(projectID); - dwsProject.setLatestVersion(dwsProjectVersion); - return dwsProject; + public DSSProject getLatestVersionProject(Long projectID) { + DSSProject dssProject = getProjectByID(projectID); + DSSProjectVersion dssProjectVersion = projectMapper.selectLatestVersionByProjectID(projectID); + dssProject.setLatestVersion(dssProjectVersion); + return dssProject; } /** @@ -234,9 +234,9 @@ public DWSProject getLatestVersionProject(Long projectID) { * @return */ @Override - public DWSProject getProjectByProjectVersionID(Long projectVersionID) { - DWSProject dwsProject = projectMapper.selectProjectByVersionID(projectVersionID); - return dwsProject; + public DSSProject getProjectByProjectVersionID(Long projectVersionID) { + DSSProject dssProject = projectMapper.selectProjectByVersionID(projectVersionID); + return dssProject; } @Override @@ -245,13 +245,13 @@ public Boolean isPublished(Long projectID) { } @Override - public List listAllProjectVersions(Long projectID) { - List dwsProjectVersions = projectMapper.listProjectVersionsByProjectID(projectID); - for (DWSProjectVersion dwsProjectVersion : dwsProjectVersions) { - DWSProjectPublishHistory publishHistory = projectMapper.selectProjectPublishHistoryByProjectVersionID(dwsProjectVersion.getId()); - dwsProjectVersion.setPublishHistory(publishHistory); + public List listAllProjectVersions(Long projectID) { + List dssProjectVersions = projectMapper.listProjectVersionsByProjectID(projectID); + for (DSSProjectVersion dssProjectVersion : dssProjectVersions) { + DSSProjectPublishHistory publishHistory = projectMapper.selectProjectPublishHistoryByProjectVersionID(dssProjectVersion.getId()); + dssProjectVersion.setPublishHistory(publishHistory); } - return dwsProjectVersions; + return dssProjectVersions; } @@ -266,39 +266,39 @@ public void publish(Long projectVersionID, String userName, String comment) thro ProjectTuning projectTuning = schedulerAppJoint.getProjectTuning(); ProjectPublishHook[] projectPublishHooks = schedulerAppJoint.getProjectPublishHooks(); // TODO: 2019/9/24 try catch 下载json要挪到parser去 - //1.封装dwsProject - DWSProject dwsProject = projectMapper.selectProjectByVersionID(projectVersionID); - dwsProject.setUserName(dwsUserMapper.getuserName(dwsProject.getUserID())); - logger.info(userName + "-开始发布工程：" + dwsProject.getName() + "版本ID为：" + projectVersionID); - ArrayList dwsFlows = new ArrayList<>(); - List dwsFlowVersionList = flowMapper.listLatestRootFlowVersionByProjectVersionID(projectVersionID); - for (DWSFlowVersion dwsFlowVersion : dwsFlowVersionList) { - DWSFlow dwsFlow = flowMapper.selectFlowByID(dwsFlowVersion.getFlowID()); - String json = (String) bmlService.query(userName, dwsFlowVersion.getJsonPath(), dwsFlowVersion.getVersion()).get("string"); - if (!dwsFlow.getHasSaved()) { - logger.info("工作流{}从未保存过，忽略", dwsFlow.getName()); + //1.封装DSSProject + DSSProject dssProject = projectMapper.selectProjectByVersionID(projectVersionID); + dssProject.setUserName(dssUserMapper.getuserName(dssProject.getUserID())); + logger.info(userName + "-开始发布工程：" + dssProject.getName() + "版本ID为：" + projectVersionID); + ArrayList dssFlows = new ArrayList<>(); + List dssFlowVersionList = flowMapper.listLatestRootFlowVersionByProjectVersionID(projectVersionID); + for (DSSFlowVersion dssFlowVersion : dssFlowVersionList) { + DSSFlow dssFlow = flowMapper.selectFlowByID(dssFlowVersion.getFlowID()); + String json = (String) bmlService.query(userName, dssFlowVersion.getJsonPath(), dssFlowVersion.getVersion()).get("string"); + if (!dssFlow.getHasSaved()) { + logger.info("工作流{}从未保存过，忽略", dssFlow.getName()); } else if (StringUtils.isNotBlank(json)) { - dwsFlowVersion.setJson(json); - dwsFlow.setLatestVersion(dwsFlowVersion); - createPublishProject(userName, dwsFlowVersion.getFlowID(), dwsFlow, projectVersionID); - dwsFlows.add(dwsFlow); + dssFlowVersion.setJson(json); + dssFlow.setLatestVersion(dssFlowVersion); + createPublishProject(userName, dssFlowVersion.getFlowID(), dssFlow, projectVersionID); + dssFlows.add(dssFlow); } else { - String warnMsg = String.format(DSSServerConstant.PUBLISH_FLOW_REPORT_FORMATE, dwsFlow.getName(), dwsFlowVersion.getVersion()); + String warnMsg = String.format(DSSServerConstant.PUBLISH_FLOW_REPORT_FORMATE, dssFlow.getName(), dssFlowVersion.getVersion()); logger.info(warnMsg); throw new DSSErrorException(90013, warnMsg); } } - if (dwsFlows.isEmpty()) throw new DSSErrorException(90007, "该工程没有可以发布的工作流,请检查工作流是否都为空"); - dwsProject.setFlows(dwsFlows); - //2.封装dwsProject完成，开始发布 - SchedulerProject schedulerProject = projectParser.parseProject(dwsProject); + if (dssFlows.isEmpty()) throw new DSSErrorException(90007, "该工程没有可以发布的工作流,请检查工作流是否都为空"); + dssProject.setFlows(dssFlows); + //2.封装DSSProject完成，开始发布 + SchedulerProject schedulerProject = projectParser.parseProject(dssProject); projectTuning.tuningSchedulerProject(schedulerProject); Stream.of(projectPublishHooks).forEach(DSSExceptionUtils.handling(hook -> hook.prePublish(schedulerProject))); (schedulerAppJoint.getProjectService()).publishProject(schedulerProject, schedulerAppJoint.getSecurityService().login(userName)); Stream.of(projectPublishHooks).forEach(DSSExceptionUtils.handling(hook -> hook.postPublish(schedulerProject))); //3.发布完成后复制工程 - DWSProjectVersion dwsProjectVersion = projectMapper.selectProjectVersionByID(projectVersionID); - copyProjectVersionMax(projectVersionID, dwsProjectVersion, dwsProjectVersion, userName, null); + DSSProjectVersion dssProjectVersion = projectMapper.selectProjectVersionByID(projectVersionID); + copyProjectVersionMax(projectVersionID, dssProjectVersion, dssProjectVersion, userName, null); }else { logger.error("SchedulerAppJoint is null"); throw new DSSErrorException(90014, "SchedulerAppJoint is null"); @@ -307,15 +307,15 @@ public void publish(Long projectVersionID, String userName, String comment) thro @Override public Long createPublishHistory(String comment, Long creatorID, Long projectVersionID) { - DWSProjectPublishHistory dwsProjectPublishHistory = new DWSProjectPublishHistory(); - dwsProjectPublishHistory.setComment(comment); - dwsProjectPublishHistory.setCreateID(creatorID); - dwsProjectPublishHistory.setCreateTime(new Date()); - dwsProjectPublishHistory.setUpdateTime(new Date()); - dwsProjectPublishHistory.setProjectVersionID(projectVersionID); - dwsProjectPublishHistory.setState(0); - projectMapper.insertPublishHistory(dwsProjectPublishHistory); - return dwsProjectPublishHistory.getId(); + DSSProjectPublishHistory dssProjectPublishHistory = new DSSProjectPublishHistory(); + dssProjectPublishHistory.setComment(comment); + dssProjectPublishHistory.setCreateID(creatorID); + dssProjectPublishHistory.setCreateTime(new Date()); + dssProjectPublishHistory.setUpdateTime(new Date()); + dssProjectPublishHistory.setProjectVersionID(projectVersionID); + dssProjectPublishHistory.setState(0); + projectMapper.insertPublishHistory(dssProjectPublishHistory); + return dssProjectPublishHistory.getId(); } @Override @@ -324,18 +324,18 @@ public void updatePublishHistory(Long projectVersionID, Integer status, Date upd } @Override - public DWSProjectPublishHistory getPublishHistoryByID(Long projectVersionID) { + public DSSProjectPublishHistory getPublishHistoryByID(Long projectVersionID) { return projectMapper.selectProjectPublishHistoryByProjectVersionID(projectVersionID); } @Override - public DWSProject getExecutionDWSProject(RequestDWSProject requestDWSProject) throws DSSErrorException { - DWSFlow dwsFlow = flowService.getOneVersionFlow(requestDWSProject.flowId(), requestDWSProject.version(),requestDWSProject.projectVersionId()); - DWSProject dwsProject = projectMapper.selectProjectByVersionID(requestDWSProject.projectVersionId()); - dwsProject.setUserName(dwsUserMapper.getuserName(dwsProject.getUserID())); - DWSFlow returnFlow = recursiveGenerateParentFlow(dwsFlow,requestDWSProject); - dwsProject.setFlows(Arrays.asList(returnFlow)); - return dwsProject; + public DSSProject getExecutionDSSProject(RequestDSSProject requestDSSProject) throws DSSErrorException { + DSSFlow dssFlow = flowService.getOneVersionFlow(requestDSSProject.flowId(), requestDSSProject.version(), requestDSSProject.projectVersionId()); + DSSProject dssProject = projectMapper.selectProjectByVersionID(requestDSSProject.projectVersionId()); + dssProject.setUserName(dssUserMapper.getuserName(dssProject.getUserID())); + DSSFlow returnFlow = recursiveGenerateParentFlow(dssFlow, requestDSSProject); + dssProject.setFlows(Arrays.asList(returnFlow)); + return dssProject; } @Override @@ -352,43 +352,43 @@ public Long getAppjointProjectIDByApplicationName(Long projectID, String applica return appjointProjectID == null? projectID:appjointProjectID; } - private DWSFlow recursiveGenerateParentFlow(DWSFlow dwsFlow,RequestDWSProject requestDWSProject) throws DSSErrorException { - DWSFlow returnFlow = null; - Long parentFlowID = flowService.getParentFlowID(dwsFlow.getId()); + private DSSFlow recursiveGenerateParentFlow(DSSFlow dssFlow, RequestDSSProject requestDSSProject) throws DSSErrorException { + DSSFlow returnFlow = null; + Long parentFlowID = flowService.getParentFlowID(dssFlow.getId()); if(parentFlowID != null){ //对于当前执行的工作流的父工作流，直接找其最新的版本 - DWSFlow parentFlow = flowService.getLatestVersionFlow(parentFlowID,requestDWSProject.projectVersionId()); - parentFlow.setChildren(Arrays.asList(dwsFlow)); - returnFlow = recursiveGenerateParentFlow(parentFlow,requestDWSProject); + DSSFlow parentFlow = flowService.getLatestVersionFlow(parentFlowID, requestDSSProject.projectVersionId()); + parentFlow.setChildren(Arrays.asList(dssFlow)); + returnFlow = recursiveGenerateParentFlow(parentFlow, requestDSSProject); }else { - returnFlow = dwsFlow; + returnFlow = dssFlow; } return returnFlow; } - private void createPublishProject(String userName, Long parentFlowID, DWSFlow dwsFlowParent, Long projectVersionID) throws DSSErrorException { + private void createPublishProject(String userName, Long parentFlowID, DSSFlow dssFlowParent, Long projectVersionID) throws DSSErrorException { List subFlowIDS = flowMapper.selectSubFlowIDByParentFlowID(parentFlowID); - ArrayList dwsFlows = new ArrayList<>(); + ArrayList dssFlows = new ArrayList<>(); for (Long subFlowID : subFlowIDS) { - DWSFlowVersion dwsFlowVersion = flowService.getLatestVersionByFlowIDAndProjectVersionID(subFlowID, projectVersionID); - if (dwsFlowVersion != null) { //subFlowIDS通过flow关联查出来的，但是有可能最新版本的project对已有的flows做了删除 - DWSFlow dwsFlow = flowMapper.selectFlowByID(dwsFlowVersion.getFlowID()); - String json = (String) bmlService.query(userName, dwsFlowVersion.getJsonPath(), dwsFlowVersion.getVersion()).get("string"); - if (!dwsFlow.getHasSaved()) { - logger.info("工作流{}从未保存过，忽略",dwsFlow.getName()); + DSSFlowVersion dssFlowVersion = flowService.getLatestVersionByFlowIDAndProjectVersionID(subFlowID, projectVersionID); + if (dssFlowVersion != null) { //subFlowIDS通过flow关联查出来的，但是有可能最新版本的project对已有的flows做了删除 + DSSFlow dssFlow = flowMapper.selectFlowByID(dssFlowVersion.getFlowID()); + String json = (String) bmlService.query(userName, dssFlowVersion.getJsonPath(), dssFlowVersion.getVersion()).get("string"); + if (!dssFlow.getHasSaved()) { + logger.info("工作流{}从未保存过，忽略", dssFlow.getName()); }else if (StringUtils.isNotBlank(json)){ - dwsFlowVersion.setJson(json); - dwsFlow.setLatestVersion(dwsFlowVersion); - createPublishProject(userName, subFlowID, dwsFlow, projectVersionID); - dwsFlows.add(dwsFlow); + dssFlowVersion.setJson(json); + dssFlow.setLatestVersion(dssFlowVersion); + createPublishProject(userName, subFlowID, dssFlow, projectVersionID); + dssFlows.add(dssFlow); } else { - String warnMsg = String.format(DSSServerConstant.PUBLISH_FLOW_REPORT_FORMATE, dwsFlow.getName(), dwsFlowVersion.getVersion()); + String warnMsg = String.format(DSSServerConstant.PUBLISH_FLOW_REPORT_FORMATE, dssFlow.getName(), dssFlowVersion.getVersion()); logger.info(warnMsg); throw new DSSErrorException(90013, warnMsg); } } } - dwsFlowParent.setChildren(dwsFlows); + dssFlowParent.setChildren(dssFlows); } /* @@ -398,17 +398,17 @@ private void createPublishProject(String userName, Long parentFlowID, DWSFlow dw @Transactional(rollbackFor = {DSSErrorException.class, InterruptedException.class,AppJointErrorException.class}) @Override public Long copyProject(Long projectVersionID, Long projectID, String projectName, String userName) throws DSSErrorException, InterruptedException, AppJointErrorException { - DWSProject project = projectMapper.selectProjectByID(projectID); + DSSProject project = projectMapper.selectProjectByID(projectID); if (StringUtils.isNotEmpty(projectName)) {project.setName(projectName);} - DWSProjectTaxonomyRelation projectTaxonomyRelation = projectTaxonomyMapper.selectProjectTaxonomyRelationByTaxonomyIdOrProjectId(projectID); + DSSProjectTaxonomyRelation projectTaxonomyRelation = projectTaxonomyMapper.selectProjectTaxonomyRelationByTaxonomyIdOrProjectId(projectID); //添加至wtss的project数据库，获取projectID project.setUserName(userName); if(existSchesulis()){ createSchedulerProject(project); } Map appjointProjectIDAndAppID = createAppjointProject(project); - Long userID = dwsUserMapper.getUserID(userName); - //添加至dws的project数据库，这里的projectID应该不需要自增 + Long userID = dssUserMapper.getUserID(userName); + //添加至DSS的project数据库，这里的projectID应该不需要自增 //目前是相同数据库，需要自增id project.setUserID(userID); project.setCreateTime(new Date()); @@ -416,7 +416,7 @@ public Long copyProject(Long projectVersionID, Long projectID, String projectNam projectMapper.addProject(project); if(!appjointProjectIDAndAppID.isEmpty())projectMapper.addAccessProjectRelation(appjointProjectIDAndAppID,project.getId()); projectTaxonomyMapper.addProjectTaxonomyRelation(project.getId(), projectTaxonomyRelation.getTaxonomyId(), userID); - DWSProjectVersion maxVersion = projectMapper.selectLatestVersionByProjectID(projectID); + DSSProjectVersion maxVersion = projectMapper.selectLatestVersionByProjectID(projectID); copyProjectVersionMax(maxVersion.getId(), maxVersion, maxVersion, userName, project.getId()); return project.getId(); } @@ -437,19 +437,19 @@ private boolean existSchesulis(){ @Lock(type = LockEnum.ADD) @Transactional(rollbackFor = {DSSErrorException.class, InterruptedException.class}) @Override - public void copyProjectVersionMax(Long projectVersionID, DWSProjectVersion maxVersion, DWSProjectVersion copyVersion, String userName, Long WTSSprojectID) throws DSSErrorException, InterruptedException { + public void copyProjectVersionMax(Long projectVersionID, DSSProjectVersion maxVersion, DSSProjectVersion copyVersion, String userName, Long WTSSprojectID) throws DSSErrorException, InterruptedException { // copy project_version String maxVersionNum = generateNewVersion(maxVersion.getVersion()); if (null != WTSSprojectID) { - copyVersion.setVersion(DSSServerConstant.DWS_PROJECT_FIRST_VERSION); + copyVersion.setVersion(DSSServerConstant.DSS_PROJECT_FIRST_VERSION); copyVersion.setProjectID(WTSSprojectID); } else { copyVersion.setVersion(maxVersionNum); } - Long userID = dwsUserMapper.getUserID(userName); + Long userID = dssUserMapper.getUserID(userName); copyVersion.setUpdatorID(userID); copyVersion.setUpdateTime(new Date()); - List flowVersions = flowMapper.listLastFlowVersionsByProjectVersionID(copyVersion.getId()) + List flowVersions = flowMapper.listLastFlowVersionsByProjectVersionID(copyVersion.getId()) .stream().sorted((o1, o2) -> Integer.valueOf(o1.getFlowID().toString()) - Integer.valueOf(o2.getFlowID().toString())) .collect(Collectors.toList()); Long oldProjectVersionID = copyVersion.getId(); @@ -460,20 +460,20 @@ public void copyProjectVersionMax(Long projectVersionID, DWSProjectVersion maxVe // copy flow if (null != WTSSprojectID) { flowVersions.stream().forEach(f -> { - DWSFlow flow = flowMapper.selectFlowByID(f.getFlowID()); + DSSFlow flow = flowMapper.selectFlowByID(f.getFlowID()); Long parentFlowID = flowMapper.selectParentFlowIDByFlowID(flow.getId()); if (parentFlowID != null) {subAndParentFlowIDMap.put(flow.getId(), parentFlowID);} }); - for (DWSFlowVersion fv : flowVersions) { + for (DSSFlowVersion fv : flowVersions) { // 添加所有父子到map中 - DWSFlow flow = flowMapper.selectFlowByID(fv.getFlowID()); + DSSFlow flow = flowMapper.selectFlowByID(fv.getFlowID()); flow.setCreatorID(userID); flow.setName(flow.getName()); flow.setProjectID(copyVersion.getProjectID()); flow.setCreateTime(new Date()); Long taxonomyID = flowTaxonomyMapper.selectTaxonomyIDByFlowID(flow.getId()); - DWSFlowTaxonomy flowTaxonomy = flowTaxonomyMapper.selectFlowTaxonomyByID(taxonomyID); + DSSFlowTaxonomy flowTaxonomy = flowTaxonomyMapper.selectFlowTaxonomyByID(taxonomyID); //新增flow相关数据 fv.setOldFlowID(flow.getId()); flow.setId(null); @@ -493,19 +493,19 @@ public void copyProjectVersionMax(Long projectVersionID, DWSProjectVersion maxVe if (null != taxonomyID){flowTaxonomyMapper.insertFlowTaxonomyRelation(flowTaxonomy.getId(), flow.getId());} fv.setFlowID(flow.getId()); } - for (DWSFlowVersion fv : flowVersions) { + for (DSSFlowVersion fv : flowVersions) { if (subAndParentFlowIDMap.get(fv.getFlowID()) != null){flowMapper.insertFlowRelation(fv.getFlowID(), subAndParentFlowIDMap.get(fv.getFlowID()));} } } // copy flow_version if (flowVersions.size() > 0) { - ThreadPoolTool tool = new ThreadPoolTool(5, flowVersions); - tool.setCallBack(new ThreadPoolTool.CallBack() { + ThreadPoolTool tool = new ThreadPoolTool(5, flowVersions); + tool.setCallBack(new ThreadPoolTool.CallBack() { @Override - public void method(List flowVersions) { - for (DWSFlowVersion fv : flowVersions) { + public void method(List flowVersions) { + for (DSSFlowVersion fv : flowVersions) { // 工作流版本的json文件，都是需要重新上传到bml - Map bmlQueryMap = bmlService.download(dwsUserMapper.getuserName(fv.getUpdatorID()), fv.getJsonPath(), fv.getVersion()); + Map bmlQueryMap = bmlService.download(dssUserMapper.getuserName(fv.getUpdatorID()), fv.getJsonPath(), fv.getVersion()); BufferedReader bufferedReader = new BufferedReader(new InputStreamReader((InputStream) bmlQueryMap.get("is"))); StringBuilder sb = new StringBuilder(); String s = null; diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DWSProjectTaxonomyServiceImpl.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSProjectTaxonomyServiceImpl.java similarity index 65% rename from dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DWSProjectTaxonomyServiceImpl.java rename to dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSProjectTaxonomyServiceImpl.java index 1d573c5565..216f1ab7c8 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DWSProjectTaxonomyServiceImpl.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSProjectTaxonomyServiceImpl.java @@ -18,11 +18,11 @@ package com.webank.wedatasphere.dss.server.service.impl; +import com.webank.wedatasphere.dss.common.entity.project.DSSProject; import com.webank.wedatasphere.dss.server.dao.ProjectTaxonomyMapper; -import com.webank.wedatasphere.dss.common.entity.project.DWSProject; -import com.webank.wedatasphere.dss.server.entity.DWSProjectTaxonomy; -import com.webank.wedatasphere.dss.server.service.DWSProjectService; -import com.webank.wedatasphere.dss.server.service.DWSProjectTaxonomyService; +import com.webank.wedatasphere.dss.server.entity.DSSProjectTaxonomy; +import com.webank.wedatasphere.dss.server.service.DSSProjectService; +import com.webank.wedatasphere.dss.server.service.DSSProjectTaxonomyService; import com.webank.wedatasphere.dss.common.exception.DSSErrorException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,22 +36,22 @@ @Service -public class DWSProjectTaxonomyServiceImpl implements DWSProjectTaxonomyService { +public class DSSProjectTaxonomyServiceImpl implements DSSProjectTaxonomyService { private Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private ProjectTaxonomyMapper projectTaxonomyMapper; @Autowired - private DWSProjectService projectService; + private DSSProjectService projectService; @Override - public DWSProjectTaxonomy getProjectTaxonomyByID(Long id) { + public DSSProjectTaxonomy getProjectTaxonomyByID(Long id) { return projectTaxonomyMapper.selectProjectTaxonomyByID(id); } @Override - public List listProjectTaxonomyByUser(String userName) { + public List listProjectTaxonomyByUser(String userName) { return projectTaxonomyMapper.listProjectTaxonomyByUser(userName); } @@ -62,37 +62,37 @@ private List listProjectIDByTaxonomyID(Long taxonomyID, String userName) { @Override - public List listAllProjectTaxonomy(String userName) { - List dwsProjectTaxonomies = listProjectTaxonomyByUser(userName); - for (DWSProjectTaxonomy dwsProjectTaxonomy : dwsProjectTaxonomies) { - List projectIDs = listProjectIDByTaxonomyID(dwsProjectTaxonomy.getId(), userName); - ArrayList dwsProjectList = new ArrayList<>(); + public List listAllProjectTaxonomy(String userName) { + List dwsProjectTaxonomies = listProjectTaxonomyByUser(userName); + for (DSSProjectTaxonomy dssProjectTaxonomy : dwsProjectTaxonomies) { + List projectIDs = listProjectIDByTaxonomyID(dssProjectTaxonomy.getId(), userName); + ArrayList dssProjectList = new ArrayList<>(); for (Long projectID : projectIDs) { - DWSProject dwsProject = projectService.getLatestVersionProject(projectID); - dwsProjectList.add(dwsProject); + DSSProject dssProject = projectService.getLatestVersionProject(projectID); + dssProjectList.add(dssProject); } - dwsProjectTaxonomy.setDwsProjectList(dwsProjectList); + dssProjectTaxonomy.setDssProjectList(dssProjectList); } return dwsProjectTaxonomies; } @Override - public List listProjectTaxonomy(Long taxonomyID, String userName) { - DWSProjectTaxonomy dwsProjectTaxonomy = getProjectTaxonomyByID(taxonomyID); - List projectIDs = listProjectIDByTaxonomyID(dwsProjectTaxonomy.getId(), userName); - ArrayList dwsProjectList = new ArrayList<>(); + public List listProjectTaxonomy(Long taxonomyID, String userName) { + DSSProjectTaxonomy dssProjectTaxonomy = getProjectTaxonomyByID(taxonomyID); + List projectIDs = listProjectIDByTaxonomyID(dssProjectTaxonomy.getId(), userName); + ArrayList dssProjectList = new ArrayList<>(); for (Long projectID : projectIDs) { - DWSProject dwsProject = projectService.getLatestVersionProject(projectID); - dwsProjectList.add(dwsProject); + DSSProject dssProject = projectService.getLatestVersionProject(projectID); + dssProjectList.add(dssProject); } - dwsProjectTaxonomy.setDwsProjectList(dwsProjectList); - return Arrays.asList(dwsProjectTaxonomy); + dssProjectTaxonomy.setDssProjectList(dssProjectList); + return Arrays.asList(dssProjectTaxonomy); } @Override - public void addProjectTaxonomy(DWSProjectTaxonomy dwsProjectTaxonomy) throws DSSErrorException { + public void addProjectTaxonomy(DSSProjectTaxonomy dssProjectTaxonomy) throws DSSErrorException { try { - projectTaxonomyMapper.insertProjectTaxonomy(dwsProjectTaxonomy); + projectTaxonomyMapper.insertProjectTaxonomy(dssProjectTaxonomy); } catch (DuplicateKeyException e) { logger.info(e.getMessage()); throw new DSSErrorException(90004, "工程分类名不能重复"); @@ -100,9 +100,9 @@ public void addProjectTaxonomy(DWSProjectTaxonomy dwsProjectTaxonomy) throws DSS } @Override - public void updateProjectTaxonomy(DWSProjectTaxonomy dwsProjectTaxonomy) throws DSSErrorException { + public void updateProjectTaxonomy(DSSProjectTaxonomy dssProjectTaxonomy) throws DSSErrorException { try { - projectTaxonomyMapper.updateProjectTaxonomy(dwsProjectTaxonomy); + projectTaxonomyMapper.updateProjectTaxonomy(dssProjectTaxonomy); } catch (DuplicateKeyException e) { logger.info(e.getMessage()); throw new DSSErrorException(90004, "工程分类名不能重复"); diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DWSUserServiceImpl.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSUserServiceImpl.java similarity index 71% rename from dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DWSUserServiceImpl.java rename to dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSUserServiceImpl.java index 8c2ec4c72a..60973c98f6 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DWSUserServiceImpl.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSUserServiceImpl.java @@ -18,18 +18,20 @@ package com.webank.wedatasphere.dss.server.service.impl; -import com.webank.wedatasphere.dss.server.dao.DWSUserMapper; -import com.webank.wedatasphere.dss.server.service.DWSUserService; +import com.webank.wedatasphere.dss.application.entity.DSSUser; +import com.webank.wedatasphere.dss.server.dao.DSSUserMapper; +import com.webank.wedatasphere.dss.server.service.DSSUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service -public class DWSUserServiceImpl implements DWSUserService { +public class DSSUserServiceImpl implements DSSUserService { @Autowired - private DWSUserMapper dwsUserMapper; + private DSSUserMapper dssUserMapper; + @Override public Long getUserID(String userName) { - return dwsUserMapper.getUserID(userName); + return dssUserMapper.getUserID(userName); } } diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DWSWorkspaceServiceImpl.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSWorkspaceServiceImpl.java similarity index 78% rename from dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DWSWorkspaceServiceImpl.java rename to dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSWorkspaceServiceImpl.java index 5718a01196..e074f42c0a 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DWSWorkspaceServiceImpl.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSWorkspaceServiceImpl.java @@ -4,7 +4,7 @@ import com.webank.wedatasphere.dss.server.dao.WorkspaceMapper; import com.webank.wedatasphere.dss.server.dto.response.*; import com.webank.wedatasphere.dss.server.entity.*; -import com.webank.wedatasphere.dss.server.service.DWSWorkspaceService; +import com.webank.wedatasphere.dss.server.service.DSSWorkspaceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,35 +15,35 @@ * Created by schumiyi on 2020/6/22 */ @Service -public class DWSWorkspaceServiceImpl implements DWSWorkspaceService { +public class DSSWorkspaceServiceImpl implements DSSWorkspaceService { @Autowired private WorkspaceMapper workspaceMapper; @Override - public List getWorkspaces() { + public List getWorkspaces() { return workspaceMapper.getWorkspaces(); } @Override - public DWSWorkspace getWorkspacesById(Long id) { + public DSSWorkspace getWorkspacesById(Long id) { return workspaceMapper.getWorkspaceById(id); } @Override public Long addWorkspace(String userName, String name, String department, String label, String description) { - DWSWorkspace dwsWorkspace = new DWSWorkspace(); - dwsWorkspace.setName(name); - dwsWorkspace.setDepartment(department); - dwsWorkspace.setDescription(description); - dwsWorkspace.setLabel(label); - dwsWorkspace.setCreateBy(userName); - dwsWorkspace.setSource(DSSServerConstant.DWS_WORKSPACE_SOURCE); - dwsWorkspace.setLastUpdateUser(userName); - workspaceMapper.addWorkSpace(dwsWorkspace); - return dwsWorkspace.getId(); + DSSWorkspace dssWorkspace = new DSSWorkspace(); + dssWorkspace.setName(name); + dssWorkspace.setDepartment(department); + dssWorkspace.setDescription(description); + dssWorkspace.setLabel(label); + dssWorkspace.setCreateBy(userName); + dssWorkspace.setSource(DSSServerConstant.DSS_WORKSPACE_SOURCE); + dssWorkspace.setLastUpdateUser(userName); + workspaceMapper.addWorkSpace(dssWorkspace); + return dssWorkspace.getId(); } @Override @@ -113,16 +113,16 @@ public List getWorkspaceFavorites(Long workspaceId, String @Override public Long addFavorite(String username, Long workspaceId, Long menuApplicationId) { - DWSFavorite dwsFavorite = new DWSFavorite(); - dwsFavorite.setUsername(username); - dwsFavorite.setWorkspaceId(workspaceId); - dwsFavorite.setMenuApplicationId(menuApplicationId); + DSSFavorite dssFavorite = new DSSFavorite(); + dssFavorite.setUsername(username); + dssFavorite.setWorkspaceId(workspaceId); + dssFavorite.setMenuApplicationId(menuApplicationId); // todo: order will from the front end - dwsFavorite.setOrder(1); - dwsFavorite.setCreateBy(username); - dwsFavorite.setLastUpdateUser(username); - workspaceMapper.addFavorite(dwsFavorite); - return dwsFavorite.getId(); + dssFavorite.setOrder(1); + dssFavorite.setCreateBy(username); + dssFavorite.setLastUpdateUser(username); + workspaceMapper.addFavorite(dssFavorite); + return dssFavorite.getId(); } @Override @@ -132,9 +132,7 @@ public Long deleteFavorite(String username, Long favouritesId) { } private boolean isAdminUser(Long workspaceId, String username) { - DWSWorkspace workspace = workspaceMapper.getWorkspaceById(workspaceId); + DSSWorkspace workspace = workspaceMapper.getWorkspaceById(workspaceId); return username != null && workspace != null && username.equals(workspace.getCreateBy()); } - - } diff --git a/dss-server/src/main/scala/com/webank/wedatasphere/dss/server/crumb/CrumbFactory.scala b/dss-server/src/main/scala/com/webank/wedatasphere/dss/server/crumb/CrumbFactory.scala index 9c631c4c2c..e1ef0cda55 100644 --- a/dss-server/src/main/scala/com/webank/wedatasphere/dss/server/crumb/CrumbFactory.scala +++ b/dss-server/src/main/scala/com/webank/wedatasphere/dss/server/crumb/CrumbFactory.scala @@ -18,8 +18,8 @@ package com.webank.wedatasphere.dss.server.crumb import com.webank.wedatasphere.dss.server.entity.CrumbType.CrumbType -import com.webank.wedatasphere.dss.server.entity.{Crumb, CrumbType, DWSFlowTaxonomy, DWSProjectTaxonomy} -import com.webank.wedatasphere.dss.server.service.impl.{DWSFlowServiceImpl, DWSFlowTaxonomyServiceImpl, DWSProjectServiceImpl, DWSProjectTaxonomyServiceImpl} +import com.webank.wedatasphere.dss.server.entity.{Crumb, CrumbType, DSSFlowTaxonomy, DSSProjectTaxonomy} +import com.webank.wedatasphere.dss.server.service.impl.{DSSFlowServiceImpl, DSSFlowTaxonomyServiceImpl, DSSProjectServiceImpl, DSSProjectTaxonomyServiceImpl} import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Component @@ -29,13 +29,13 @@ import scala.collection.mutable.ArrayBuffer @Component class CrumbFactory { @Autowired - private var projectService: DWSProjectServiceImpl = _ + private var projectService: DSSProjectServiceImpl = _ @Autowired - private var projectTaxonomyService:DWSProjectTaxonomyServiceImpl = _ + private var projectTaxonomyService:DSSProjectTaxonomyServiceImpl = _ @Autowired - private var flowService: DWSFlowServiceImpl = _ + private var flowService: DSSFlowServiceImpl = _ @Autowired - private var flowTaxonomyService:DWSFlowTaxonomyServiceImpl = _ + private var flowTaxonomyService:DSSFlowTaxonomyServiceImpl = _ def createCrumbs(crumbType: CrumbType, params: Array[String]): Array[Crumb] = { crumbType match { @@ -112,19 +112,19 @@ class CrumbFactory { } } - private def createAllData(userName:String):java.util.List[DWSProjectTaxonomy] ={ + private def createAllData(userName:String):java.util.List[DSSProjectTaxonomy] ={ projectTaxonomyService.listAllProjectTaxonomy(userName) } - private def createSortProjectData(projectTaxonomyID:Long,userName:String):java.util.List[DWSProjectTaxonomy] ={ + private def createSortProjectData(projectTaxonomyID:Long,userName:String):java.util.List[DSSProjectTaxonomy] ={ projectTaxonomyService.listProjectTaxonomy(projectTaxonomyID,userName) } - private def createProjectData(projectVersionID:Long,isRootFlow:Boolean):java.util.List[DWSFlowTaxonomy] = { + private def createProjectData(projectVersionID:Long,isRootFlow:Boolean):java.util.List[DSSFlowTaxonomy] = { flowTaxonomyService.listAllFlowTaxonomy(projectVersionID,isRootFlow) } - private def createSortFlowData(projectVersionID:Long,flowTaxonomyID:Long,isRootFlow:Boolean):java.util.List[DWSFlowTaxonomy] = { + private def createSortFlowData(projectVersionID:Long,flowTaxonomyID:Long,isRootFlow:Boolean):java.util.List[DSSFlowTaxonomy] = { flowTaxonomyService.listFlowTaxonomy(projectVersionID,flowTaxonomyID:Long,isRootFlow:Boolean) } } diff --git a/dss-server/src/main/scala/com/webank/wedatasphere/dss/server/receiver/DSSServerReceiver.scala b/dss-server/src/main/scala/com/webank/wedatasphere/dss/server/receiver/DSSServerReceiver.scala index 05fef8a515..951128083a 100644 --- a/dss-server/src/main/scala/com/webank/wedatasphere/dss/server/receiver/DSSServerReceiver.scala +++ b/dss-server/src/main/scala/com/webank/wedatasphere/dss/server/receiver/DSSServerReceiver.scala @@ -19,8 +19,8 @@ package com.webank.wedatasphere.dss.server.receiver import com.webank.wedatasphere.dss.application.dao.ApplicationMapper import com.webank.wedatasphere.dss.common.exception.DSSErrorException -import com.webank.wedatasphere.dss.common.protocol.{RequestDSSApplication, RequestDWSProject} -import com.webank.wedatasphere.dss.server.service.DWSProjectService +import com.webank.wedatasphere.dss.common.protocol.{RequestDSSApplication, RequestDSSProject} +import com.webank.wedatasphere.dss.server.service.DSSProjectService import com.webank.wedatasphere.linkis.rpc.{Receiver, Sender} import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Component @@ -32,7 +32,7 @@ import scala.concurrent.duration.Duration class DSSServerReceiver extends Receiver{ @Autowired - var dwsProjectService:DWSProjectService = _ + var dwsProjectService:DSSProjectService = _ @Autowired var applicationMapper:ApplicationMapper = _ @@ -40,7 +40,7 @@ class DSSServerReceiver extends Receiver{ override def receive(message: Any, sender: Sender): Unit = {} override def receiveAndReply(message: Any, sender: Sender): Any = message match { - case f:RequestDWSProject => dwsProjectService.getExecutionDWSProject(f) + case f:RequestDSSProject => dwsProjectService.getExecutionDSSProject(f) case RequestDSSApplication(name) => applicationMapper.getApplication(name) case _ =>throw new DSSErrorException(90000,"") } diff --git a/plugins/linkis/linkis-appjoint-entrance/bin/stop-linkis-appjoint-entrance.sh b/plugins/linkis/linkis-appjoint-entrance/bin/stop-linkis-appjoint-entrance.sh index 7d47032507..a1528811c7 100644 --- a/plugins/linkis/linkis-appjoint-entrance/bin/stop-linkis-appjoint-entrance.sh +++ b/plugins/linkis/linkis-appjoint-entrance/bin/stop-linkis-appjoint-entrance.sh @@ -4,9 +4,9 @@ cd `dirname $0` cd .. HOE=`pwd` -export DWS_ENTRANCE_PID=$HOE/bin/linkis.pid +export DSS_ENTRANCE_PID=$HOE/bin/linkis.pid -function wait_for_DWS_ENGINE_MANAGER_to_die() { +function wait_for_DSS_ENGINE_MANAGER_to_die() { local pid local count pid=$1 @@ -33,15 +33,15 @@ function wait_for_DWS_ENGINE_MANAGER_to_die() { fi } -if [[ ! -f "${DWS_ENTRANCE_PID}" ]]; then +if [[ ! -f "${DSS_ENTRANCE_PID}" ]]; then echo "AppJoint Entrance is not running" else - pid=$(cat ${DWS_ENTRANCE_PID}) + pid=$(cat ${DSS_ENTRANCE_PID}) if [[ -z "${pid}" ]]; then echo "AppJoint Entrance is not running" else - wait_for_DWS_ENGINE_MANAGER_to_die $pid 40 - $(rm -f ${DWS_ENTRANCE_PID}) + wait_for_DSS_ENGINE_MANAGER_to_die $pid 40 + $(rm -f ${DSS_ENTRANCE_PID}) echo "AppJoint Entrance is stopped." fi fi diff --git a/qualitis-appjoint/appjoint/src/main/java/com.webank/wedatasphere/project/QualitisProjectServiceImpl.java b/qualitis-appjoint/appjoint/src/main/java/com.webank/wedatasphere/project/QualitisProjectServiceImpl.java index c65273eb1a..e8ae6d34b7 100644 --- a/qualitis-appjoint/appjoint/src/main/java/com.webank/wedatasphere/project/QualitisProjectServiceImpl.java +++ b/qualitis-appjoint/appjoint/src/main/java/com.webank/wedatasphere/project/QualitisProjectServiceImpl.java @@ -7,7 +7,7 @@ import com.webank.wedatasphere.dss.appjoint.service.AppJointUrlImpl; import com.webank.wedatasphere.dss.appjoint.service.ProjectService; import com.webank.wedatasphere.dss.appjoint.service.session.Session; -import com.webank.wedatasphere.dss.common.entity.project.DWSProject; +import com.webank.wedatasphere.dss.common.entity.project.DSSProject; import com.webank.wedatasphere.dss.common.entity.project.Project; import org.apache.commons.lang.RandomStringUtils; import org.slf4j.Logger; @@ -60,10 +60,10 @@ public Project createProject(Project project, Session session) throws AppJointEr try { QualitisAddProjectRequest qualitisAddProjectRequest = new QualitisAddProjectRequest(); - DWSProject dwsProject = (DWSProject) project; + DSSProject DSSProject = (DSSProject) project; qualitisAddProjectRequest.setProjectName(project.getName()); qualitisAddProjectRequest.setDescription(project.getDescription()); - qualitisAddProjectRequest.setUsername(dwsProject.getUserName()); + qualitisAddProjectRequest.setUsername(DSSProject.getUserName()); RestTemplate restTemplate = new RestTemplate(); HttpEntity entity = generateEntity(qualitisAddProjectRequest); @@ -73,7 +73,7 @@ public Project createProject(Project project, Session session) throws AppJointEr String responseStatus = (String) response.get("code"); if (FAILURE_CODE.equals(responseStatus)) { // Send request to auto create qualitis user - autoAddUser(restTemplate, dwsProject.getUserName()); + autoAddUser(restTemplate, DSSProject.getUserName()); // restart to create project response = createProjectReal(restTemplate, entity); @@ -142,9 +142,9 @@ public void deleteProject(Project project, Session session) throws AppJointError try { QualitisDeleteProjectRequest qualitisDeleteProjectRequest = new QualitisDeleteProjectRequest(); - DWSProject dwsProject = (DWSProject) project; + DSSProject DSSProject = (DSSProject) project; qualitisDeleteProjectRequest.setProjectId(project.getId()); - qualitisDeleteProjectRequest.setUsername(dwsProject.getUserName()); + qualitisDeleteProjectRequest.setUsername(DSSProject.getUserName()); RestTemplate restTemplate = new RestTemplate(); HttpEntity entity = generateEntity(qualitisDeleteProjectRequest); @@ -183,11 +183,11 @@ public void updateProject(Project project, Session session) throws AppJointError try { QualitisUpdateProjectRequest qualitisUpdateProjectRequest = new QualitisUpdateProjectRequest(); - DWSProject dwsProject = (DWSProject) project; + DSSProject DSSProject = (DSSProject) project; qualitisUpdateProjectRequest.setProjectId(project.getId()); qualitisUpdateProjectRequest.setProjectName(project.getName()); qualitisUpdateProjectRequest.setDescription(project.getDescription()); - qualitisUpdateProjectRequest.setUsername(dwsProject.getUserName()); + qualitisUpdateProjectRequest.setUsername(DSSProject.getUserName()); RestTemplate restTemplate = new RestTemplate(); HttpEntity entity = generateEntity(qualitisUpdateProjectRequest); diff --git a/web/src/js/module/header/index.vue b/web/src/js/module/header/index.vue index 53e2df8961..96f75aed74 100644 --- a/web/src/js/module/header/index.vue +++ b/web/src/js/module/header/index.vue @@ -21,7 +21,7 @@ src="../../../assets/images/dssLogo6.png" :alt="$t('message.newConst.logoName')"> - +
{{ proj.name }}
-
{ - if (item.dwsProjectList) { - item.dwsProjectList.forEach(p => { + if (item.dssProjectList) { + item.dssProjectList.forEach(p => { if(p.id == projId) { proj = { ...p } } diff --git a/web/src/js/module/project/index.vue b/web/src/js/module/project/index.vue index d40bd1bff7..201a07b42a 100644 --- a/web/src/js/module/project/index.vue +++ b/web/src/js/module/project/index.vue @@ -14,7 +14,7 @@ :key="item.id" :hide-button-bar="false" :hide-publish-andcopy="false" - :data-list="item.dwsProjectList" + :data-list="item.dssProjectList" :current-data="item" :precent-list="precentList" tag-prop="business" @@ -207,14 +207,14 @@ export default { let projectList = this.cacheData.filter((item) => { return item.id === projectData.taxonomyID; }); - if (this.checkName(projectList[0].dwsProjectList, projectData.name, projectData.id)) return this.$Message.warning(this.$t('message.project.nameUnrepeatable')); + if (this.checkName(projectList[0].dssProjectList, projectData.name, projectData.id)) return this.$Message.warning(this.$t('message.project.nameUnrepeatable')); this.loading = true; if (this.actionType === 'add') { api.fetch('/dss/addProject', projectData, 'post').then(() => { this.$Message.success(`${this.$t('message.project.createProject')}${this.$t('message.newConst.success')}`); this.getclassListData().then((data) => { // 新建完工程进到工作流页 - const currentProject = data[0].dwsProjectList.filter((project) => project.name === projectData.name)[0]; + const currentProject = data[0].dssProjectList.filter((project) => project.name === projectData.name)[0]; this.$router.push({ name: 'Workflow', query: { @@ -331,7 +331,7 @@ export default { let tepArray = storage.get('projectList', 'local'); this.dataList = tepArray.map((item) => { if (id === item.id) { - item.dwsProjectList = item.dwsProjectList.filter((subItem) => { + item.dssProjectList = item.dssProjectList.filter((subItem) => { return subItem.name.indexOf(event.target.value) != -1; }); } @@ -400,7 +400,7 @@ export default { let projectList = this.cacheData.filter((item) => { return item.id === this.currentProjectData.taxonomyID; }); - if (this.checkName(projectList[0].dwsProjectList, name, this.currentProjectData.id)) return this.$Message.warning(this.$t('message.project.nameUnrepeatable')); + if (this.checkName(projectList[0].dssProjectList, name, this.currentProjectData.id)) return this.$Message.warning(this.$t('message.project.nameUnrepeatable')); }; this.dispatch('Project:copy', copyCheckName); } else if (this.currentForm === 'publishForm') { @@ -492,7 +492,7 @@ export default { this.sortType[id] = name === 'updateTime' ? this.$t('message.project.updteTime') : this.$t('message.project.name') this.dataList = this.dataList.map((item) => { if (!id || id === item.id) { - item.dwsProjectList = item.dwsProjectList.sort((a, b) => { + item.dssProjectList = item.dssProjectList.sort((a, b) => { if (name === 'updateTime') { return b.latestVersion[name] - a.latestVersion[name]; } else { diff --git a/web/src/js/module/workflow/index.vue b/web/src/js/module/workflow/index.vue index 692a288ebd..42b8dea6ec 100644 --- a/web/src/js/module/workflow/index.vue +++ b/web/src/js/module/workflow/index.vue @@ -23,7 +23,7 @@ :hide-button-bar="false" :hide-publish-andcopy="true" :current-data="item" - :data-list="item.dwsFlowList" + :data-list="item.dssFlowList" :readonly="myReadonly" tag-prop="uses" @goto="gotoWorkflow" @@ -191,7 +191,7 @@ export default { let flowList = this.cacheData.filter((item) => { return item.id === projectData.taxonomyID; }); - if (this.checkName(flowList[0].dwsFlowList, projectData.name, projectData.id)) return this.$Message.warning(this.$t('message.workflow.nameUnrepeatable')); + if (this.checkName(flowList[0].dssFlowList, projectData.name, projectData.id)) return this.$Message.warning(this.$t('message.workflow.nameUnrepeatable')); this.loading = true; if (this.actionType === 'add') { api.fetch('/dss/addFlow', projectData, 'post').then(() => { @@ -363,8 +363,8 @@ export default { projectVersionID: +this.$route.query.projectVersionID, }; for (let i = 0; i < this.dataList.length; i++) { - for (let j = 0; j < this.dataList[i].dwsFlowList.length; j++) { - if (this.dataList[i].dwsFlowList[j].id === project.id) { + for (let j = 0; j < this.dataList[i].dssFlowList.length; j++) { + if (this.dataList[i].dssFlowList[j].id === project.id) { this.flowTaxonomyID = this.dataList[i].id; break; } @@ -385,7 +385,7 @@ export default { let tepArray = storage.get('flowsList'); this.dataList = tepArray.map((item) => { if (id === item.id) { - item.dwsFlowList = item.dwsFlowList.filter((subItem) => { + item.dssFlowList = item.dssFlowList.filter((subItem) => { return subItem.name.indexOf(event.target.value) != -1; }); } @@ -495,7 +495,7 @@ export default { const projectId = this.$route.query.projectID; res.data.forEach((Taxonomy) => { if (Taxonomy.id === projectTaxonomyID) { - Taxonomy.dwsProjectList.forEach((project) => { + Taxonomy.dssProjectList.forEach((project) => { if (project.id === projectId) { const newProjectVersionId = project.latestVersion.id; this.$router.push({