From fbf7aa69f52478323ddc0fdeefaec44e15c1a04a Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 27 Aug 2018 12:54:57 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=95=B0=E6=8D=AE=E5=A1=94=E5=8F=B0][?= =?UTF-8?q?=E8=BD=A6=E6=B5=81=E6=95=B0=E6=8D=AE]:=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DataTowerController.java | 11 ++ .../com/simple/mapper/WxCarCmdLogMapper.java | 13 +- .../com/simple/service/DataTowerService.java | 2 + .../service/impl/DataTowerServiceImpl.java | 38 +++++- .../resources/mapper/WxCarCmdLogMapper.xml | 117 ++++++++++-------- 5 files changed, 115 insertions(+), 66 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java b/mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java index 22ef453ff..281a96560 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java @@ -34,4 +34,15 @@ public class DataTowerController extends BaseController { } + @ApiOperation("查询车流") + @PostMapping("/queryCar") + public ResultData queryCar() { + + Map data=dataTowerService.queryCar(getTenantId()); + + return new ResultData(data); + } + + + } diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCarCmdLogMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCarCmdLogMapper.java index e8017220f..d3ecc7564 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCarCmdLogMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCarCmdLogMapper.java @@ -1,17 +1,16 @@ package com.simple.mapper; -import java.util.*; import com.simple.common.CommonMapper; -import org.apache.ibatis.annotations.Param; import com.simple.domain.po.WxCarCmdLog; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public interface WxCarCmdLogMapper extends CommonMapper { List findList(WxCarCmdLog wxCarCmdLog); - - - - - + List> queryHistory(HashMap params); + } diff --git a/mallinkService/src/main/java/com/simple/service/DataTowerService.java b/mallinkService/src/main/java/com/simple/service/DataTowerService.java index e4c992528..0f2d231b5 100644 --- a/mallinkService/src/main/java/com/simple/service/DataTowerService.java +++ b/mallinkService/src/main/java/com/simple/service/DataTowerService.java @@ -7,4 +7,6 @@ public interface DataTowerService { Map queryRunning(String tenantId); + Map queryCar(String tenantId); + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java index bc1a00f7a..fc5a3cbda 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java @@ -1,15 +1,15 @@ package com.simple.service.impl; +import com.simple.common.ErrorCode; import com.simple.domain.po.WxMerchant; import com.simple.domain.po.WxMerchantTradeDaily; import com.simple.domain.po.WxShop; -import com.simple.mapper.WxDateAmountRecordMapper; -import com.simple.mapper.WxMerchantMapper; -import com.simple.mapper.WxMerchantTradeDailyMapper; -import com.simple.mapper.WxShopMapper; +import com.simple.enums.EnumCarCmd; +import com.simple.mapper.*; import com.simple.service.DataTowerService; import com.simple.utils.DateUtils; import org.apache.log4j.Logger; +import org.apache.shiro.crypto.hash.Hash; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,6 +35,8 @@ public class DataTowerServiceImpl implements DataTowerService { @Autowired WxDateAmountRecordMapper wxDateAmountRecordMapper; + @Autowired + WxCarCmdLogMapper wxCarCmdLogMapper; @Override public Map queryRunning(String tenantId) { @@ -115,4 +117,32 @@ public class DataTowerServiceImpl implements DataTowerService { return datamap; } + + @Override + public Map queryCar(String tenantId) { + HashMap params = new HashMap<>(); + params.put("tenantId",tenantId); + params.put("cmdType",EnumCarCmd.CAR_ETCP_CALLBACK_PARK_OUT.getCode()); + String startdate = DateUtils.getTimeBefore(7, new Date()); + String enddate = DateUtils.getSystemTime("yyyy-MM-dd"); + params.put("startdate",startdate); + params.put("enddate",enddate); + + List> historylist=wxCarCmdLogMapper.queryHistory(params); + Map collect = historylist.stream().collect(Collectors.toMap(m -> { + return m.get("create_date"); + }, m -> { + return m.get("carcount"); + })); + + TreeMap historymap = new TreeMap<>(); + historymap.putAll(collect); + + Map datamap = new HashMap<>(); + datamap.put("history",historymap); + + return datamap; + } + + } diff --git a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml index 12e02bc44..21d690409 100644 --- a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml @@ -2,73 +2,80 @@ - - - - - - - + + + + + + + `id`,`tenant_id`,`vendor_type`,`cmd_type`,`create_date`,`update_date`,`cmd_json` - + - where 1 = 1 - - - and `id` = #{id} - - - - - and `tenant_id` like concat('%', #{tenantId},'%') - - - - - and `vendor_type` = #{vendorType} - - - - - and `cmd_type` = #{cmdType} - - - - - and `create_date` = #{createDate} - - - - - and `update_date` = #{updateDate} - - - - - and `cmd_json` like concat('%', #{cmdJson},'%') - - + where 1 = 1 + + + and `id` = #{id} + + + + + and `tenant_id` like concat('%', #{tenantId},'%') + + + + + and `vendor_type` = #{vendorType} + + + + + and `cmd_type` = #{cmdType} + + + + + and `create_date` = #{createDate} + + + + + and `update_date` = #{updateDate} + + + + + and `cmd_json` like concat('%', #{cmdJson},'%') + + - and id in + and id in - #{idItem} + #{idItem} - - order by ${sortColumns} + + order by ${sortColumns} - - - - - + + +