diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java index 88d57e7a6208c32466205e1e4869a546234efbc7..284e19a81979f0e0870b69082773c87c633ea2f8 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java @@ -158,9 +158,19 @@ public class DataAnalysisService { putErrorRequestParamsMsg(result); return result; } + + List projectIds = new ArrayList<>(); + if(projectId !=0){ + projectIds.add(projectId); + }else if(loginUser.getUserType() == UserType.GENERAL_USER){ + projectIds = processDao.getProjectIdListHavePerm(loginUser.getId()); + + } + Integer[] projectIdArray = projectIds.toArray(new Integer[projectIds.size()]); + List processInstanceStateCounts = - processInstanceMapper.countInstanceStateByUser(loginUser.getId(), - loginUser.getUserType(), start, end, String.valueOf(projectId)); + processInstanceMapper.countInstanceStateByUser(start, end, + projectIdArray); TaskCountDto taskCountResult = new TaskCountDto(processInstanceStateCounts); if (processInstanceStateCounts != null) { @@ -259,12 +269,9 @@ public class DataAnalysisService { if(projectId !=0){ projectIds.add(projectId); }else if(loginUser.getUserType() == UserType.GENERAL_USER){ - List projects = processDao.getProjectListHavePerm(loginUser.getId()); - for(Project project : projects){ - projectIds.add(project.getId()); - } - } + projectIds = processDao.getProjectIdListHavePerm(loginUser.getId()); + } Integer[] projectIdArray = projectIds.toArray(new Integer[projectIds.size()]); // count command state List commandStateCounts = diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java index 49e342e1b67acd2867ffd0b9fd3bef3792f912d6..bfde9a0cf4c2bacc82fe2e54f159b114c3b07c57 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java @@ -502,7 +502,9 @@ public class ProcessDefinitionService extends BaseDAGService { case OFFLINE: { processDefinition.setReleaseState(state); processDefineMapper.updateById(processDefinition); - List scheduleList = scheduleMapper.selectAllByProcessDefineArray(String.valueOf(id)); + List scheduleList = scheduleMapper.selectAllByProcessDefineArray( + new int[]{processDefinition.getId()} + ); for(Schedule schedule:scheduleList){ logger.info("set schedule offline, schedule id: {}, process definition id: {}", project.getId(), schedule.getId(), id); diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessInstanceService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessInstanceService.java index 7271a046c5c7d729fa7f994a25d8b7ce06ee1a9b..23aa5b4317eaaaba5563efef3389a47eda7fd438 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessInstanceService.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessInstanceService.java @@ -191,7 +191,7 @@ public class ProcessInstanceService extends BaseDAGService { IPage processInstanceList = processInstanceMapper.queryProcessInstanceListPaging(page, - project.getId(), processDefineId, searchVal, statesStr, host, start, end); + project.getId(), processDefineId, searchVal, statusArray, host, start, end); Set exclusionSet = new HashSet(){{ add(Constants.CLASS); diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/QueueService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/QueueService.java index 7912e492290fbc8c84162b5df652635fc4e9ae90..8cf32eb69926b782c3fc27cbd23c2f28adf2cb62 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/QueueService.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/service/QueueService.java @@ -243,7 +243,7 @@ public class QueueService extends BaseService { * @return */ private boolean checkQueueExist(String queue) { - return queueMapper.queryByQueue(queue) == null ? false : true; + return queueMapper.queryAllQueueList(queue, null).size()>0 ? false : true; } /** @@ -253,7 +253,7 @@ public class QueueService extends BaseService { * @return */ private boolean checkQueueNameExist(String queueName) { - return queueMapper.queryByQueueName(queueName) == null ? false : true; + return queueMapper.queryAllQueueList(null ,queueName).size()>0 ? false : true; } } diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/TenantService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/TenantService.java index ed33229ebbcd00b646641df8468d8b40cad0b867..8599b0ec602745449fb7bc6e248f1cd583bb0660 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/TenantService.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/service/TenantService.java @@ -168,8 +168,7 @@ public class TenantService extends BaseService{ * if the tenant code is modified, the original resource needs to be copied to the new tenant. */ if (!tenant.getTenantCode().equals(tenantCode)){ - Tenant newTenant = tenantMapper.queryByTenantCode(tenantCode); - if (newTenant == null){ + if (checkTenant(tenantCode)){ // if hdfs startup if (PropertyUtils.getResUploadStartupState()){ String resourcePath = HadoopUtils.getHdfsDataBasePath() + "/" + tenantCode + "/resources"; @@ -279,8 +278,7 @@ public class TenantService extends BaseService{ */ public Result verifyTenantCode(String tenantCode) { Result result=new Result(); - Tenant tenant= tenantMapper.queryByTenantCode(tenantCode); - if (tenant != null) { + if (checkTenant(tenantCode)) { logger.error("tenant {} has exist, can't create again.", tenantCode); putMsg(result, Status.TENANT_NAME_EXIST); }else{ diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/UsersService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/UsersService.java index e454c0c617e795d312474def9ab09865ee3468d4..a32cfe194ab70c0177d62ee218237886c822f84a 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/UsersService.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/service/UsersService.java @@ -396,6 +396,11 @@ public class UsersService extends BaseService { if (check(result, !isAdmin(loginUser), Status.USER_NO_OPERATION_PERM, Constants.STATUS)) { return result; } + User user = userMapper.selectById(userId); + if(user == null){ + putMsg(result, Status.USER_NOT_EXIST, userId); + return result; + } resourcesUserMapper.deleteResourceUser(userId, 0); diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java b/escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java index b88145687fc5cf39444e5a25954d711c973cfdb4..1f705f64a69dec2c0b963d70cdf4cbc08136801c 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java +++ b/escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java @@ -278,18 +278,6 @@ public class ProcessDao extends AbstractBaseDao { return processInstanceMapper.selectById(processId); } - /** - * find process instance by scheduler time. - * @param defineId - * @param scheduleTime - * @return - */ - public ProcessInstance findProcessInstanceByScheduleTime(int defineId, Date scheduleTime){ - - return processInstanceMapper.queryByScheduleTime(defineId, - DateUtils.dateToString(scheduleTime), 0, null, null); - } - /** * find process define by id. * @param processDefinitionId @@ -315,7 +303,7 @@ public class ProcessDao extends AbstractBaseDao { */ public int deleteAllSubWorkProcessByParentId(int processInstanceId){ - List subProcessIdList = processInstanceMapper.querySubIdListByParentId(processInstanceId); + List subProcessIdList = processInstanceMapMapper.querySubIdListByParentId(processInstanceId); for(Integer subId : subProcessIdList ){ deleteAllSubWorkProcessByParentId(subId); @@ -1465,8 +1453,7 @@ public class ProcessDao extends AbstractBaseDao { public List queryNeedFailoverProcessInstances(String host){ - String states = StringUtils.join(stateArray, ","); - return processInstanceMapper.queryByHostAndStatus(host, states); + return processInstanceMapper.queryByHostAndStatus(host, stateArray); } @@ -1533,7 +1520,11 @@ public class ProcessDao extends AbstractBaseDao { * @return */ public ProcessInstance findProcessInstanceByTaskId(int taskId){ - return processInstanceMapper.queryByTaskId(taskId); + TaskInstance taskInstance = taskInstanceMapper.selectById(taskId); + if(taskInstance!= null){ + return processInstanceMapper.selectById(taskInstance.getProcessInstanceId()); + } + return null; } /** @@ -1562,7 +1553,7 @@ public class ProcessDao extends AbstractBaseDao { */ public List selectAllByProcessDefineId(int[] ids){ return scheduleMapper.selectAllByProcessDefineArray( - StringUtils.join(ids, ",")); + ids); } /** @@ -1653,40 +1644,6 @@ public class ProcessDao extends AbstractBaseDao { return cycleDependencyList; } - /** - * find process instance by time interval - * @param defineId - * @param startTime - * @param endTime - * @return - */ - public ProcessInstance findProcessInstanceByTimeInterval(int defineId, Date startTime, Date endTime, int excludeId) { - - return processInstanceMapper.queryByScheduleTime(defineId, null, excludeId, - DateUtils.dateToString(startTime), DateUtils.dateToString(endTime)); - } - - @Transactional(value = "TransactionManager",rollbackFor = Exception.class) - public void selfFaultTolerant(ProcessInstance processInstance){ - - processInstance.setState(ExecutionStatus.FAILURE); - processInstanceMapper.updateById(processInstance); - // insert to command - - Command command = new Command(); - command.setCommandType(CommandType.START_FAILURE_TASK_PROCESS); - command.setProcessDefinitionId(processInstance.getProcessDefinitionId()); - command.setCommandParam(String.format("{\"%s\":%d}", - CMDPARAM_RECOVER_PROCESS_ID_STRING, processInstance.getId())); - - - command.setExecutorId(processInstance.getExecutorId()); - command.setProcessInstancePriority(processInstance.getProcessInstancePriority()); - - createCommand(command); - - } - /** * find last scheduler process instance in the date interval * @param definitionId @@ -1701,8 +1658,8 @@ public class ProcessDao extends AbstractBaseDao { public ProcessInstance findLastManualProcessInterval(int definitionId, DateInterval dateInterval) { return processInstanceMapper.queryLastManualProcess(definitionId, - DateUtils.dateToString(dateInterval.getStartTime()), - DateUtils.dateToString(dateInterval.getEndTime())); + dateInterval.getStartTime(), + dateInterval.getEndTime()); } public ProcessInstance findLastRunningProcess(int definitionId, DateInterval dateInterval) { @@ -1767,9 +1724,23 @@ public class ProcessDao extends AbstractBaseDao { List createProjects = projectMapper.queryProjectCreatedByUser(userId); List authedProjects = projectMapper.queryAuthedProjectListByUserId(userId); - createProjects.addAll(authedProjects); + if(createProjects == null){ + createProjects = new ArrayList<>(); + } + + if(authedProjects != null){ + createProjects.addAll(authedProjects); + } return createProjects; + } + public List getProjectIdListHavePerm(int userId){ + + List projectIdList = new ArrayList<>(); + for(Project project : getProjectListHavePerm(userId)){ + projectIdList.add(project.getId()); + } + return projectIdList; } diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/ProcessInstance.java b/escheduler-dao/src/main/java/cn/escheduler/dao/entity/ProcessInstance.java index 23e98471440acd1075bb3fa9048cb587323cc070..7af74ac06a0158fe9d115f3ed8297d4d79610bb4 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/ProcessInstance.java +++ b/escheduler-dao/src/main/java/cn/escheduler/dao/entity/ProcessInstance.java @@ -18,6 +18,7 @@ package cn.escheduler.dao.entity; import cn.escheduler.common.enums.*; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.core.toolkit.StringUtils; @@ -77,6 +78,7 @@ public class ProcessInstance { /** * process definition structure */ + @TableField(exist = false) private ProcessDefinition processDefinition; /** * process command type @@ -141,11 +143,13 @@ public class ProcessInstance { /** * tenant code */ + @TableField(exist = false) private String tenantCode; /** * queue */ + @TableField(exist = false) private String queue; /** @@ -177,6 +181,7 @@ public class ProcessInstance { * process duration * @return */ + @TableField(exist = false) private Long duration; /** @@ -202,16 +207,19 @@ public class ProcessInstance { /** * worker group name. for api. */ + @TableField(exist = false) private String workerGroupName; /** * receivers for api */ + @TableField(exist = false) private String receivers; /** * receivers cc for api */ + @TableField(exist = false) private String receiversCc; public ProcessInstance(){ diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Schedule.java b/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Schedule.java index 43b7533af50232f6b629136d5d26c25b5972a9be..069ebc3ae6bfd08b13e9f421c3c9e9748d91b1bc 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Schedule.java +++ b/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Schedule.java @@ -18,6 +18,7 @@ package cn.escheduler.dao.entity; import cn.escheduler.common.enums.*; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -42,17 +43,20 @@ public class Schedule { /** * process definition name */ + @TableField(exist = false) private String processDefinitionName; /** * project name */ + @TableField(exist = false) private String projectName; /** * schedule description */ - private String desc; + @TableField(exist = false) + private String definitionDescription; /** * schedule start time @@ -97,6 +101,7 @@ public class Schedule { /** * created user name */ + @TableField(exist = false) private String userName; /** @@ -201,13 +206,7 @@ public class Schedule { this.releaseState = releaseState; } - public String getDesc() { - return desc; - } - public void setDesc(String desc) { - this.desc = desc; - } public int getProcessDefinitionId() { return processDefinitionId; @@ -281,7 +280,7 @@ public class Schedule { ", processDefinitionId=" + processDefinitionId + ", processDefinitionName='" + processDefinitionName + '\'' + ", projectName='" + projectName + '\'' + - ", desc='" + desc + '\'' + + ", description='" + definitionDescription + '\'' + ", startTime=" + startTime + ", endTime=" + endTime + ", crontab='" + crontab + '\'' + @@ -298,4 +297,11 @@ public class Schedule { '}'; } + public String getDefinitionDescription() { + return definitionDescription; + } + + public void setDefinitionDescription(String definitionDescription) { + this.definitionDescription = definitionDescription; + } } diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapMapper.java b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapMapper.java index 9213f7604e9222d40279139fe8bd6c9d9ece0f28..cfa2c7619c2fc122c4baa971febf34d3ae2af07e 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapMapper.java +++ b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapMapper.java @@ -20,6 +20,8 @@ import cn.escheduler.dao.entity.ProcessInstanceMap; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface ProcessInstanceMapMapper extends BaseMapper { @@ -31,4 +33,6 @@ public interface ProcessInstanceMapMapper extends BaseMapper int deleteByParentProcessId(@Param("parentProcessId") int parentProcessId); + List querySubIdListByParentId(@Param("parentInstanceId") int parentInstanceId); + } diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapper.java b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapper.java index 7d61829d8018cef4bfaa0f442447f14dab366574..075412287aa65df835bf383b716bfc092e87cddd 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapper.java +++ b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapper.java @@ -31,47 +31,33 @@ public interface ProcessInstanceMapper extends BaseMapper { ProcessInstance queryDetailById(@Param("processId") int processId); - List queryByHostAndStatus(@Param("host") String host, @Param("states") String stateArray); + List queryByHostAndStatus(@Param("host") String host, + @Param("states") int[] stateArray); IPage queryProcessInstanceListPaging(Page page, @Param("projectId") int projectId, @Param("processDefinitionId") Integer processDefinitionId, @Param("searchVal") String searchVal, - @Param("states") String statusArray, + @Param("states") int[] statusArray, @Param("host") String host, @Param("startTime") Date startTime, @Param("endTime") Date endTime ); int setFailoverByHostAndStateArray(@Param("host") String host, - @Param("states") String stateArray); + @Param("states") int[] stateArray); int updateProcessInstanceByState(@Param("originState") ExecutionStatus originState, @Param("destState") ExecutionStatus destState); - - ProcessInstance queryByTaskId(@Param("taskId") int taskId); - - List countInstanceStateByUser( - @Param("userId") int userId, - @Param("userType") UserType userType, @Param("startTime") Date startTime, @Param("endTime") Date endTime, - @Param("projectIds") String projectIds); - - List querySubIdListByParentId(@Param("parentInstanceId") int parentInstanceId); - - - List queryByProcessDefineId(@Param("processDefinitionId") int processDefinitionId, - @Param("size") int size); - - ProcessInstance queryByScheduleTime(@Param("processDefinitionId") int processDefinitionId, - @Param("scheduleTime") String scheduleTime, - @Param("excludeId") int excludeId, - @Param("startTime") String startTime, - @Param("endTime") String endTime); + @Param("projectIds") Integer[] projectIds); + List queryByProcessDefineId( + @Param("processDefinitionId") int processDefinitionId, + @Param("size") int size); ProcessInstance queryLastSchedulerProcess(@Param("processDefinitionId") int definitionId, @Param("startTime") String startTime, @@ -83,6 +69,6 @@ public interface ProcessInstanceMapper extends BaseMapper { @Param("states") int[] stateArray); ProcessInstance queryLastManualProcess(@Param("processDefinitionId") int definitionId, - @Param("startTime") String startTime, - @Param("endTime") String endTime); + @Param("startTime") Date startTime, + @Param("endTime") Date endTime); } diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/QueueMapper.java b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/QueueMapper.java index 2cc31bb8e2c807b7737809d46944249a1e8118e5..02e93a5ff5f8e526f7a98ff164c2fc2521c48136 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/QueueMapper.java +++ b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/QueueMapper.java @@ -21,6 +21,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * */ @@ -29,7 +31,7 @@ public interface QueueMapper extends BaseMapper { IPage queryQueuePaging(IPage page, @Param("searchVal") String searchVal); - Queue queryByQueue(@Param("queue") String queue); + List queryAllQueueList(@Param("queue") String queue, + @Param("queueName") String queueName); - Queue queryByQueueName(@Param("queueName") String queueName); } diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ScheduleMapper.java b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ScheduleMapper.java index 4457f98aade5ebebf8a096283580592b9367bcfd..b3c46bc2b1d6352c026fc06fa8d16de7a0b936d3 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ScheduleMapper.java +++ b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ScheduleMapper.java @@ -32,7 +32,7 @@ public interface ScheduleMapper extends BaseMapper { List querySchedulerListByProjectName(@Param("projectName") String projectName); - List selectAllByProcessDefineArray(@Param("processDefineIds") String processDefineIds); + List selectAllByProcessDefineArray(@Param("processDefineIds") int[] processDefineIds); List queryByProcessDefinitionId(@Param("processDefinitionId") int processDefinitionId); diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TenantMapper.java b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TenantMapper.java index cc5997fdf3d6e104da1c827de4cd735232317bbf..b590edb4d97c2aa69204571418ccd75f111278f1 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TenantMapper.java +++ b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TenantMapper.java @@ -21,11 +21,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface TenantMapper extends BaseMapper { Tenant queryById(@Param("tenantId") int tenantId); - Tenant queryByTenantCode(@Param("tenantCode") String tenantCode); + List queryByTenantCode(@Param("tenantCode") String tenantCode); IPage queryTenantPaging(IPage page, @Param("searchVal") String searchVal); diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/DataSourceMapper.xml b/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/DataSourceMapper.xml index 5987339bdfbd3c20f1c650d98f1ff1f798eae24b..177b054ad08ae94bfb0b0bce2f78d10a569d084f 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/DataSourceMapper.xml +++ b/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/DataSourceMapper.xml @@ -25,12 +25,12 @@ and id in (select datasource_id - from t_escheduler_relation_datasource_user - where user_id=#{userId} - union select id as datasource_id - from t_escheduler_datasource - where user_id=#{userId} - ) + from t_escheduler_relation_datasource_user + where user_id=#{userId} + union select id as datasource_id + from t_escheduler_datasource + where user_id=#{userId} + ) and name like concat ('%', #{name}, '%') diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapMapper.xml b/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapMapper.xml index 4ec6eb5121fc546034fa937c3b7e70e6d018bf58..ff85f35ed7247ddd682abeba1c52f0b5fe7d492d 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapMapper.xml +++ b/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapMapper.xml @@ -18,4 +18,9 @@ from t_escheduler_relation_process_instance where process_instance_id = #{subProcessId} + \ No newline at end of file diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml b/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml index 548faa30d1f556f820f49040a133993d952aec96..c92cc030a94bee55ceaf56885923a17cfee43e33 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml +++ b/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml @@ -2,8 +2,8 @@ - select process.*, UNIX_TIMESTAMP(process.end_time)-UNIX_TIMESTAMP(process.start_time) as duration - from t_escheduler_process_instance process - join t_escheduler_task_instance task on task.process_instance_id = process.id - where task.id = #{taskId} - - - - select p_u.*, u.user_name as user_name, p.name as proect_name - from t_escheduler_relation_project_user p_u - join t_escheduler_user u on u.id = p_u.user_id - join t_escheduler_project p on p.id = p_u.project_id - where p_u.project_id = #{projectId} - and p_u.user_id = #{userId} + select * + from t_escheduler_relation_project_user + where project_id = #{projectId} + and user_id = #{userId} + limit 1 \ No newline at end of file diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml b/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml index 4ed9d5be21248d29036d1555cb9423e453e5d4ff..6b4a391a246095bf19c078b9aee7164c08448c04 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml +++ b/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml @@ -4,19 +4,22 @@ - - select * from t_escheduler_queue - where queue_name =#{queueName} + where 1=1 + + and queue = #{queue} + + + and queue_name =#{queueName} + \ No newline at end of file diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ResourceUserMapper.xml b/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ResourceUserMapper.xml index 5845fe30f0b77d2c2a5423536fa7915f4367eb43..d6c3323993bef6943871bdc8a9de4f8fb39be498 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ResourceUserMapper.xml +++ b/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ResourceUserMapper.xml @@ -9,7 +9,7 @@ and user_id = #{userId} - and resource_id = #{resourceId} + and resources_id = #{resourceId} \ No newline at end of file diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml b/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml index 64c7363d4a5cc6a2b7791b8a3c1987ec20498c57..76b321aac62cacb2b732f435a9f2e123b084aa0e 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml +++ b/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml @@ -14,7 +14,7 @@ order by s.update_time desc select * from t_escheduler_schedules - where process_definition_id in (#{processDefineIds}) + where 1= 1 + + and process_definition_id in + + #{i} + + and release_state = 1 select * from t_escheduler_tenant - where `tenant_code` = #{tenantCode} + where tenant_code = #{tenantCode}