From 3827cba914063eb7f365cb7f80aa17f9cf2abbc5 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 23 Aug 2018 17:38:11 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E9=93=BA=E5=95=86=E6=88=B7][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E6=9F=A5=E8=AF=A2=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=EF=BC=8Cbuilding=E3=80=81floor=E5=AD=97=E6=AE=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DataTowerController.java | 94 +++++ .../controller/WxMerchantController.java | 1 + .../simple/controller/WxShopController.java | 4 +- .../java/com/simple/domain/po/WxShop.java | 12 +- .../java/com/simple/mapper/WxShopMapper.java | 13 +- .../com/simple/service/WxShopService.java | 4 +- .../service/impl/WxShopServiceImpl.java | 8 + .../main/resources/mapper/WxShopMapper.xml | 342 +++++++++++------- 8 files changed, 341 insertions(+), 137 deletions(-) create mode 100644 mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java diff --git a/mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java b/mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java new file mode 100644 index 000000000..95b6d2847 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java @@ -0,0 +1,94 @@ +package com.simple.controller; + +import com.simple.common.ResultData; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.log4j.Logger; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.List; + +@Api(description = "数据塔台") +@RestController +@RequestMapping("datatower") +public class DataTowerController extends BaseController { + + + private Logger logger = Logger.getLogger(DataTowerController.class); + + + @ApiOperation("查询客流") + @PostMapping("/queryCustomer") + public ResultData queryCustomer() { + + List series = new ArrayList<>(); + + List seriesdata = new ArrayList<>(); + seriesdata.add(1); + seriesdata.add(2); + seriesdata.add(3); + seriesdata.add(4); + seriesdata.add(5); + seriesdata.add(6); + seriesdata.add(7); + seriesdata.add(8); + seriesdata.add(9); + seriesdata.add(10); + seriesdata.add(11); + seriesdata.add(12); + seriesdata.add(13); + seriesdata.add(14); + seriesdata.add(15); + seriesdata.add(16); + seriesdata.add(17); + seriesdata.add(18); + series.add(seriesdata); + seriesdata = new ArrayList<>(); + seriesdata.add(10); + seriesdata.add(20); + seriesdata.add(30); + seriesdata.add(40); + seriesdata.add(50); + seriesdata.add(60); + seriesdata.add(70); + seriesdata.add(80); + seriesdata.add(90); + seriesdata.add(100); + seriesdata.add(110); + seriesdata.add(120); + seriesdata.add(130); + seriesdata.add(140); + seriesdata.add(150); + seriesdata.add(160); + seriesdata.add(170); + seriesdata.add(180); + series.add(seriesdata); + seriesdata = new ArrayList<>(); + seriesdata.add(100); + seriesdata.add(200); + seriesdata.add(300); + seriesdata.add(400); + seriesdata.add(500); + seriesdata.add(600); + seriesdata.add(700); + seriesdata.add(800); + seriesdata.add(900); + seriesdata.add(1000); + seriesdata.add(1100); + seriesdata.add(1200); + seriesdata.add(1300); + seriesdata.add(1400); + seriesdata.add(1500); + seriesdata.add(1600); + seriesdata.add(1700); + seriesdata.add(1800); + series.add(seriesdata); + + return new ResultData(series); + } + + +} diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java index 5f53b334a..2d9e31e61 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java @@ -29,6 +29,7 @@ public class WxMerchantController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { if (null == wxMerchant) wxMerchant = new WxMerchant(); + wxMerchant.setTenantId(getTenantId()); final PageInfo page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java index 670a55d95..aba2ccfc8 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java @@ -13,6 +13,8 @@ import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Map; + @RestController @RequestMapping("wxShop") public class WxShopController extends BaseController @@ -29,7 +31,7 @@ public class WxShopController extends BaseController @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxShop wxShop,Integer pageNum, Integer pageSize) { if (null == wxShop) wxShop = new WxShop(); - final PageInfo page = wxShopService.listAsPage(wxShop, pageNum, pageSize); + final PageInfo> page = wxShopService.listMapAsPage(wxShop, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxShop.java b/mallinkService/src/main/java/com/simple/domain/po/WxShop.java index fc1588d4c..02faf6fde 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxShop.java @@ -55,10 +55,10 @@ public class WxShop implements Serializable { private String operationArea; /*楼座号**/ @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") - private String building; + private Long building; /*楼层号**/ @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") - private Integer floor; + private Long floor; /*状态(0:未出租, 1:已出租)**/ @io.swagger.annotations.ApiModelProperty(value="状态(0:未出租, 1:已出租)",name="status") private Integer status; @@ -114,16 +114,16 @@ public class WxShop implements Serializable { public void setOperationArea(String _operationArea) { operationArea = _operationArea; } - public String getBuilding() { + public Long getBuilding() { return building; } - public void setBuilding(String _building) { + public void setBuilding(Long _building) { building = _building; } - public Integer getFloor() { + public Long getFloor() { return floor; } - public void setFloor(Integer _floor) { + public void setFloor(Long _floor) { floor = _floor; } public Integer getStatus() { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxShopMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxShopMapper.java index 3db1381d5..0826f98a0 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxShopMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxShopMapper.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.WxShop; +import java.util.List; +import java.util.Map; + public interface WxShopMapper extends CommonMapper { List findList(WxShop wxShop); - - - - - + + List> findListMap(WxShop record); + } diff --git a/mallinkService/src/main/java/com/simple/service/WxShopService.java b/mallinkService/src/main/java/com/simple/service/WxShopService.java index 60e56ed3f..5d4ea485f 100644 --- a/mallinkService/src/main/java/com/simple/service/WxShopService.java +++ b/mallinkService/src/main/java/com/simple/service/WxShopService.java @@ -15,7 +15,9 @@ public interface WxShopService { * @return */ PageInfo listAsPage(WxShop record, Integer pageIndex, Integer pageSize); - + + PageInfo> listMapAsPage(WxShop record, Integer pageIndex, Integer pageSize); + /** * 根据Id获得实体 * diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java index a431bbdf8..e8742fe88 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java @@ -22,6 +22,14 @@ public class WxShopServiceImpl implements WxShopService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxShopMapper.findList(record)); } + @Override + public PageInfo> listMapAsPage(WxShop record, Integer pageIndex, Integer pageSize) { + List> shops = wxShopMapper.findListMap(record); + PageHelper.startPage(pageIndex, pageSize); + PageInfo> pageInfo = new PageInfo<>(shops); + return pageInfo; + } + @Override public WxShop getById(Long id) { return wxShopMapper.selectByPrimaryKey(id); diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 498e7c912..d595a8d49 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -1,130 +1,228 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`shop_number`,`build_area`,`operation_area`,`building`,`floor`,`status`,`x`,`y`,`addr`,`baidu_poi`,`longitude`,`latitude`,`create_date`,`update_date`,`img_url` - - where 1 = 1 - - - and `id` = #{id} - - - - - and `tenant_id` like concat('%', #{tenantId},'%') - - - - - and `shop_number` like concat('%', #{shopNumber},'%') - - - - - and `build_area` like concat('%', #{buildArea},'%') - - - - - and `operation_area` like concat('%', #{operationArea},'%') - - - - - and `building` like concat('%', #{building},'%') - - - - - and `floor` = #{floor} - - - - - and `status` = #{status} - - - - - and `x` = #{x} - - - - - and `y` = #{y} - - - - - and `addr` like concat('%', #{addr},'%') - - - - - and `baidu_poi` like concat('%', #{baiduPoi},'%') - - - - - and `longitude` = #{longitude} - - - - - and `latitude` = #{latitude} - - - - - and `create_date` = #{createDate} - - - - - and `update_date` = #{updateDate} - - - - and id in - - #{idItem} - - - order by ${sortColumns} - - - + select + + from wx_shop + + + + - - - - - - + +