Merge remote-tracking branch 'origin/20210716' into 20210716

zoniot-water/zoniot-water-api/src/main/java/com/bz/zoneiot/water/api/vo/AlarmTypeDetailsEntityVo.java

@@ -50,7 +50,7 @@ public class AlarmTypeDetailsEntityVo {
     private Date alarmStartTime;
 
 
-    private String getSceneName(){
+    public String getSceneName(){
         if (StringUtils.isEmpty(sceneName)) {
             return "";
         }

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/handle/ReceiveDeviceDataService.java

@@ -7,6 +7,8 @@ import com.bz.zoneiot.core.utils.DateUtil;
 import com.bz.zoneiot.core.utils.util.RedisUtils;
 import com.bz.zoneiot.water.api.dto.DeviceDataDto;
 import com.bz.zoneiot.water.api.dto.TimeValueDto;
+import com.bz.zoneiot.water.api.enums.DeviceStatusEnum;
+import com.bz.zoneiot.water.api.vo.DeviceVo;
 import com.bz.zoneiot.water.core.dao.DeviceMapper;
 import com.bz.zoneiot.water.core.dao.MonitorDataMapper;
 import com.bz.zoneiot.water.core.entity.MonitorDataEntity;
@@ -127,8 +129,13 @@ public class ReceiveDeviceDataService {
             this.saveData(timeValueDto, monitorDataEntity);
             lastTime = timeValueDto.getTime();
         }
+        Long deviceId = Long.parseLong(monitorDataEntity.getDeviceId().toString());
         // 修改设备上报时间
         deviceMapper.updateLastTime(monitorDataEntity.getDeviceId(), lastTime);
+        DeviceVo deviceVo = deviceMapper.selectById(Long.parseLong(monitorDataEntity.getDeviceId().toString()));
+        if (deviceVo.getEnableState() == DeviceStatusEnum.NOT_ENABLED.getCode()) {
+            deviceMapper.updateDeviceState(deviceId, DeviceStatusEnum.NORMAL.getCode());
+        }
     }
 
     /**