From 0946fa1bd76003078c293f8a2031e0ea3267969d Mon Sep 17 00:00:00 2001 From: lishuai Date: Wed, 7 Aug 2024 10:51:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=88=86=E6=9E=90=202024?= =?UTF-8?q?=E5=B9=B48=E6=9C=887=E6=97=A510:51:20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IotThingMenuConfigController.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/thing/src/main/java/com/thing/device/menu/controller/IotThingMenuConfigController.java b/modules/thing/src/main/java/com/thing/device/menu/controller/IotThingMenuConfigController.java index f330eb7..dc79ffc 100644 --- a/modules/thing/src/main/java/com/thing/device/menu/controller/IotThingMenuConfigController.java +++ b/modules/thing/src/main/java/com/thing/device/menu/controller/IotThingMenuConfigController.java @@ -1,6 +1,7 @@ package com.thing.device.menu.controller; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.thing.common.core.annotation.LogOperation; import com.thing.common.core.constants.Constant; @@ -13,6 +14,8 @@ import com.thing.common.core.web.response.PageData; import com.thing.common.core.web.response.Result; import com.thing.device.menu.dto.IotThingMenuConfigDTO; import com.thing.device.menu.service.IotThingMenuConfigService; +import com.thing.thing.relation.root.dto.IotThingRelationRootDTO; +import com.thing.thing.relation.root.service.IotThingRelationRootService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -30,6 +33,7 @@ import java.util.Map; public class IotThingMenuConfigController { private final IotThingMenuConfigService iotThingMenuConfigService; + private final IotThingRelationRootService relationRootService; @GetMapping("page") @Operation(summary = "分页") @@ -70,6 +74,18 @@ public class IotThingMenuConfigController { } } } + if (ObjectUtil.isNotNull(data) && ObjectUtil.isNotNull(data.getMenuConfig())) { + JSONArray jsonArray = JSONArray.parseArray(data.getMenuConfig()); + if (jsonArray != null && !jsonArray.isEmpty()) { + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject jsonObject = jsonArray.getJSONObject(i); + Long id = jsonObject.getLong("id"); + IotThingRelationRootDTO relationRootDTO = relationRootService.findById(id); + jsonObject.put("name", relationRootDTO.getName()); + } + data.setMenuConfig(jsonArray.toString()); + } + } return new Result().ok(data); }