Browse Source

活动距离,向上取整数

lilt085163@126.com 3 years ago
parent
commit
1c9c98133c
1 changed files with 4 additions and 7 deletions
  1. 4 7
      src/main/java/com/care/client/service/PinanbaoService.java

+ 4 - 7
src/main/java/com/care/client/service/PinanbaoService.java

@@ -3,12 +3,12 @@ package com.care.client.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.math.MathUtil;
-import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.care.client.vo.*;
+import com.care.client.vo.DeviceMonitorVO;
+import com.care.client.vo.EventDetailVO;
+import com.care.client.vo.MemberInfoVO;
 import com.care.common.entity.*;
 import com.care.common.enums.*;
 import com.care.common.service.*;
@@ -26,7 +26,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * @Author: lilt
@@ -177,12 +176,11 @@ public class PinanbaoService {
     public List<CareWalkingDistanceHourSta> getActivityChartList(Long devId){
         String beginHour = DateUtil.format(new Date(),"yyyyMMdd") + "00";
         QueryWrapper<CareWalkingDistanceHourSta> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareWalkingDistanceHourSta::getDevId,devId).ge(CareWalkingDistanceHourSta::getDataHour,beginHour).orderByAsc(CareWalkingDistanceHourSta::getDataHour);
+        queryWrapper.select("id,data_hour,dev_id,dev_scene,walking_distance,CEILING(walking_duration) walking_duration,create_time").lambda().eq(CareWalkingDistanceHourSta::getDevId,devId).ge(CareWalkingDistanceHourSta::getDataHour,beginHour).orderByAsc(CareWalkingDistanceHourSta::getDataHour);
         List<CareWalkingDistanceHourSta> list = this.careWalkingDistanceHourStaService.list(queryWrapper);
         if(CollUtil.isNotEmpty(list)){
             list.forEach(item -> {
                 item.setDataHour(item.getDataHour().substring(8));
-                item.setWalkingDistance(Math.ceil(item.getWalkingDistance()));
             });
         }
         return list;
@@ -517,5 +515,4 @@ public class PinanbaoService {
         Map<String,String> map =  this.careDeviceService.get3dUrl(devId);
         return  map.get("toWX");
     }
-
 }