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