From 2bbf08be2b03a6260720fe0c1612afbd9e1cd45c Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 22 九月 2022 17:11:33 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 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 80d72fa..5864c4d 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,16 +1,15 @@
package com.sandu.ximon.admin.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.github.pagehelper.PageHelper;
+import com.alibaba.fastjson.JSON;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.file.FileUploadDto;
import com.sandu.common.file.impl.AliOssFileServiceImpl;
import com.sandu.common.object.BaseConditionVO;
-import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
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;
@@ -19,6 +18,8 @@
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
/**
* @Author liuhaonan
@@ -58,17 +59,13 @@
if (!permissionConfig.check(MenuEnum.LED_FILE_S_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- LambdaQueryWrapper<LedSFile> wrapper = ledProgramFileService.listFile();
- if (keyword != null && !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}")
- public ResponseVO<Object> uploadingFile(@RequestParam("file") MultipartFile file, @PathVariable Integer dateType) {
+ public ResponseVO<Object> uploadingFile(@RequestParam("file") MultipartFile file, @RequestParam(value = "dateType", required = false) Integer dateType) {
FileUploadDto fileUploadDto = aliOssFileService.uploadFile(file);
if ("mp4".equals(fileUploadDto.getFileType())) {
fileUploadDto.setScreenShot(fileUploadDto.getFileUrl() + "?x-oss-process=video/snapshot,t_10000,m_fast");
@@ -80,6 +77,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