- AppIconKeyService/AppIconEntryVo(新):icon_key/icon_color 资产库键值读取 - UserController:getUserApp 返回体加图标键注入(withIconKeys) - UserSettingsController:用户设置应用列表注入 iconKey/iconColor(未配置 null 走原 img 回退) - UsedAppController/UsedAppServiceImpl:常用应用列表同口径注入 依据:根目录《AppIcon资产库落地-执行报告-20261004.md》P2 数据侧/管理端
This commit is contained in:
@@ -5,7 +5,9 @@ import com.yunhai.platform.utils.model.BoaAppType;
|
||||
import com.yunhai.platform.utils.model.BoaUser;
|
||||
import com.yunhai.userhome.config.Config;
|
||||
import com.yunhai.userhome.entity.UsedApp;
|
||||
import com.yunhai.userhome.model.AppIconEntryVo;
|
||||
import com.yunhai.userhome.model.SetType;
|
||||
import com.yunhai.userhome.service.AppIconKeyService;
|
||||
import com.yunhai.userhome.service.AppRemoteService;
|
||||
import com.yunhai.userhome.service.UsedAppService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -36,6 +38,9 @@ public class UsedAppController {
|
||||
@Autowired
|
||||
private AppRemoteService appRemoteService;
|
||||
|
||||
@Autowired
|
||||
private AppIconKeyService appIconKeyService;
|
||||
|
||||
/**
|
||||
* 取当前角色生效的常用应用(BoaApp 详情,按 appIds 顺序)。
|
||||
*
|
||||
@@ -112,7 +117,7 @@ public class UsedAppController {
|
||||
usedAppService.saveUserId(usedApp);
|
||||
}
|
||||
|
||||
/** 按 appIds(逗号分隔)取应用精简映射(id/name/icon/url),在全集中查找。 */
|
||||
/** 按 appIds(逗号分隔)取应用精简映射(id/name/icon/url/iconKey/iconColor),在全集中查找。 */
|
||||
@GetMapping("getAppByIds")
|
||||
public List<Map<String, Object>> getAppByIds(BoaUser authUserWithDept, String appIds) {
|
||||
List<Map<String, Object>> list = new ArrayList<>();
|
||||
@@ -132,6 +137,10 @@ public class UsedAppController {
|
||||
m.put("name", app.getName());
|
||||
m.put("icon", app.getIcon());
|
||||
m.put("url", app.getWebAddr());
|
||||
// 矢量图标键(AppIcon 通道;未配置为 null,前端按空走原 img 回退)
|
||||
AppIconEntryVo iconEntry = appIconKeyService.byId(app.getId());
|
||||
m.put("iconKey", iconEntry == null ? null : iconEntry.getIconKey());
|
||||
m.put("iconColor", iconEntry == null ? null : iconEntry.getIconColor());
|
||||
list.add(m);
|
||||
});
|
||||
} catch (NumberFormatException ignore) {
|
||||
|
||||
Reference in New Issue
Block a user