From 80a24513ab4803bd82d9a2a53f3c9359cb04568a Mon Sep 17 00:00:00 2001
From: lanyuanxiaoyao <lanyuanxiaoyao@gmail.com>
Date: Wed, 18 Dec 2024 10:49:37 +0800
Subject: [PATCH] =?UTF-8?q?feat(web):=20=E6=B7=BB=E5=8A=A0=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=20ID=20=E5=B9=B6=E4=BC=98=E5=8C=96=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 WareController 中添加 resourceId 字段
- 更新前端市场页面，将 targetId映射为 resourceId
- 修改权限管理页面图标
- 移除不必要的 console.log 语句
---
 gringotts-frontend/pages/index/tab-market.js               | 7 ++-----
 gringotts-frontend/pages/index/tab-permissions.js          | 2 +-
 .../gringotts/web/domain/controller/WareController.java    | 4 +++-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/gringotts-frontend/pages/index/tab-market.js b/gringotts-frontend/pages/index/tab-market.js
index e93dc09..07af0b1 100644
--- a/gringotts-frontend/pages/index/tab-market.js
+++ b/gringotts-frontend/pages/index/tab-market.js
@@ -28,13 +28,10 @@ export function tabMarket() {
                                     payload.data = payload.data.map(i => {
                                         return {
                                             ...i,
-                                            targetId: i.id
+                                            targetId: i.resourceId,
                                         }
                                     })
-                                    console.log(payload, response, api, context)
-                                    return {
-                                        ...payload
-                                    }
+                                    return payload
                                 }
                             },
                             ...crudCommonOptions(),
diff --git a/gringotts-frontend/pages/index/tab-permissions.js b/gringotts-frontend/pages/index/tab-permissions.js
index ffcbb51..d6eaae8 100644
--- a/gringotts-frontend/pages/index/tab-permissions.js
+++ b/gringotts-frontend/pages/index/tab-permissions.js
@@ -27,7 +27,7 @@ export function tabPermissions() {
     return {
         visibleOn: userOnly,
         title: '权属管理',
-        icon: 'fa fa-user-shield',
+        icon: 'fa fa-key',
         reload: true,
         body: {
             type: 'tabs',
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/WareController.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/WareController.java
index 9a6fd42..0539c76 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/WareController.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/WareController.java
@@ -43,7 +43,7 @@ public class WareController extends SimpleControllerSupport<Ware, WareController
     }
 
     @GetMapping(LIST + "_public")
-    public AmisResponse<ImmutableList<ListItem>> listPublic() throws Exception {
+    public AmisResponse<ImmutableList<ListItem>> listPublic() {
         return AmisResponse.responseSuccess(wareService.listPublic().collect(this::toListItem));
     }
 
@@ -79,6 +79,7 @@ public class WareController extends SimpleControllerSupport<Ware, WareController
         item.setDescription(entity.getDescription());
         item.setIcon(StrUtil.format("{}/upload/download/{}", hostConfiguration.getPrefix(), entity.getIcon().getId()));
         item.setState(entity.getState().name());
+        item.setResourceId(entity.getResource().getId());
         item.setCreatedTime(entity.getCreatedTime());
         item.setCreatedUsername(entity.getCreatedUser().getUsername());
         return item;
@@ -119,6 +120,7 @@ public class WareController extends SimpleControllerSupport<Ware, WareController
         private String description;
         private String state;
         private String icon;
+        private Long resourceId;
     }
 
     @Data