|
|
@ -1,6 +1,7 @@ |
|
|
package com.thing.device.menu.controller; |
|
|
package com.thing.device.menu.controller; |
|
|
|
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil; |
|
|
import cn.hutool.core.util.ObjectUtil; |
|
|
|
|
|
import com.alibaba.fastjson.JSONArray; |
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
import com.thing.common.core.annotation.LogOperation; |
|
|
import com.thing.common.core.annotation.LogOperation; |
|
|
import com.thing.common.core.constants.Constant; |
|
|
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.common.core.web.response.Result; |
|
|
import com.thing.device.menu.dto.IotThingMenuConfigDTO; |
|
|
import com.thing.device.menu.dto.IotThingMenuConfigDTO; |
|
|
import com.thing.device.menu.service.IotThingMenuConfigService; |
|
|
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.Operation; |
|
|
import io.swagger.v3.oas.annotations.Parameter; |
|
|
import io.swagger.v3.oas.annotations.Parameter; |
|
|
import io.swagger.v3.oas.annotations.Parameters; |
|
|
import io.swagger.v3.oas.annotations.Parameters; |
|
|
@ -30,6 +33,7 @@ import java.util.Map; |
|
|
public class IotThingMenuConfigController { |
|
|
public class IotThingMenuConfigController { |
|
|
|
|
|
|
|
|
private final IotThingMenuConfigService iotThingMenuConfigService; |
|
|
private final IotThingMenuConfigService iotThingMenuConfigService; |
|
|
|
|
|
private final IotThingRelationRootService relationRootService; |
|
|
|
|
|
|
|
|
@GetMapping("page") |
|
|
@GetMapping("page") |
|
|
@Operation(summary = "分页") |
|
|
@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<IotThingMenuConfigDTO>().ok(data); |
|
|
return new Result<IotThingMenuConfigDTO>().ok(data); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|