From 6f344e6360751574f7e03b21c00cfa3f4b2bc099 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 10 十一月 2023 15:41:41 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java | 81 +++++++++++++++++++++++-----------------
1 files changed, 46 insertions(+), 35 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 0275790..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
@@ -1,41 +1,34 @@
package com.ruoyi.web.controller.project;
-import java.util.Arrays;
-import java.util.List;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
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;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
/**
* 鍣ㄥ畼鍒嗛厤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;
@@ -45,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);
@@ -60,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, "鍣ㄥ畼鍒嗛厤鏁版嵁");
@@ -73,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));
}
@@ -86,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));
+
}
/**
@@ -97,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));
}
/**
@@ -110,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