소스 검색

修改bug

suntianwu 3 년 전
부모
커밋
596837d260
2개의 변경된 파일24개의 추가작업 그리고 2개의 파일을 삭제
  1. 3 2
      src/main/java/com/care/bms/controller/StationController.java
  2. 21 0
      src/main/java/com/care/common/vo/device/DeviceDistributeVO.java

+ 3 - 2
src/main/java/com/care/bms/controller/StationController.java

@@ -18,6 +18,7 @@ import com.care.common.util.WebPageUtils;
 
 import com.care.common.vo.PageReqVO;
 import com.care.common.vo.UserLogindConvertVO;
+import com.care.common.vo.device.DeviceDistributeVO;
 import com.care.common.vo.device.DeviceVO;
 import com.care.common.vo.station.StationVO;
 import com.care.common.vo.station.StationVO;
@@ -164,14 +165,14 @@ public class StationController {
     @PostMapping("/distributeDevice")
     @ApiOperation(value = "分配设备(对象list中只设置stationId和设备的id) --四期新增 ")
     public Result<Object> distributeDevice( @RequestHeader("token") String token,
-                                            @RequestBody List<DeviceVO> vos) {
+                                            @RequestBody List<DeviceDistributeVO> vos) {
         try {
 
             if (CollUtil.isEmpty(vos)) {
                 return Result.error("分配设备列表不能为空!");
             }
             List<CareDevice> careDevices = new ArrayList<>();
-            for (DeviceVO vo : vos) {
+            for (DeviceDistributeVO vo : vos) {
                 CareDevice careDevice = new CareDevice();
                 BeanUtil.copyProperties(vo, careDevice);
                 careDevices.add(careDevice);

+ 21 - 0
src/main/java/com/care/common/vo/device/DeviceDistributeVO.java

@@ -0,0 +1,21 @@
+package com.care.common.vo.device;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: lilt
+ * @Date: 2021/6/7
+ * @Desc:
+ */
+@Data
+public class DeviceDistributeVO {
+
+    private Long id;
+
+    @ApiModelProperty("服务站ID")
+    private Long stationId;
+
+
+}