From e55c8b0a92eb9715edd90c31dfd4de51a47b588b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 04 十一月 2022 17:40:08 +0800
Subject: [PATCH] changes

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java |   57 ++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java
index f28ed0d..f156b2d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java
@@ -1,17 +1,16 @@
 package com.sandu.ximon.admin.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.PageHelper;
 import com.sandu.common.domain.ResponseVO;
 import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.ximon.admin.param.IpVolumeMissionParam;
-import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.service.IpVolumeMissionService;
-import com.sandu.ximon.dao.domain.IpVolumeMission;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * @Author liuhaonan
@@ -23,6 +22,7 @@
 @RequestMapping("/v1/volumeMission")
 public class IpVolumeMissionController {
     private final IpVolumeMissionService ipVolumeMissionService;
+    private PermissionConfig permissionConfig;
 
 
     /**
@@ -31,6 +31,9 @@
      */
     @PostMapping("/add")
     public ResponseVO<Object> addMission(@RequestBody IpVolumeMissionParam missionParam) {
+        if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_ADD.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(ipVolumeMissionService.addMission(missionParam));
     }
 
@@ -47,6 +50,9 @@
      */
     @PostMapping("/update/{taskId}")
     public ResponseVO<Object> updateMission(@PathVariable Integer taskId, @RequestBody IpVolumeMissionParam missionParam) {
+        if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_UPDATE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         Integer result = ipVolumeMissionService.updateMission(taskId, missionParam);
         if (result == 0) {
             return ResponseUtil.success("淇敼鎴愬姛");
@@ -68,10 +74,13 @@
 
     }
 
-    @PostMapping("/delete/{taskId}")
-    public ResponseVO<Object> deleteMission(@PathVariable Integer taskId) {
+    @PostMapping("/delete")
+    public ResponseVO<Object> deleteMission(@RequestBody List<Integer> taskIds) {
+        if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_DELETE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         //  0锛氭垚鍔�   1锛氫换鍔′笉澶勪簬绌洪棽鐘舵�� 2:鏈嶅姟鍣ㄥ垹闄ゅけ璐�
-        Integer result = ipVolumeMissionService.deleteMission(taskId);
+        Integer result = ipVolumeMissionService.deleteMission(taskIds);
         if (result == 0) {
             return ResponseUtil.success("鍒犻櫎鎴愬姛");
         } else if (result == 1) {
@@ -85,43 +94,57 @@
         }
     }
 
-
-    // @AnonymousAccess
     @GetMapping("/list")
-    public ResponseVO<Object> listMission(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
-        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());// todo
-//        return ResponseUtil.successPage(ipVolumeMissionService.missionList(baseConditionVO,keyword));
-        if (SecurityUtils.getClientId() == null) {
-            LambdaQueryWrapper<IpVolumeMission> like = Wrappers.lambdaQuery(IpVolumeMission.class).like(IpVolumeMission::getMissionName, keyword);
-            return ResponseUtil.successPage(ipVolumeMissionService.list(like));
+    public ResponseVO<Object> listMission(BaseConditionVO baseConditionVO,
+                                          @RequestParam(value = "keyword", required = false) String keyword,
+                                          @RequestParam(value = "order", required = false) Integer order,
+                                          @RequestParam(value = "seq", required = false) Integer seq) {
+        if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
         }
-        return ResponseUtil.successPage(ipVolumeMissionService.missionList(baseConditionVO, keyword));
+
+        return ResponseUtil.successPage(ipVolumeMissionService.missionList(baseConditionVO, keyword, order, seq));
     }
 
     //鑾峰彇浠诲姟璇︽儏
     @GetMapping("/getByTaskId/{taskId}")
     public ResponseVO<Object> getByTaskId(@PathVariable Integer taskId) {
+        if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_DETAIL.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(ipVolumeMissionService.getByTaskId(taskId));
     }
 
 
     @GetMapping("/playTask/{taskId}")
     public ResponseVO<Object> playTask(@PathVariable Integer taskId) {
+        if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_PLAY.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(ipVolumeMissionService.playTask(taskId));
     }
 
     @GetMapping("/continueTask/{taskId}")
     public ResponseVO<Object> continueTask(@PathVariable Integer taskId) {
+        if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_CONTINUE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(ipVolumeMissionService.continueTask(taskId));
     }
 
     @GetMapping("/pauseTask/{taskId}")
     public ResponseVO<Object> pauseTask(@PathVariable Integer taskId) {
+        if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_PAUSE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(ipVolumeMissionService.pauseTask(taskId));
     }
 
     @GetMapping("/stopTask/{taskId}")
     public ResponseVO<Object> stopTask(@PathVariable Integer taskId) {
+        if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_STOP.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(ipVolumeMissionService.stopTask(taskId));
     }
 

--
Gitblit v1.9.3