From da26a61eee160d63ad99b69bcef0b24565c1a8f7 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 10 七月 2025 15:44:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java
index 143beb8..e2fe97c 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.system.controller;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,6 +11,7 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.CommonUtils;
import org.jeecg.common.util.MinioUtil;
+import org.jeecg.common.util.StrUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.oss.entity.OssFile;
import org.jeecg.modules.oss.service.IOssFileService;
@@ -23,6 +25,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -88,6 +91,16 @@
return Result.ok(pageList);
}
+ @GetMapping(value = "/listByType")
+ public Result<?> listByType(SysUpload upload, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ QueryWrapper<SysUpload> queryWrapper = QueryGenerator.initQueryWrapper(upload, req.getParameterMap());
+ queryWrapper.in("type","inspection","threeMaintenance","twoMaintenance","equipment");
+ Page<SysUpload> page = new Page<SysUpload>(pageNo, pageSize);
+ IPage<SysUpload> pageList = uploadService.page(page, queryWrapper);
+ return Result.ok(pageList);
+ }
+
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
uploadService.removeById(id);
@@ -126,4 +139,13 @@
uploadService.downloadFile(response, uploadService.getById(id));
}
+ @PostMapping(value = "/uploadFile")
+ public Result<?> uploadFile(MultipartHttpServletRequest request, HttpServletResponse response) throws Exception {
+ String type = request.getParameter("type");
+ String description = request.getParameter("description");
+ List<MultipartFile> multipartFileList = request.getFiles("files[]");
+ List<SysUpload> sysUploads = uploadService.batchUploadFile(type, multipartFileList, description);
+ return Result.ok("涓婁紶鎴愬姛!");
+ }
+
}
--
Gitblit v1.9.3