Commit 93c08079 authored by lisong's avatar lisong

修改车辆地图车牌号显示问题

parent d3be9e28
...@@ -66,5 +66,7 @@ public class EquipTypeImgAmountVO { ...@@ -66,5 +66,7 @@ public class EquipTypeImgAmountVO {
@ApiModelProperty(value = "物联设备实时状态") @ApiModelProperty(value = "物联设备实时状态")
private Double equipStatus; private Double equipStatus;
@ApiModelProperty(value = "车牌号")
private String carNum;
} }
...@@ -19,6 +19,6 @@ public interface WlCarMileageMapper extends BaseMapper<WlCarMileage> { ...@@ -19,6 +19,6 @@ public interface WlCarMileageMapper extends BaseMapper<WlCarMileage> {
Double totalMileage(String iotCode); Double totalMileage(String iotCode);
List<WlCarMileage> list(); List<WlCarMileage> list(@Param("date") String date);
} }
...@@ -279,8 +279,13 @@ public class WlCarMileageServiceImpl extends ServiceImpl<WlCarMileageMapper, WlC ...@@ -279,8 +279,13 @@ public class WlCarMileageServiceImpl extends ServiceImpl<WlCarMileageMapper, WlC
@Override @Override
@Scheduled(cron = "${mileage.segmentation.cron}") @Scheduled(cron = "${mileage.segmentation.cron}")
public void mileageSegmentation() { public void mileageSegmentation() {
log.info("轨迹切分定时任务开始执行时间.............{}", new Date()); log.info("轨迹切分定时任务开始执行时间.............{}", LocalDateTime.now());
List<WlCarMileage> list = this.baseMapper.list(); Calendar cal = Calendar.getInstance();
cal.setTime(new Date());
cal.add(Calendar.DATE, -1);
String nowDate = new SimpleDateFormat("yyyy-MM-dd").format(cal.getTime());
log.info("轨迹切分定时任务数据过滤时间.............{}", nowDate);
List<WlCarMileage> list = this.baseMapper.list(nowDate);
log.info("需要切分数据, {}", list); log.info("需要切分数据, {}", list);
list.forEach(item -> { list.forEach(item -> {
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
......
...@@ -1870,7 +1870,7 @@ ...@@ -1870,7 +1870,7 @@
wlai.`name` manufacturerName, wlai.`name` manufacturerName,
wlc.car_num as code, wlc.car_num as code,
wlc.iot_code as iotCode, wlc.iot_code as iotCode,
wlc.car_num, wlc.car_num as carNum,
CASE CASE
wlc.car_state wlc.car_state
WHEN '1' THEN WHEN '1' THEN
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
FROM FROM
`wl_car_mileage` wcm `wl_car_mileage` wcm
WHERE WHERE
wcm.date = DATE_SUB(CURDATE(), INTERVAL 1 DAY) wcm.date = #{date}
AND wcm.start_time IS NOT NULL AND wcm.start_time IS NOT NULL
AND wcm.end_time IS NULL AND wcm.end_time IS NULL
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment