diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java index f68c0c498..309eef586 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java @@ -60,17 +60,17 @@ public class DataTowerController extends BaseController { // return new ResultData(data); // } -//TODO 待优化数据 -// @ApiOperation("查询车流") -// @GetMapping("/queryCar") -// @SystemControllerLog(description = "数据塔台-查询车流") -// public ResultData queryCar() { -// logger.debug("[" + getIpAddr() + "] DataTowerController::queryCar"); -// -// Map data = dataTowerService.queryCar(getTenantInfo()); -// -// return new ResultData(data); -// } + + @ApiOperation("查询车流") + @GetMapping("/queryCar") + @SystemControllerLog(description = "数据塔台-查询车流") + public ResultData queryCar() { + logger.debug("[" + getIpAddr() + "] DataTowerController::queryCar"); + + Map data = dataTowerService.queryCar(getTenantInfo()); + + return new ResultData(data); + } @ApiOperation("查询客流") @GetMapping("/queryCustomer") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index b394b905a..809ed58e8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -604,7 +604,7 @@ public class DataTowerServiceImpl implements DataTowerService { logger.info("停车-近一周新增会员历史-开始"); chartData.setType(EnumChartType.CAR_NEW_MEMBER.getCode()); List list3 = wxChartDataMapper.findList(chartData); - Map weekCarCollect = list2.stream().collect(Collectors.toMap(m -> { + Map weekCarCollect = list3.stream().collect(Collectors.toMap(m -> { return new SimpleDateFormat("yyyy-MM-dd").format(m.getQuerytime()); }, m -> { return m.getResult();