From 1fd5eac12e532a9906e0c1d57676c692c68d1f32 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 20 五月 2025 17:46:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
index 73dcd51..0607f3b 100644
--- a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
@@ -1,24 +1,21 @@
package com.ruoyi.purchase.controller;
-import javax.servlet.http.HttpServletResponse;
-
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.purchase.dto.TicketRegistrationDto;
-import com.ruoyi.purchase.pojo.TicketRegistration;
-import com.ruoyi.purchase.service.ITicketRegistrationService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.purchase.dto.TicketRegistrationDto;
+import com.ruoyi.purchase.pojo.TicketRegistration;
+import com.ruoyi.purchase.service.ITicketRegistrationService;
+import com.ruoyi.sales.service.ICommonFileService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.util.List;
/**
@@ -33,6 +30,8 @@
public class TicketRegistrationController extends BaseController {
private ITicketRegistrationService ticketRegistrationService;
+
+ private ICommonFileService commonFileService;
/**
* 鏌ヨ鏉ョエ鐧昏鍒楄〃
@@ -70,8 +69,7 @@
*/
@Log(title = "鏉ョエ鐧昏", businessType = BusinessType.INSERT)
@PostMapping ("/addOrUpdateRegistration")
- public AjaxResult addOrUpdateRegistration(@RequestBody TicketRegistrationDto ticketRegistrationDto)
- {
+ public AjaxResult addOrUpdateRegistration(@RequestBody TicketRegistrationDto ticketRegistrationDto) throws IOException {
return toAjax(ticketRegistrationService.addOrUpdateRegistration(ticketRegistrationDto));
}
@@ -85,4 +83,13 @@
return toAjax(ticketRegistrationService.delRegistration(ids));
}
+ @PostMapping("/upload")
+ public AjaxResult uploadFile(MultipartFile file, Long id, String type) {
+ try {
+ return AjaxResult.success(commonFileService.uploadFile(file, id, type));
+ } catch (Exception e) {
+ return AjaxResult.error(e.getMessage());
+ }
+ }
+
}
--
Gitblit v1.9.3