Explorar el Código

/。 car

release_toaliyun_real
xhxu hace 4 años
padre
commit
c518726556
Se han modificado 2 ficheros con 12 adiciones y 12 borrados
  1. +11
    -11
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java

+ 11
- 11
mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java Ver fichero

@@ -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<String, Object> data = dataTowerService.queryCar(getTenantInfo());
//
// return new ResultData(data);
// }
@ApiOperation("查询车流")
@GetMapping("/queryCar")
@SystemControllerLog(description = "数据塔台-查询车流")
public ResultData queryCar() {
logger.debug("[" + getIpAddr() + "] DataTowerController::queryCar");
Map<String, Object> data = dataTowerService.queryCar(getTenantInfo());
return new ResultData(data);
}

@ApiOperation("查询客流")
@GetMapping("/queryCustomer")


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java Ver fichero

@@ -604,7 +604,7 @@ public class DataTowerServiceImpl implements DataTowerService {
logger.info("停车-近一周新增会员历史-开始");
chartData.setType(EnumChartType.CAR_NEW_MEMBER.getCode());
List<WxChartDataEntity> list3 = wxChartDataMapper.findList(chartData);
Map<String, String> weekCarCollect = list2.stream().collect(Collectors.toMap(m -> {
Map<String, String> weekCarCollect = list3.stream().collect(Collectors.toMap(m -> {
return new SimpleDateFormat("yyyy-MM-dd").format(m.getQuerytime());
}, m -> {
return m.getResult();


Cargando…
Cancelar
Guardar