From f16ec51787ed0cb094b71ff8146c740d944f729d Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 15 五月 2025 11:40:54 +0800
Subject: [PATCH] Merge branch 'dev_platePlanv2' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartRouteStatController.java | 49 ++++++++++++++++++++++++++++---------------------
1 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartRouteStatController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartRouteStatController.java
index 88847a3..b7cf25d 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartRouteStatController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartRouteStatController.java
@@ -38,7 +38,7 @@
/**
* 鏌ヨ闆朵欢缁熻琛ㄥ垪琛�
*/
- @RequiresPermissions("ApsPartRouteStat:ApsPartRouteStat:list")
+ @RequiresPermissions("apsPartRouteStat:list")
@GetMapping("/list")
public TableDataInfo list(ApsPartRouteStat apsPartRouteStat)
{
@@ -50,20 +50,20 @@
/**
* 瀵煎嚭闆朵欢缁熻琛ㄥ垪琛�
*/
- @RequiresPermissions("ApsPartRouteStat:ApsPartRouteStat:export")
- @Log(title = "闆朵欢缁熻琛�", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, ApsPartRouteStat apsPartRouteStat)
- {
- List<ApsPartRouteStat> list = apsPartRouteStatService.selectApsPartRouteStatList(apsPartRouteStat);
- ExcelUtil<ApsPartRouteStat> util = new ExcelUtil<ApsPartRouteStat>(ApsPartRouteStat.class);
- util.exportExcel(response, list, "闆朵欢缁熻琛ㄦ暟鎹�");
- }
+// @RequiresPermissions("ApsPartRouteStat:ApsPartRouteStat:export")
+// @Log(title = "闆朵欢缁熻琛�", businessType = BusinessType.EXPORT)
+// @PostMapping("/export")
+// public void export(HttpServletResponse response, ApsPartRouteStat apsPartRouteStat)
+// {
+// List<ApsPartRouteStat> list = apsPartRouteStatService.selectApsPartRouteStatList(apsPartRouteStat);
+// ExcelUtil<ApsPartRouteStat> util = new ExcelUtil<ApsPartRouteStat>(ApsPartRouteStat.class);
+// util.exportExcel(response, list, "闆朵欢缁熻琛ㄦ暟鎹�");
+// }
/**
* 鑾峰彇闆朵欢缁熻琛ㄨ缁嗕俊鎭�
*/
- @RequiresPermissions("ApsPartRouteStat:ApsPartRouteStat:query")
+ @RequiresPermissions("apsPartRouteStat:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
{
@@ -73,7 +73,7 @@
/**
* 鏂板闆朵欢缁熻琛�
*/
- @RequiresPermissions("ApsPartRouteStat:ApsPartRouteStat:add")
+ @RequiresPermissions("apsPartRouteStat:add")
@Log(title = "闆朵欢缁熻琛�", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ApsPartRouteStat apsPartRouteStat)
@@ -83,17 +83,17 @@
/**
* 淇敼闆朵欢缁熻琛�
*/
- @RequiresPermissions("ApsPartRouteStat:ApsPartRouteStat:edit")
- @Log(title = "闆朵欢缁熻琛�", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody ApsPartRouteStat apsPartRouteStat)
- {
- return toAjax(apsPartRouteStatService.updateApsPartRouteStat(apsPartRouteStat));
- }
+// @RequiresPermissions("ApsPartRouteStat:ApsPartRouteStat:edit")
+// @Log(title = "闆朵欢缁熻琛�", businessType = BusinessType.UPDATE)
+// @PutMapping
+// public AjaxResult edit(@RequestBody ApsPartRouteStat apsPartRouteStat)
+// {
+// return toAjax(apsPartRouteStatService.updateApsPartRouteStat(apsPartRouteStat));
+// }
/**
* 鍒犻櫎闆朵欢缁熻琛�
*/
- @RequiresPermissions("ApsPartRouteStat:ApsPartRouteStat:remove")
+ @RequiresPermissions("apsPartRouteStat:remove")
@Log(title = "闆朵欢缁熻琛�", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
@@ -104,6 +104,7 @@
/**
* 1.鏍规嵁鐜版湁闆朵欢璁″垝 鍜屽伐鑹鸿矾绾裤�佽祫婧愭睜淇℃伅 鏇存柊缁熻琛�
* */
+
@PostMapping("/updateStat")
public AjaxResult updateStat()
{
@@ -114,11 +115,17 @@
/***
* 2. 鏍规嵁鏃ユ湡銆佸伐鑹鸿矾绾裤�佽祫婧愭睜淇℃伅 鏌ヨ缁熻琛�
* */
+ @RequiresPermissions("apsPartRouteStat:query")
@GetMapping("/query")
public AjaxResult query()
{
return apsPartRouteStatService.selectResourceDateStat();
}
-
+ @RequiresPermissions("apsPartRouteStat:export")
+ @GetMapping("/exportExcel")
+ public void exportExcel(HttpServletResponse response)
+ {
+ apsPartRouteStatService.exportExcel(response);
+ }
}
--
Gitblit v1.9.3