From b6dd47b05107fc36d8ff4f7f29a4446521f95503 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期四, 02 一月 2025 18:44:28 +0800 Subject: [PATCH] 代码提交 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java | 65 +++++++++++++++++++++----------- 1 files changed, 42 insertions(+), 23 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 702d957..2cf1e31 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,11 +1,13 @@ package com.ruoyi.web.controller.project; import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.annotation.NotRepeatCommit; 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; @@ -20,15 +22,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; @@ -36,10 +37,9 @@ * 鏌ヨ鍣ㄥ畼鍒嗛厤鍒楄〃 */ @ApiOperation("鍣ㄥ畼鍒嗛厤淇℃伅鍒楄〃") - //@PreAuthorize("@ss.hasPermi('project:organallocation:list')") + //// @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); @@ -50,11 +50,10 @@ * 瀵煎嚭鍣ㄥ畼鍒嗛厤鍒楄〃 */ @ApiOperation("瀵煎嚭鍣ㄥ畼鍒嗛厤淇℃伅鍒楄〃") - //@PreAuthorize("@ss.hasPermi('project:organallocation:export')") + //// @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, "鍣ㄥ畼鍒嗛厤鏁版嵁"); @@ -64,10 +63,9 @@ * 鑾峰彇鍣ㄥ畼鍒嗛厤璇︾粏淇℃伅 */ @ApiOperation("閫氳繃id鑾峰彇鍣ㄥ畼鍒嗛厤淇℃伅") - //@PreAuthorize("@ss.hasPermi('project:organallocation:query')") + //// @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)); } @@ -75,37 +73,58 @@ * 鏂板鍣ㄥ畼鍒嗛厤 */ @ApiOperation("鏂板鍣ㄥ畼鍒嗛厤淇℃伅") - //@PreAuthorize("@ss.hasPermi('project:organallocation:add')") + //// @PreAuthorize("@ss.hasPermi('project:organallocation:add')") @Log(title = "鍣ㄥ畼鍒嗛厤", businessType = BusinessType.INSERT) @PostMapping - @RepeatSubmit - public AjaxResult add(@RequestBody ServiceOrganallocation serviceOrganallocation) - { + @NotRepeatCommit(key = "param:arg[1]", value = 30000) + 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)); + } /** * 淇敼鍣ㄥ畼鍒嗛厤 */ @ApiOperation("淇敼鍣ㄥ畼鍒嗛厤淇℃伅") - //@PreAuthorize("@ss.hasPermi('project:organallocation:edit')") + //// @PreAuthorize("@ss.hasPermi('project:organallocation:edit')") @Log(title = "鍣ㄥ畼鍒嗛厤", businessType = BusinessType.UPDATE) @PostMapping("/edit") - @RepeatSubmit - public AjaxResult edit(@RequestBody ServiceOrganallocation serviceOrganallocation) - { + @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)); } /** * 鍒犻櫎鍣ㄥ畼鍒嗛厤 */ @ApiOperation("鍒犻櫎鍣ㄥ畼鍒嗛厤淇℃伅") - //@PreAuthorize("@ss.hasPermi('project:organallocation:remove')") + //// @PreAuthorize("@ss.hasPermi('project:organallocation:remove')") @Log(title = "鍣ㄥ畼鍒嗛厤", businessType = BusinessType.DELETE) @GetMapping("/remove/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(serviceOrganallocationService.removeByIds(Arrays.asList(ids))); } } -- Gitblit v1.9.3