增加商户设备ID和名称列表

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceController.java

@@ -86,6 +86,18 @@ public class MercMiniDeviceController {
     }
 
 
+    @ApiOperation("设备列表-Id&Name")
+    @PostMapping("listOfIdName")
+    public R listOfIdName(){
+        DeviceInfoDto.ListCommon listCommonDto = new DeviceInfoDto.ListCommon();
+        DeviceInfoDto.Vo voDto = new DeviceInfoDto.Vo();
+        voDto.setActiveState(Integer.valueOf(DeviceActiveStateEnum.TRUE.getCode()))
+                .setMercId(MercAuthUtils.getMercId());
+        listCommonDto.setVo(voDto);
+        List<MercMiniDeviceDto.ListOfIdNameVo> copy = copy(MercMiniDeviceDto.ListOfIdNameVo.class, deviceInfoService.listCommon(listCommonDto).getData());
+        return R.ok(copy);
+    }
+
     @PostMapping("searchPage")
     @ApiOperation("小程序商户设备搜索")
     public R<PageBean<DeviceInfoDto.MerHomeSearchVO>> mercDeviceSearchPage(@RequestBody DeviceInfoDto.Page page) {

device-api/src/main/java/com/xy/dto/MercMiniDeviceDto.java

@@ -2,6 +2,7 @@ package com.xy.dto;
 
 import cn.hutool.core.date.DateTime;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xy.utils.Emptys;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -11,6 +12,20 @@ import javax.validation.constraints.NotNull;
 
 public class MercMiniDeviceDto {
 
+    @Data
+    @Accessors(chain = true)
+    public static class ListOfIdNameVo {
+        @ApiModelProperty("设备id")
+        private Long deviceId;
+
+        @ApiModelProperty("设备名称")
+        private String deviceName;
+
+        public String getDeviceName() {
+            return Emptys.check(deviceName) ? deviceName : String.valueOf(deviceId);
+        }
+    }
+
     @Data
     @Accessors(chain = true)
     public static class UpdateInfo {