From 93d6fdb255ebd9d33adebc4e96ecc5f74b6281ea Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 08 三月 2022 14:11:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
index 67737c2..2e1f489 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
@@ -1,18 +1,24 @@
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.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.IpVolumeFileParam;
import com.sandu.ximon.admin.param.ReceiveParam;
+import com.sandu.ximon.admin.service.BroadcastV2TaskFileService;
import com.sandu.ximon.admin.service.IpVolumeFileService;
+import com.sandu.ximon.dao.domain.BroadcastV2TaskFile;
import com.sandu.ximon.dao.domain.IpVolumeFile;
import com.sandu.ximon.dao.domain.LedSFile;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* @Author liuhaonan
@@ -25,6 +31,7 @@
public class IpVolumeFileController {
private final IpVolumeFileService ipVolumeFileService;
+ private final BroadcastV2TaskFileService v2TaskFileService;
@PostMapping("/add")
public ResponseVO<Object> addFile(@RequestBody @Validated IpVolumeFileParam fileParam){
@@ -33,16 +40,20 @@
@PostMapping("/delete/{fileId}")
public ResponseVO<Object> deleteFile(@PathVariable Long fileId){
+ List<BroadcastV2TaskFile> list = v2TaskFileService.list(Wrappers.lambdaQuery(BroadcastV2TaskFile.class).eq(BroadcastV2TaskFile::getFileId, fileId));
+ if(list!=null){
+ throw new BusinessException("姝ゆ枃浠舵鍦ㄨ鍏朵粬浠诲姟鍗犵敤");
+ }
return ResponseUtil.success(ipVolumeFileService.deleteFile(fileId));
}
@GetMapping("/list")
public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword){
+ LambdaQueryWrapper<IpVolumeFile> wrapper = ipVolumeFileService.listFile(baseConditionVO, keyword);
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- LambdaQueryWrapper<IpVolumeFile> wrapper = ipVolumeFileService.listFile(keyword);
- if (null != keyword) {
+ /* if (null != keyword) {
wrapper.like(IpVolumeFile::getFileName, keyword);
- }
- return ResponseUtil.successPage(ipVolumeFileService.list(wrapper));
+ }*/
+ return ResponseUtil.success(ipVolumeFileService.list(wrapper));
}
}
--
Gitblit v1.9.3