Просмотр исходного кода

[数据塔台][车流数据]:查询逻辑更改

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
cb464c77fd
3 измененных файлов: 86 добавлений и 7 удалений
  1. +1
    -0
      mallinkService/src/main/java/com/simple/mapper/WxCarCmdLogMapper.java
  2. +68
    -0
      mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java
  3. +17
    -7
      mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml

+ 1
- 0
mallinkService/src/main/java/com/simple/mapper/WxCarCmdLogMapper.java Просмотреть файл

@@ -13,4 +13,5 @@ public interface WxCarCmdLogMapper extends CommonMapper<WxCarCmdLog, Long> {


List<Map<String,Object>> queryHistory(HashMap<Object,Object> params); List<Map<String,Object>> queryHistory(HashMap<Object,Object> params);


List<Map<String, Object>> queryTodayCar(HashMap<Object,Object> params);
} }

+ 68
- 0
mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java Просмотреть файл

@@ -8,6 +8,7 @@ import com.simple.enums.EnumCarCmd;
import com.simple.mapper.*; import com.simple.mapper.*;
import com.simple.service.DataTowerService; import com.simple.service.DataTowerService;
import com.simple.utils.DateUtils; import com.simple.utils.DateUtils;
import org.apache.commons.collections.map.TransformedMap;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.apache.shiro.crypto.hash.Hash; import org.apache.shiro.crypto.hash.Hash;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +39,8 @@ public class DataTowerServiceImpl implements DataTowerService {
@Autowired @Autowired
WxCarCmdLogMapper wxCarCmdLogMapper; WxCarCmdLogMapper wxCarCmdLogMapper;




@Override @Override
public Map<String, Object> queryRunning(String tenantId) { public Map<String, Object> queryRunning(String tenantId) {
WxShop wxShop = new WxShop(); WxShop wxShop = new WxShop();
@@ -175,9 +178,74 @@ public class DataTowerServiceImpl implements DataTowerService {
datamap.put("lasthb","--"); datamap.put("lasthb","--");
} }


params.put("startdate",systemTime+" 05:00:00");
params.put("enddate",systemTime+" 22:59:59");

List<Map<String,Object>> todayCarlist=wxCarCmdLogMapper.queryTodayCar(params);
Map<Object, Object> todaycollect = todayCarlist.stream().collect(Collectors.toMap(m -> {
return m.get("create_time");
}, m -> {
return m.get("carcount");
}));
TreeMap todaytreemap = getTimeTreeMap();
todaytreemap.putAll(todaycollect);

datamap.put("todaycar",todaytreemap);

String yesterday = DateUtils.getTimeBefore(1, new Date());
params.put("startdate",yesterday+" 05:00:00");
params.put("enddate",yesterday+" 22:59:59");
List<Map<String,Object>> yesterdayCarlist=wxCarCmdLogMapper.queryTodayCar(params);
Map<Object, Object> yesterdaycollect = yesterdayCarlist.stream().collect(Collectors.toMap(m -> {
return m.get("create_time");
}, m -> {
return m.get("carcount");
}));
TreeMap yesterdaytreemap = getTimeTreeMap();
yesterdaytreemap.putAll(yesterdaycollect);

datamap.put("yesterdaycar",yesterdaytreemap);


params.put("startdate",startdate+" 05:00:00");
params.put("enddate",startdate+" 22:59:59");
List<Map<String,Object>> lastdayCarlist=wxCarCmdLogMapper.queryTodayCar(params);
Map<Object, Object> lastdaycollect = lastdayCarlist.stream().collect(Collectors.toMap(m -> {
return m.get("create_time");
}, m -> {
return m.get("carcount");
}));
TreeMap lastdaytreemap = getTimeTreeMap();
lastdaytreemap.putAll(lastdaycollect);
datamap.put("lastdaycar",lastdaytreemap);



return datamap; return datamap;
} }


public TreeMap getTimeTreeMap(){
TreeMap<Object,Object> timemap=new TreeMap();
timemap.put("06:00",0);
timemap.put("07:00",0);
timemap.put("08:00",0);
timemap.put("09:00",0);
timemap.put("10:00",0);
timemap.put("11:00",0);
timemap.put("12:00",0);
timemap.put("13:00",0);
timemap.put("14:00",0);
timemap.put("15:00",0);
timemap.put("16:00",0);
timemap.put("17:00",0);
timemap.put("18:00",0);
timemap.put("19:00",0);
timemap.put("20:00",0);
timemap.put("21:00",0);
timemap.put("22:00",0);
timemap.put("23:00",0);
return timemap;
}




} }

+ 17
- 7
mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml Просмотреть файл

@@ -69,13 +69,23 @@
</select> </select>
<select id="queryHistory" resultType="hashmap" parameterType="hashmap"> <select id="queryHistory" resultType="hashmap" parameterType="hashmap">
select count(c.id) carcount,c.create_date from (
select id,DATE_FORMAT(create_date,'%Y-%m-%d') create_date
from wx_car_cmd_log where tenant_id = #{tenantId} and cmd_type=#{cmdType}
and create_date BETWEEN #{startdate} and #{enddate}
) c
group by c.create_date
select count(c.id) carcount,c.create_date from (
select id,DATE_FORMAT(create_date,'%Y-%m-%d') create_date
from wx_car_cmd_log where tenant_id = #{tenantId} and cmd_type=#{cmdType}
and create_date BETWEEN #{startdate} and #{enddate}
) c
group by c.create_date
</select> </select>

<select id="queryTodayCar" resultType="hashmap" parameterType="hashmap">
select count(c.id) carcount,c.create_time from (
select id,DATE_FORMAT(DATE_ADD(create_date,INTERVAL 1 HOUR),'%H:00') create_time
from wx_car_cmd_log where tenant_id = #{tenantId} and cmd_type=#{cmdType}
and create_date BETWEEN #{startdate} and #{enddate}
) c group by c.create_time
</select>


</mapper> </mapper>

Загрузка…
Отмена
Сохранить