From 2a64b537e8e3bce9ce030585a3da17d48379c0ad Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期一, 26 五月 2025 15:04:45 +0800
Subject: [PATCH] 修改json类型转换错误
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsPlantController.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsPlantController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsPlantController.java
index 89d3526..7728ec0 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsPlantController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsPlantController.java
@@ -31,19 +31,20 @@
/**
* 鏌ヨ宸ュ巶绠＄悊鍒楄〃
*/
- @RequiresPermissions("aps_plant:list")
+ //@RequiresPermissions("plant:list")
@GetMapping("/list")
public TableDataInfo list(ApsPlant apsPlant)
{
- startPage();
- List<ApsPlant> list = apsPlantService.selectApsPlantList(apsPlant);
- return getDataTable(list);
+ //startPage();
+ //List<ApsPlant> list = apsPlantService.selectApsPlantList(apsPlant);
+ List<ApsPlant> list1 = apsPlantService.list();
+ return getDataTable(list1);
}
/**
* 瀵煎嚭宸ュ巶绠＄悊鍒楄〃
*/
- @RequiresPermissions("aps_plant:export")
+ @RequiresPermissions("plant:export")
@Log(title = "宸ュ巶绠＄悊", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ApsPlant apsPlant)
@@ -56,9 +57,9 @@
/**
* 鑾峰彇宸ュ巶绠＄悊璇︾粏淇℃伅
*/
- @RequiresPermissions("aps_plant:query")
+ @RequiresPermissions("plant:query")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
+ public AjaxResult getInfo(@PathVariable("id") String id)
{
return success(apsPlantService.selectApsPlantById(id));
}
@@ -66,7 +67,7 @@
/**
* 鏂板宸ュ巶绠＄悊
*/
- @RequiresPermissions("aps_plant:add")
+ @RequiresPermissions("plant:add")
@Log(title = "宸ュ巶绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ApsPlant apsPlant)
@@ -77,7 +78,7 @@
/**
* 淇敼宸ュ巶绠＄悊
*/
- @RequiresPermissions("aps_plant:edit")
+ @RequiresPermissions("plant:edit")
@Log(title = "宸ュ巶绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ApsPlant apsPlant)
@@ -88,11 +89,22 @@
/**
* 鍒犻櫎宸ュ巶绠＄悊
*/
- @RequiresPermissions("aps_plant:remove")
+ @RequiresPermissions("plant:remove")
@Log(title = "宸ュ巶绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
+ public AjaxResult remove(@PathVariable String[] ids)
{
return toAjax(apsPlantService.deleteApsPlantByIds(ids));
}
+
+ /**
+ * 鏌ヨ宸ュ巶绠＄悊鍒楄〃
+ */
+// @RequiresPermissions("plant:list")
+ @GetMapping("/listAll")
+ public AjaxResult listAll(ApsPlant apsPlant)
+ {
+ List<ApsPlant> list = apsPlantService.selectApsPlantList(apsPlant);
+ return AjaxResult.success(list);
+ }
}
--
Gitblit v1.9.3