From 6892c31200a7ed1b0e60ee5aff794b1fcecc7ef6 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 01 十一月 2023 16:28:06 +0800
Subject: [PATCH] 解决文件上传时，文件名重复问题

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java |   54 ++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java
index 02d1df8..bac82e9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java
@@ -6,6 +6,7 @@
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.bean.DtoConversionUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.project.domain.ServiceOrganallocation;
 import com.ruoyi.project.service.IServiceOrganallocationService;
@@ -20,15 +21,14 @@
 
 /**
  * 鍣ㄥ畼鍒嗛厤Controller
- * 
+ *
  * @author ruoyi
  * @date 2021-11-10
  */
 @Api("鍣ㄥ畼鍒嗛厤绠＄悊")
 @RestController
 @RequestMapping("/project/organallocation")
-public class ServiceOrganallocationController extends BaseController
-{
+public class ServiceOrganallocationController extends BaseController {
     @Autowired
     private IServiceOrganallocationService serviceOrganallocationService;
 
@@ -38,8 +38,7 @@
     @ApiOperation("鍣ㄥ畼鍒嗛厤淇℃伅鍒楄〃")
     //@PreAuthorize("@ss.hasPermi('project:organallocation:list')")
     @GetMapping("/list")
-    public TableDataInfo list(ServiceOrganallocation serviceOrganallocation)
-    {
+    public TableDataInfo list(ServiceOrganallocation serviceOrganallocation) {
         startPage();
         //List<ServiceOrganallocation> list = serviceOrganallocationService.queryList(serviceOrganallocation);
         List<ServiceOrganallocation> list = serviceOrganallocationService.selectServiceOrganallocationList(serviceOrganallocation);
@@ -53,8 +52,7 @@
     //@PreAuthorize("@ss.hasPermi('project:organallocation:export')")
     @Log(title = "鍣ㄥ畼鍒嗛厤", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(ServiceOrganallocation serviceOrganallocation)
-    {
+    public AjaxResult export(ServiceOrganallocation serviceOrganallocation) {
         List<ServiceOrganallocation> list = serviceOrganallocationService.queryList(serviceOrganallocation);
         ExcelUtil<ServiceOrganallocation> util = new ExcelUtil<ServiceOrganallocation>(ServiceOrganallocation.class);
         return util.exportExcel(list, "鍣ㄥ畼鍒嗛厤鏁版嵁");
@@ -66,8 +64,7 @@
     @ApiOperation("閫氳繃id鑾峰彇鍣ㄥ畼鍒嗛厤淇℃伅")
     //@PreAuthorize("@ss.hasPermi('project:organallocation:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(serviceOrganallocationService.getById(id));
     }
 
@@ -79,9 +76,20 @@
     @Log(title = "鍣ㄥ畼鍒嗛厤", businessType = BusinessType.INSERT)
     @PostMapping
     @RepeatSubmit
-    public AjaxResult add(@RequestBody ServiceOrganallocation serviceOrganallocation)
-    {
+    public AjaxResult add(@RequestBody ServiceOrganallocation serviceOrganallocation) {
         return toAjax(serviceOrganallocationService.save(serviceOrganallocation));
+    }
+
+    /**
+     * 鏂板鍣ㄥ畼鍒嗛厤
+     */
+    @ApiOperation("鏂板鍣ㄥ畼鍒嗛厤闆嗗悎淇℃伅")
+    @Log(title = "鍣ㄥ畼鍒嗛厤闆嗗悎", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @RepeatSubmit
+    public AjaxResult addArrayData(@RequestBody List<ServiceOrganallocation> serviceOrganallocations) {
+        return AjaxResult.success(serviceOrganallocationService.saveDate(serviceOrganallocations));
+
     }
 
     /**
@@ -90,11 +98,22 @@
     @ApiOperation("淇敼鍣ㄥ畼鍒嗛厤淇℃伅")
     //@PreAuthorize("@ss.hasPermi('project:organallocation:edit')")
     @Log(title = "鍣ㄥ畼鍒嗛厤", businessType = BusinessType.UPDATE)
-    @PutMapping
-    @RepeatSubmit    
-    public AjaxResult edit(@RequestBody ServiceOrganallocation serviceOrganallocation)
-    {
+    @PostMapping("/edit")
+    @RepeatSubmit
+    public AjaxResult edit(@RequestBody ServiceOrganallocation serviceOrganallocation) {
         return toAjax(serviceOrganallocationService.updateById(serviceOrganallocation));
+    }
+
+    /**
+     * 淇敼鍣ㄥ畼鍒嗛厤
+     */
+    @ApiOperation("淇敼鍣ㄥ畼鍒嗛厤淇℃伅")
+    //@PreAuthorize("@ss.hasPermi('project:organallocation:edit')")
+    @Log(title = "鍣ㄥ畼鍒嗛厤", businessType = BusinessType.UPDATE)
+    @PostMapping("/editarraydata")
+    @RepeatSubmit
+    public AjaxResult editArrayData(@RequestBody List<ServiceOrganallocation> serviceOrganallocations) {
+        return AjaxResult.success(serviceOrganallocationService.editArrayData(serviceOrganallocations));
     }
 
     /**
@@ -103,9 +122,8 @@
     @ApiOperation("鍒犻櫎鍣ㄥ畼鍒嗛厤淇℃伅")
     //@PreAuthorize("@ss.hasPermi('project:organallocation:remove')")
     @Log(title = "鍣ㄥ畼鍒嗛厤", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(serviceOrganallocationService.removeByIds(Arrays.asList(ids)));
     }
 }

--
Gitblit v1.9.3