Merge branch 'master' into test

device-api-service/src/main/java/com/xy/service/DeviceConfigServiceImpl.java

@@ -55,4 +55,11 @@ public class DeviceConfigServiceImpl extends ServiceImpl<DeviceConfigMapper, Dev
         }
         return R.ok();
     }
+
+    @PostMapping("obj")
+    @ApiOperation("对象查询")
+    public R<DeviceConfigDto.Vo> obj(@RequestBody @Validated DeviceConfigDto.Obj obj) {
+        DeviceConfig deviceConfig = getById(obj.getDeviceId());
+        return R.ok(Beans.copy(DeviceConfigDto.Vo.class, deviceConfig));
+    }
 }

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

@@ -56,6 +56,15 @@ public class DeviceConfigDto {
 
     }
 
+    @Data
+    @Accessors(chain = true)
+    public static class Obj {
+
+        @NotNull(message = "deviceId不能为空")
+        @ApiModelProperty(value = "设备id")
+        private Long deviceId;
+    }
+
 
     @Data
     @Accessors(chain = true)