gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

fix(sj_1.1.0): 1、优化客户端发送消息是组为空的校验 2、 工作流支持groupName查询

Browse Source
This commit is contained in:
opensnail 2024-06-22 17:15:27 +08:00
parent 6bdbd2c41e
commit aaae353a0b
6 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/config/SnailJobProperties.java
View File

@ -49,7 +49,7 @@ public class SnailJobProperties {
/** /**
* 指定客户端端口 * 指定客户端端口
*/ */
private int port = 1789; private Integer port = 1789;
/** /**
* 重试、调度日志远程上报滑动窗口配置 * 重试、调度日志远程上报滑动窗口配置

5
snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/rpc/client/NettyChannel.java
View File

@ -1,5 +1,6 @@
package com.aizuda.snailjob.client.common.rpc.client; package com.aizuda.snailjob.client.common.rpc.client;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.aizuda.snailjob.client.common.cache.GroupVersionCache; import com.aizuda.snailjob.client.common.cache.GroupVersionCache;
@ -55,7 +56,7 @@ public class NettyChannel {
private static final String HOST; private static final String HOST;
static { static {
PORT = Integer.parseInt(System.getProperty(SNAIL_JOB_CLIENT_PORT, String.valueOf(8080))); PORT = Integer.parseInt(System.getProperty(SNAIL_JOB_CLIENT_PORT, String.valueOf(1789)));
HOST = System.getProperty(SNAIL_JOB_CLIENT_HOST, NetUtil.getLocalIpStr()); HOST = System.getProperty(SNAIL_JOB_CLIENT_HOST, NetUtil.getLocalIpStr());
} }
@ -161,6 +162,8 @@ public class NettyChannel {
return; return;
} }
Assert.notBlank(snailJobProperties.getGroup(),
()-> new SnailJobRemoteException("The group is null, please check if your configuration is correct."));
request.headers() request.headers()
.set(HttpHeaderNames.CONTENT_TYPE, HttpHeaderValues.APPLICATION_JSON) .set(HttpHeaderNames.CONTENT_TYPE, HttpHeaderValues.APPLICATION_JSON)

5
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/WorkflowController.java
View File

@ -84,8 +84,9 @@ public class WorkflowController {
@LoginRequired(role = RoleEnum.USER) @LoginRequired(role = RoleEnum.USER)
public List<WorkflowResponseVO> getWorkflowNameList( public List<WorkflowResponseVO> getWorkflowNameList(
@RequestParam(value = "keywords", required = false) String keywords, @RequestParam(value = "keywords", required = false) String keywords,
@RequestParam(value = "workflowId", required = false) Long workflowId) { @RequestParam(value = "workflowId", required = false) Long workflowId,
return workflowService.getWorkflowNameList(keywords, workflowId); @RequestParam(value = "groupName", required = false) String groupName) {
return workflowService.getWorkflowNameList(keywords, workflowId, groupName);
} }
@PostMapping("/check-node-expression") @PostMapping("/check-node-expression")

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/WorkflowService.java
View File

@ -35,7 +35,7 @@ public interface WorkflowService {
Boolean trigger(Long id); Boolean trigger(Long id);
List<WorkflowResponseVO> getWorkflowNameList(String keywords, Long workflowId); List<WorkflowResponseVO> getWorkflowNameList(String keywords, Long workflowId, String groupName);
Pair<Integer, String> checkNodeExpression(DecisionConfig decisionConfig); Pair<Integer, String> checkNodeExpression(DecisionConfig decisionConfig);

4
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobServiceImpl.java
View File

@ -113,7 +113,7 @@ public class JobServiceImpl implements JobService {
UserSessionVO userSessionVO = UserSessionUtils.currentUserSession(); UserSessionVO userSessionVO = UserSessionUtils.currentUserSession();
PageDTO<Job> selectPage = jobMapper.selectPage( PageDTO<Job> selectPage = jobMapper.selectPage(
new PageDTO<>(1, 20), new PageDTO<>(1, 100),
new LambdaQueryWrapper<Job>() new LambdaQueryWrapper<Job>()
.select(Job::getId, Job::getJobName) .select(Job::getId, Job::getJobName)
.eq(Job::getNamespaceId, userSessionVO.getNamespaceId()) .eq(Job::getNamespaceId, userSessionVO.getNamespaceId())
@ -122,7 +122,7 @@ public class JobServiceImpl implements JobService {
.eq(Objects.nonNull(jobId), Job::getId, jobId) .eq(Objects.nonNull(jobId), Job::getId, jobId)
.eq(Job::getDeleted, StatusEnum.NO.getStatus()) .eq(Job::getDeleted, StatusEnum.NO.getStatus())
// SQLServer 分页必须 ORDER BY // SQLServer 分页必须 ORDER BY
.orderByAsc(Job::getId)); .orderByDesc(Job::getId));
return JobResponseVOConverter.INSTANCE.convertList(selectPage.getRecords()); return JobResponseVOConverter.INSTANCE.convertList(selectPage.getRecords());
} }

7
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowServiceImpl.java
View File

@ -292,15 +292,16 @@ public class WorkflowServiceImpl implements WorkflowService {
} }
@Override @Override
public List<WorkflowResponseVO> getWorkflowNameList(String keywords, Long workflowId) { public List<WorkflowResponseVO> getWorkflowNameList(String keywords, Long workflowId, String groupName) {
PageDTO<Workflow> selectPage = workflowMapper.selectPage( PageDTO<Workflow> selectPage = workflowMapper.selectPage(
new PageDTO<>(1, 20), new PageDTO<>(1, 100),
new LambdaQueryWrapper<Workflow>() new LambdaQueryWrapper<Workflow>()
.select(Workflow::getId, Workflow::getWorkflowName) .select(Workflow::getId, Workflow::getWorkflowName)
.likeRight(StrUtil.isNotBlank(keywords), Workflow::getWorkflowName, StrUtil.trim(keywords)) .likeRight(StrUtil.isNotBlank(keywords), Workflow::getWorkflowName, StrUtil.trim(keywords))
.eq(Objects.nonNull(workflowId), Workflow::getId, workflowId) .eq(Objects.nonNull(workflowId), Workflow::getId, workflowId)
.eq(StrUtil.isNotBlank(groupName), Workflow::getGroupName, groupName)
.eq(Workflow::getDeleted, StatusEnum.NO.getStatus()) .eq(Workflow::getDeleted, StatusEnum.NO.getStatus())
.orderByAsc(Workflow::getId)); .orderByDesc(Workflow::getId));
return WorkflowConverter.INSTANCE.convertListToWorkflowList(selectPage.getRecords()); return WorkflowConverter.INSTANCE.convertListToWorkflowList(selectPage.getRecords());
} }