设备温度曲线

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

@@ -11,7 +11,6 @@ import com.xy.collections.list.JArrayList;
 import com.xy.collections.map.JMap;
 import com.xy.device.EnumDeviceActiveStatus;
 import com.xy.device.EnumDeviceFreezeStatus;
-import com.xy.device.EnumDeviceType;
 import com.xy.dto.*;
 import com.xy.dto.be.MercDto;
 import com.xy.dto.common.MercLineDto;
@@ -39,7 +38,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
@@ -79,6 +77,8 @@ public class MercMiniDeviceController {
 
     private final DeviceStatusServiceImpl deviceStatusService;
 
+    private final DeviceTempSetServiceImpl deviceTempSetService;
+
     @ApiOperation("商户设备首页统计")
     @PostMapping("mercHomeStatistical")
     public R<DeviceInfoDto.MercHomeStatisticalVO> mercHomeStatistical(@RequestBody @Valid DeviceInfoDto.MercHomeQueryDTO dto) {
@@ -177,6 +177,9 @@ public class MercMiniDeviceController {
 
 
         }
+
+        DeviceTempSetDto.Vo tempSet = R.feignCheckData(deviceTempSetService.getLastOne(new DeviceTempSetDto.GetLastOneDto().setDeviceId(obj.getDeviceId())));
+        vo.setTempSetInfo(tempSet);
         return R.ok(vo);
     }
 

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

@@ -70,6 +70,13 @@ public class DeviceStatusServiceImpl extends ServiceImpl<DeviceStatusMapper, Dev
         }
         DeviceStatus deviceStatus = copy(DeviceStatus.class, up).setUpdateTime(LocalDateTime.now());
         updateById(deviceStatus);
+        Integer tempState = up.getTempState();
+        //故障
+        boolean isRisk = false;
+        //温控仪异常
+        if (tempState != null && tempState.intValue() != 0) {
+            isRisk = true;
+        }
         //温度上报
         if (Emptys.check(deviceStatus.getTempValue())) {
             DeviceSysinfo deviceSysinfo = deviceSysinfoService.getById(up.getDeviceId());
@@ -77,7 +84,7 @@ public class DeviceStatusServiceImpl extends ServiceImpl<DeviceStatusMapper, Dev
             if (deviceSysinfo.getIsHaveTemp()) {
                 DeviceTempRecordsDto.Save save = new DeviceTempRecordsDto.Save()
                         .setDeviceId(up.getDeviceId());
-                save.setTempValue(deviceStatus.getTempValue());
+                save.setTempValue(isRisk ? null : deviceStatus.getTempValue());
                 deviceTempRecordsService.save(save);
                 //查询设备配置
                 DeviceConfig deviceConfig = deviceConfigService.getById(deviceStatus.getDeviceId());

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

@@ -399,6 +399,9 @@ public class DeviceInfoDto {
 
         @ApiModelProperty("联网状态名称")
         private String netStateName;
+        
+        @ApiModelProperty("温度设置信息")
+        private DeviceTempSetDto.Vo tempSetInfo;
     }
 
     @Data