From 0fef782539e375d8a3e6dbe376663d09c32ce77e Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 17 六月 2022 10:01:48 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
index a3cbbae..dda2b8f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.controller;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
@@ -10,6 +11,7 @@
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.FileOperationRecordService;
import com.sandu.ximon.admin.service.LedSFileService;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.domain.FileOperationRecord;
import com.sandu.ximon.dao.domain.LedSFile;
import com.sandu.ximon.dao.enums.MenuEnum;
@@ -18,6 +20,8 @@
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
/**
* @Author liuhaonan
@@ -37,28 +41,29 @@
@PostMapping("/add")
public ResponseVO<Object> addLEDProgram(@RequestParam("file") MultipartFile file) {
-
+ if (!permissionConfig.check(MenuEnum.LED_FILE_S_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ledProgramFileService.addProgramFile(file));
// return ResponseUtil.success(aliOssFileService.uploadFile(file));
}
@PostMapping("/delete/{fileId}")
public ResponseVO<Object> deleteLEDProgram(@PathVariable Long fileId) {
+ if (!permissionConfig.check(MenuEnum.LED_FILE_S_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ledProgramFileService.deleteFile(fileId));
}
@GetMapping("/list")
public ResponseVO<Object> listfile(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
- if (!permissionConfig.check(MenuEnum.LED_FILE_LIST.getCode())) {
+ if (!permissionConfig.check(MenuEnum.LED_FILE_S_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- LambdaQueryWrapper<LedSFile> wrapper = ledProgramFileService.listFile();
- if (!keyword.isEmpty()) {
- wrapper.like(LedSFile::getOriginName, keyword);
- }
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- return ResponseUtil.success(ledProgramFileService.list(wrapper));
+ List<LedSFile> listfile = ledProgramFileService.listfile(baseConditionVO, keyword);
+ return ResponseUtil.success(listfile);
}
@PostMapping("/uploading/{dateType}")
@@ -74,6 +79,15 @@
BeanUtils.copyProperties(fileUploadDto, fileOperationRecord);
fileOperationRecord.setDataType(dateType);
fileOperationRecordService.save(fileOperationRecord);
+
+ /**
+ * 鏂囦欢涓婁紶 鏃ュ織璁板綍寮�濮�
+ */
+ String content = "鏂囦欢鍐呭:" + JSON.toJSONString(fileUploadDto);
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鏂囦欢涓婁紶", content);
+ /**
+ * 鏂囦欢涓婁紶 鏃ュ織璁板綍缁撴潫
+ */
return ResponseUtil.success(fileUploadDto);
}
--
Gitblit v1.9.3