From a84c0acca7e350614ebd3a4855d754c6d6600946 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 08 三月 2022 14:47:04 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 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 c76ab35..6899ba9 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,11 +1,15 @@
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.service.IpVolumeMissionService;
+import com.sandu.ximon.dao.domain.IpVolumeMission;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -22,7 +26,6 @@
/**
- *
* @param missionParam
* @return
*/
@@ -37,30 +40,29 @@
}*/
/**
- *
* @param taskId
* @param missionParam
- * @return 0锛氭垚鍔� 1锛氭湇鍔″櫒鏃犺浠诲姟 2锛氫换鍔℃鍦ㄦ墽琛岋紝鏃犳硶淇敼 3锛氭湇鍔″櫒淇敼澶辫触
- * 4锛氫换鍔″悕绉颁笉鍙负绌� 5锛氭枃浠跺垪琛ㄤ笉鍙负绌� 6锛氱粓绔垪琛ㄤ笉鍙负绌�
+ * @return 0锛氭垚鍔� 1锛氭湇鍔″櫒鏃犺浠诲姟 2锛氫换鍔℃鍦ㄦ墽琛岋紝鏃犳硶淇敼 3锛氭湇鍔″櫒淇敼澶辫触
+ * 4锛氫换鍔″悕绉颁笉鍙负绌� 5锛氭枃浠跺垪琛ㄤ笉鍙负绌� 6锛氱粓绔垪琛ㄤ笉鍙负绌�
*/
@PostMapping("/update/{taskId}")
public ResponseVO<Object> updateMission(@PathVariable Integer taskId, @RequestBody IpVolumeMissionParam missionParam) {
Integer result = ipVolumeMissionService.updateMission(taskId, missionParam);
- if(result == 0){
+ if (result == 0) {
return ResponseUtil.success("淇敼鎴愬姛");
- }else if(result == 1){
+ } else if (result == 1) {
return ResponseUtil.fail("鏈嶅姟鍣ㄦ棤璇ヤ换鍔�");
- }else if(result == 2){
+ } else if (result == 2) {
return ResponseUtil.fail("浠诲姟姝ｅ湪鎵ц锛屾棤娉曚慨鏀�");
- }else if(result == 3){
+ } else if (result == 3) {
return ResponseUtil.fail("鏈嶅姟鍣ㄤ慨鏀瑰け璐�");
- }else if(result == 4){
+ } else if (result == 4) {
return ResponseUtil.fail("浠诲姟鍚嶇О涓嶅彲涓虹┖");
- }else if(result == 5){
+ } else if (result == 5) {
return ResponseUtil.fail("鏂囦欢鍒楄〃涓嶅彲涓虹┖");
- }else if(result == 6){
+ } else if (result == 6) {
return ResponseUtil.fail("缁堢鍒楄〃涓嶅彲涓虹┖");
- }else {
+ } else {
return ResponseUtil.fail("鏈煡閿欒");
}
@@ -70,15 +72,15 @@
public ResponseVO<Object> deleteMission(@PathVariable Integer taskId) {
// 0锛氭垚鍔� 1锛氫换鍔′笉澶勪簬绌洪棽鐘舵�� 2:鏈嶅姟鍣ㄥ垹闄ゅけ璐�
Integer result = ipVolumeMissionService.deleteMission(taskId);
- if(result == 0) {
+ if (result == 0) {
return ResponseUtil.success("鍒犻櫎鎴愬姛");
- }else if(result == 1){
+ } else if (result == 1) {
return ResponseUtil.fail("浠诲姟姝ｅ湪鎵ц涓�");
- }else if(result == 2){
+ } else if (result == 2) {
return ResponseUtil.fail("鏈嶅姟鍣ㄥ垹闄ゅけ璐�");
- }else if(result==-1){
+ } else if (result == -1) {
return ResponseUtil.success("鏈嶅姟鍣ㄥ垹闄ゆ垚鍔�,鏁版嵁搴撴湭鎵惧埌璇ヤ换鍔�");
- } else{
+ } else {
return ResponseUtil.fail("鏈煡閿欒");
}
}
@@ -88,17 +90,23 @@
@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));
+// 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));
+ }
+ return ResponseUtil.successPage(ipVolumeMissionService.missionList(baseConditionVO, keyword));
}
+
//鑾峰彇浠诲姟璇︽儏
@GetMapping("/getByTaskId/{taskId}")
- public ResponseVO<Object> getByTaskId(@PathVariable Integer taskId){
+ public ResponseVO<Object> getByTaskId(@PathVariable Integer taskId) {
return ResponseUtil.success(ipVolumeMissionService.getByTaskId(taskId));
}
@GetMapping("/playTask/{taskId}")
- public ResponseVO<Object> playTask(@PathVariable Integer taskId){
+ public ResponseVO<Object> playTask(@PathVariable Integer taskId) {
return ResponseUtil.success(ipVolumeMissionService.playTask(taskId));
}
--
Gitblit v1.9.3