物联网同步

zoniot-water/zoniot-water-web/src/main/java/com/zcxk/water/web/controller/AlarmSettingController.java

@@ -28,12 +28,13 @@ import javax.validation.Valid;
 import java.util.List;
 
 /**
- * 报警设置控制层
+ * 报警设置控制层(弃用)
  * @author Andy
  */
 @RestController
 @RequestMapping("/alarmSetting")
 @Api(tags = "报警管理")
+
 public class AlarmSettingController {
 
     @Autowired
@@ -47,6 +48,7 @@ public class AlarmSettingController {
 
     @RequestMapping(value = "deleteByAlarmIds", method = RequestMethod.POST)
     @ApiOperation(value = "删除报警配置信息")
+
     public AjaxMessage<Boolean> deleteByAlarmIds(@ApiParam(value = "报警配置ids", required = true) @RequestBody Long[] ids) {
         // 修改实时报警数据
         alarmSettingService.updateRealtimeAlarm(ids,UserUtil.getCurrentUser().getUsername());

zoniot-water/zoniot-water-web/src/main/java/com/zcxk/water/web/service/impl/DeviceServiceImpl.java

@@ -177,8 +177,10 @@ public class DeviceServiceImpl implements DeviceService {
                     map.get(item.getId()).setSceneId(deviceDto.getSceneId());
                 }
             }
+            return map.values().stream().collect(Collectors.toList());
         }
-        return map.values().stream().collect(Collectors.toList());
+        return deviceDtos;
+
     }
 
     @Override