123

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/SysPushController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.SysPush;
 import com.ruoyi.cai.dto.admin.query.syspush.SysPushParams;
+import com.ruoyi.cai.dto.app.query.IdRes;
 import com.ruoyi.cai.service.SysPushService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -12,8 +13,6 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -60,6 +59,24 @@ public class SysPushController extends BaseController {
         return R.ok(sysPushService.getById(id));
     }
 
+    @SaCheckPermission("cai:sysPush:run")
+    @Log(title = "推送系统消息执行", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/run")
+    public R<Void> run(@RequestBody IdRes idRes) {
+        sysPushService.handStart(idRes.getId());
+        return R.ok();
+    }
+
+    @SaCheckPermission("cai:sysPush:close")
+    @Log(title = "取消定时系统消息执行", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/close")
+    public R<Void> close(@RequestBody IdRes idRes) {
+        sysPushService.closeSysPush(idRes.getId());
+        return R.ok();
+    }
+
     /**
      * 新增推送系统消息
      */
@@ -67,22 +84,11 @@ public class SysPushController extends BaseController {
     @Log(title = "推送系统消息", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysPushParams params) {
+    public R<Void> add(@RequestBody SysPushParams params) {
         sysPushService.saveSysPush(params);
         return R.ok();
     }
 
-    /**
-     * 修改推送系统消息
-     */
-    @SaCheckPermission("cai:sysPush:edit")
-    @Log(title = "推送系统消息", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysPush bo) {
-        return toAjax(sysPushService.updateById(bo));
-    }
-
     /**
      * 删除推送系统消息
      *