From 6e9e02396e4c660a209e326fa015be6b71a568e1 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期一, 12 五月 2025 19:07:09 +0800
Subject: [PATCH] 增加更新排产区域数据接口

---
 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java
index e570cac..7f3de63 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java
@@ -6,9 +6,9 @@
 import com.aps.common.core.web.page.TableDataInfo;
 import com.aps.common.log.annotation.Log;
 import com.aps.common.log.enums.BusinessType;
+import com.aps.common.security.annotation.RequiresPermissions;
 import com.aps.core.domain.ApsResourceGroup;
 import com.aps.core.domain.ApsResourceGroupTemp;
-import com.aps.core.param.ApsResourceGroupParam;
 import com.aps.core.service.IApsResourceGroupService;
 import com.aps.core.service.IApsResourceGroupTempService;
 import jakarta.annotation.Resource;
@@ -16,6 +16,8 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 /**
@@ -25,7 +27,7 @@
  * &#064;date  2025-04-10
  */
 @RestController
-@RequestMapping("/ApsResourceGroup")
+@RequestMapping("/apsResourceGroup")
 public class ApsResourceGroupController extends BaseController
 {
     @Resource
@@ -36,9 +38,9 @@
     /**
      * 鏌ヨ璧勬簮缁勫垪琛�
      */
-    /*@RequiresPermissions("ApsResourceGroup:list")*/
+    @RequiresPermissions("ApsResourceGroup:list")
     @GetMapping("/list")
-    public TableDataInfo list(ApsResourceGroupParam apsResourceGroup)
+    public TableDataInfo list(ApsResourceGroup apsResourceGroup)
     {
         //startPage();
         List<ApsResourceGroup> list = apsResourceGroupService.selectApsResourceGroupList(apsResourceGroup);
@@ -48,10 +50,10 @@
     /**
      * 瀵煎嚭璧勬簮缁勫垪琛�
      */
-    /*@RequiresPermissions("ApsResourceGroup:ApsResourceGroup:export")*/
+    @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:export")
     @Log(title = "璧勬簮缁�", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, ApsResourceGroupParam apsResourceGroup)
+    public void export(HttpServletResponse response, ApsResourceGroup apsResourceGroup)
     {
         List<ApsResourceGroup> list = apsResourceGroupService.selectApsResourceGroupList(apsResourceGroup);
         ExcelUtil<ApsResourceGroup> util = new ExcelUtil<>(ApsResourceGroup.class);
@@ -61,7 +63,7 @@
     /**
      * 鑾峰彇璧勬簮缁勮缁嗕俊鎭�
      */
-   /* @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:query")*/
+    @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
     {
@@ -71,7 +73,7 @@
     /**
      * 鏂板璧勬簮缁�
      */
-   /* @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:add")*/
+    @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:add")
     @Log(title = "璧勬簮缁�", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ApsResourceGroup apsResourceGroup)
@@ -82,7 +84,7 @@
     /**
      * 淇敼璧勬簮缁�
      */
-    /*@RequiresPermissions("ApsResourceGroup:ApsResourceGroup:edit")*/
+    @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:edit")
     @Log(title = "璧勬簮缁�", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ApsResourceGroup apsResourceGroup)
@@ -93,7 +95,7 @@
     /**
      * 鍒犻櫎璧勬簮缁�
      */
-    /*@RequiresPermissions("ApsResourceGroup:ApsResourceGroup:remove")*/
+    @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:remove")
     @Log(title = "璧勬簮缁�", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)
@@ -111,6 +113,7 @@
     /**
      * 瀵煎叆璧勬簮缁�
      */
+    @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:importData")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file) throws Exception {
         ExcelUtil<ApsResourceGroupTemp> util = new ExcelUtil<>(ApsResourceGroupTemp.class);
@@ -126,10 +129,12 @@
     /**
      * 纭鏁版嵁
      */
+    @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:confirmData")
     @PostMapping("/confirmData")
     public AjaxResult confirmData(@RequestBody ApsResourceGroupTemp temp) {
-
-        apsResourceGroupService.confirmData(temp.getBatchNumber(),temp.getRequestDate());
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime localDateTime = LocalDateTime.parse(temp.getParams().get("requestDate").toString(), formatter);
+        apsResourceGroupService.confirmData(temp.getBatchNumber(),localDateTime);
         return AjaxResult.success("纭鎴愬姛锛�");
     }
 }

--
Gitblit v1.9.3