优化任务log日志查看，校验添加定时任务-不能保存空的任务

wyt1215819315 · Sep 13, 2022 · 1f1462d · 1f1462d
1 parent 43cab4a
commit 1f1462d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/src/main/java/com/oldwu/controller/QuartzJobController.java b/src/main/java/com/oldwu/controller/QuartzJobController.java
@@ -6,6 +6,7 @@
 import com.oldwu.domain.Tablepar;
 import com.oldwu.entity.AjaxResult;
 import com.oldwu.service.SysQuartzJobService;
+import com.oldwu.util.StringUtils;
 import org.quartz.SchedulerException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -73,6 +74,9 @@ public String add(ModelMap modelMap)
 	@PostMapping("/add")
 	@ResponseBody
 	public AjaxResult add(SysQuartzJob sysQuartzJob){
+		if (StringUtils.isEmpty(sysQuartzJob.getInvokeTarget())) {
+			return error("调用目标字符串不能为空");
+		}
 		int b = sysQuartzJobService.insertSelective(sysQuartzJob);
 		if (b > 0) {
 			return success();

diff --git a/src/main/java/com/oldwu/service/LogService.java b/src/main/java/com/oldwu/service/LogService.java
@@ -1,7 +1,9 @@
 package com.oldwu.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.oldwu.dao.AutoLogDao;
 import com.oldwu.entity.AutoLog;
@@ -15,17 +17,14 @@ public class LogService {
     @Autowired
     private AutoLogDao logDao;
 
-    public AutoLog getLog(Long id, Integer autoId, String type, Integer uid){
-        QueryWrapper<AutoLog> queryWrapper = new QueryWrapper<>();
-
+    public AutoLog getLog(Long id, Integer autoId, String type, Integer uid) {
         if (id == null) {
-            queryWrapper.eq("auto_id", autoId);
-            queryWrapper.eq("type", type);
-            queryWrapper.eq("userid", uid);
-            queryWrapper.orderByDesc("date");
-            Page<AutoLog> page = new Page<>(1, 1);
-            Page<AutoLog> list = logDao.selectPage(page, queryWrapper);
-            return list.getRecords().get(0);
+            LambdaQueryWrapper<AutoLog> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.eq(AutoLog::getAutoId, autoId);
+            queryWrapper.eq(AutoLog::getType, type);
+            queryWrapper.eq(AutoLog::getUserid, uid);
+            queryWrapper.last("limit 1");
+            return logDao.selectOne(queryWrapper);
         } else {
             return logDao.selectById(id);
         }