From b079a1727af6eeb2ebcfc44190a9b72a454d4f12 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期五, 25 四月 2025 22:56:52 +0800
Subject: [PATCH] 【ADD】增加气体管路产能统计相关代码
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 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 3ac41ea..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,6 +6,7 @@
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.service.IApsResourceGroupService;
@@ -37,7 +38,7 @@
/**
* 鏌ヨ璧勬簮缁勫垪琛�
*/
- /*@RequiresPermissions("ApsResourceGroup:list")*/
+ @RequiresPermissions("ApsResourceGroup:list")
@GetMapping("/list")
public TableDataInfo list(ApsResourceGroup apsResourceGroup)
{
@@ -49,7 +50,7 @@
/**
* 瀵煎嚭璧勬簮缁勫垪琛�
*/
- /*@RequiresPermissions("ApsResourceGroup:ApsResourceGroup:export")*/
+ @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:export")
@Log(title = "璧勬簮缁�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ApsResourceGroup apsResourceGroup)
@@ -62,7 +63,7 @@
/**
* 鑾峰彇璧勬簮缁勮缁嗕俊鎭�
*/
- /* @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:query")*/
+ @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
{
@@ -72,7 +73,7 @@
/**
* 鏂板璧勬簮缁�
*/
- /* @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:add")*/
+ @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:add")
@Log(title = "璧勬簮缁�", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ApsResourceGroup apsResourceGroup)
@@ -83,7 +84,7 @@
/**
* 淇敼璧勬簮缁�
*/
- /*@RequiresPermissions("ApsResourceGroup:ApsResourceGroup:edit")*/
+ @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:edit")
@Log(title = "璧勬簮缁�", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ApsResourceGroup apsResourceGroup)
@@ -94,7 +95,7 @@
/**
* 鍒犻櫎璧勬簮缁�
*/
- /*@RequiresPermissions("ApsResourceGroup:ApsResourceGroup:remove")*/
+ @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:remove")
@Log(title = "璧勬簮缁�", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
@@ -112,6 +113,7 @@
/**
* 瀵煎叆璧勬簮缁�
*/
+ @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:importData")
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file) throws Exception {
ExcelUtil<ApsResourceGroupTemp> util = new ExcelUtil<>(ApsResourceGroupTemp.class);
@@ -127,11 +129,12 @@
/**
* 纭鏁版嵁
*/
+ @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:confirmData")
@PostMapping("/confirmData")
public AjaxResult confirmData(@RequestBody ApsResourceGroupTemp temp) {
-// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-// LocalDateTime localDateTime = LocalDateTime.parse(temp.getParams().get("requestDate").toString(), formatter);
- 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