From 09bdafdcca4a1e7596fa68bdd268d4de6438a320 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Thu, 16 Oct 2025 17:18:14 +0800
Subject: [PATCH] 1.修改权限字符名称。
---
ard-admin/src/main/java/com/ard/web/controller/data/ArdModelController.java | 12 ++++++------
ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml | 2 +-
ard-admin/src/main/java/com/ard/web/controller/data/ArdTileController.java | 12 ++++++------
ard-admin/src/main/java/com/ard/web/controller/data/ArdMapController.java | 12 ++++++------
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/data/ArdMapController.java b/ard-admin/src/main/java/com/ard/web/controller/data/ArdMapController.java
index 66ae78e..5a97336 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/data/ArdMapController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/data/ArdMapController.java
@@ -42,7 +42,7 @@
* 查询地图管理列表
*/
@ApiOperation("查询地图管理列表")
- @PreAuthorize("@ss.hasPermi('system:map:list')")
+ @PreAuthorize("@ss.hasPermi('data:map:list')")
@GetMapping("/list")
public TableDataInfo list(ArdMap ardMap) {
startPage();
@@ -54,7 +54,7 @@
* 导出地图管理列表
*/
@ApiOperation("导出地图管理列表")
- @PreAuthorize("@ss.hasPermi('system:map:export')")
+ @PreAuthorize("@ss.hasPermi('data:map:export')")
@Log(title = "地图管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ArdMap ardMap) {
@@ -67,7 +67,7 @@
* 获取地图管理详细信息
*/
@ApiOperation("获取地图管理详细信息")
- @PreAuthorize("@ss.hasPermi('system:map:query')")
+ @PreAuthorize("@ss.hasPermi('data:map:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id) {
return success(ardMapService.selectArdMapById(id));
@@ -77,7 +77,7 @@
* 新增地图管理
*/
@ApiOperation("新增地图管理")
- @PreAuthorize("@ss.hasPermi('system:map:add')")
+ @PreAuthorize("@ss.hasPermi('data:map:add')")
@Log(title = "地图管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ArdMap ardMap) {
@@ -88,7 +88,7 @@
* 修改地图管理
*/
@ApiOperation("修改地图管理")
- @PreAuthorize("@ss.hasPermi('system:map:edit')")
+ @PreAuthorize("@ss.hasPermi('data:map:edit')")
@Log(title = "地图管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ArdMap ardMap) {
@@ -99,7 +99,7 @@
* 删除地图管理
*/
@ApiOperation("删除地图管理")
- @PreAuthorize("@ss.hasPermi('system:map:remove')")
+ @PreAuthorize("@ss.hasPermi('data:map:remove')")
@Log(title = "地图管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) {
diff --git a/ard-admin/src/main/java/com/ard/web/controller/data/ArdModelController.java b/ard-admin/src/main/java/com/ard/web/controller/data/ArdModelController.java
index fec8c9d..d9e6612 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/data/ArdModelController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/data/ArdModelController.java
@@ -42,7 +42,7 @@
* 查询模型管理列表
*/
@ApiOperation("查询模型管理列表")
- @PreAuthorize("@ss.hasPermi('system:model:list')")
+ @PreAuthorize("@ss.hasPermi('data:model:list')")
@GetMapping("/list")
public TableDataInfo list(ArdModel ardModel) {
startPage();
@@ -54,7 +54,7 @@
* 导出模型管理列表
*/
@ApiOperation("导出模型管理列表")
- @PreAuthorize("@ss.hasPermi('system:model:export')")
+ @PreAuthorize("@ss.hasPermi('data:model:export')")
@Log(title = "模型管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ArdModel ardModel) {
@@ -67,7 +67,7 @@
* 获取模型管理详细信息
*/
@ApiOperation("获取模型管理详细信息")
- @PreAuthorize("@ss.hasPermi('system:model:query')")
+ @PreAuthorize("@ss.hasPermi('data:model:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id) {
return success(ardModelService.selectArdModelById(id));
@@ -77,7 +77,7 @@
* 新增模型管理
*/
@ApiOperation("新增模型管理")
- @PreAuthorize("@ss.hasPermi('system:model:add')")
+ @PreAuthorize("@ss.hasPermi('data:model:add')")
@Log(title = "模型管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ArdModel ardModel) {
@@ -88,7 +88,7 @@
* 修改模型管理
*/
@ApiOperation("修改模型管理")
- @PreAuthorize("@ss.hasPermi('system:model:edit')")
+ @PreAuthorize("@ss.hasPermi('data:model:edit')")
@Log(title = "模型管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ArdModel ardModel) {
@@ -99,7 +99,7 @@
* 删除模型管理
*/
@ApiOperation("删除模型管理")
- @PreAuthorize("@ss.hasPermi('system:model:remove')")
+ @PreAuthorize("@ss.hasPermi('data:model:remove')")
@Log(title = "模型管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) {
diff --git a/ard-admin/src/main/java/com/ard/web/controller/data/ArdTileController.java b/ard-admin/src/main/java/com/ard/web/controller/data/ArdTileController.java
index 7ae8091..dc69330 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/data/ArdTileController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/data/ArdTileController.java
@@ -42,7 +42,7 @@
* 查询tile管理列表
*/
@ApiOperation("查询tile管理列表")
- @PreAuthorize("@ss.hasPermi('system:tile:list')")
+ @PreAuthorize("@ss.hasPermi('data:tile:list')")
@GetMapping("/list")
public TableDataInfo list(ArdTile ardTile) {
startPage();
@@ -54,7 +54,7 @@
* 导出tile管理列表
*/
@ApiOperation("导出tile管理列表")
- @PreAuthorize("@ss.hasPermi('system:tile:export')")
+ @PreAuthorize("@ss.hasPermi('data:tile:export')")
@Log(title = "tile管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ArdTile ardTile) {
@@ -67,7 +67,7 @@
* 获取tile管理详细信息
*/
@ApiOperation("获取tile管理详细信息")
- @PreAuthorize("@ss.hasPermi('system:tile:query')")
+ @PreAuthorize("@ss.hasPermi('data:tile:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id) {
return success(ardTileService.selectArdTileById(id));
@@ -77,7 +77,7 @@
* 新增tile管理
*/
@ApiOperation("新增tile管理")
- @PreAuthorize("@ss.hasPermi('system:tile:add')")
+ @PreAuthorize("@ss.hasPermi('data:tile:add')")
@Log(title = "tile管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ArdTile ardTile) {
@@ -88,7 +88,7 @@
* 修改tile管理
*/
@ApiOperation("修改tile管理")
- @PreAuthorize("@ss.hasPermi('system:tile:edit')")
+ @PreAuthorize("@ss.hasPermi('data:tile:edit')")
@Log(title = "tile管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ArdTile ardTile) {
@@ -99,7 +99,7 @@
* 删除tile管理
*/
@ApiOperation("删除tile管理")
- @PreAuthorize("@ss.hasPermi('system:tile:remove')")
+ @PreAuthorize("@ss.hasPermi('data:tile:remove')")
@Log(title = "tile管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) {
diff --git a/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml b/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
index 0e1c927..385990f 100644
--- a/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
@@ -43,7 +43,7 @@
<include refid="selectArdServerInfoVo"/>
<where>
<if test="id != null and id != ''"> and c.id = #{id}</if>
- <if test="serverName != null and serverName != ''"> and c.server_name like c.concat('%', #{serverName}, '%')</if>
+ <if test="serverName != null and serverName != ''"> and c.server_name like concat('%', #{serverName}, '%')</if>
<if test="accessKeyId != null and accessKeyId != ''"> and c.access_key_id = #{accessKeyId}</if>
<if test="accessKeySecret != null and accessKeySecret != ''"> and c.access_key_secret = #{accessKeySecret}</if>
<if test="serverStatus != null and serverStatus != ''"> and c.server_status = #{serverStatus}</if>
--
Gitblit v1.9.3