Просмотр исходного кода

[商铺商户][修改]:查询更改,building、floor字段修改

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
3827cba914
8 измененных файлов: 341 добавлений и 137 удалений
  1. +94
    -0
      mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java
  2. +1
    -0
      mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java
  3. +3
    -1
      mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java
  4. +6
    -6
      mallinkService/src/main/java/com/simple/domain/po/WxShop.java
  5. +6
    -7
      mallinkService/src/main/java/com/simple/mapper/WxShopMapper.java
  6. +3
    -1
      mallinkService/src/main/java/com/simple/service/WxShopService.java
  7. +8
    -0
      mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java
  8. +220
    -122
      mallinkService/src/main/resources/mapper/WxShopMapper.xml

+ 94
- 0
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<List> series = new ArrayList<>();

List<Integer> 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);
}


}

+ 1
- 0
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<WxMerchant> page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize);
return new ResultData(page);
}


+ 3
- 1
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<WxShop> page = wxShopService.listAsPage(wxShop, pageNum, pageSize);
final PageInfo<Map<String,Object>> page = wxShopService.listMapAsPage(wxShop, pageNum, pageSize);
return new ResultData(page);
}



+ 6
- 6
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() {


+ 6
- 7
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<WxShop, String> {

List<WxShop> findList(WxShop wxShop);


List<Map<String,Object>> findListMap(WxShop record);
}

+ 3
- 1
mallinkService/src/main/java/com/simple/service/WxShopService.java Просмотреть файл

@@ -15,7 +15,9 @@ public interface WxShopService {
* @return
*/
PageInfo<WxShop> listAsPage(WxShop record, Integer pageIndex, Integer pageSize);

PageInfo<Map<String,Object>> listMapAsPage(WxShop record, Integer pageIndex, Integer pageSize);

/**
* 根据Id获得实体
*


+ 8
- 0
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<Map<String,Object>> listMapAsPage(WxShop record, Integer pageIndex, Integer pageSize) {
List<Map<String,Object>> shops = wxShopMapper.findListMap(record);
PageHelper.startPage(pageIndex, pageSize);
PageInfo<Map<String,Object>> pageInfo = new PageInfo<>(shops);
return pageInfo;
}

@Override
public WxShop getById(Long id) {
return wxShopMapper.selectByPrimaryKey(id);


+ 220
- 122
mallinkService/src/main/resources/mapper/WxShopMapper.xml Просмотреть файл

@@ -1,130 +1,228 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.simple.mapper.WxShopMapper">
<resultMap id="BaseResultMap" type="com.simple.domain.po.WxShop">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId" />
<result column="shop_number" jdbcType="VARCHAR" property="shopNumber" />
<result column="build_area" jdbcType="VARCHAR" property="buildArea" />
<result column="operation_area" jdbcType="VARCHAR" property="operationArea" />
<result column="building" jdbcType="VARCHAR" property="building" />
<result column="floor" jdbcType="INTEGER" property="floor" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="x" jdbcType="DECIMAL" property="x" />
<result column="y" jdbcType="DECIMAL" property="y" />
<result column="addr" jdbcType="VARCHAR" property="addr" />
<result column="baidu_poi" jdbcType="VARCHAR" property="baiduPoi" />
<result column="longitude" jdbcType="DECIMAL" property="longitude" />
<result column="latitude" jdbcType="DECIMAL" property="latitude" />
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
<result column="img_url" jdbcType="VARCHAR" property="imgUrl" />

</resultMap>
<sql id="allColumns">
<resultMap id="BaseResultMap" type="com.simple.domain.po.WxShop">
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
<result column="shop_number" jdbcType="VARCHAR" property="shopNumber"/>
<result column="build_area" jdbcType="VARCHAR" property="buildArea"/>
<result column="operation_area" jdbcType="VARCHAR" property="operationArea"/>
<result column="building" jdbcType="BIGINT" property="building"/>
<result column="floor" jdbcType="BIGINT" property="floor"/>
<result column="status" jdbcType="INTEGER" property="status"/>
<result column="x" jdbcType="DECIMAL" property="x"/>
<result column="y" jdbcType="DECIMAL" property="y"/>
<result column="addr" jdbcType="VARCHAR" property="addr"/>
<result column="baidu_poi" jdbcType="VARCHAR" property="baiduPoi"/>
<result column="longitude" jdbcType="DECIMAL" property="longitude"/>
<result column="latitude" jdbcType="DECIMAL" property="latitude"/>
<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
<result column="img_url" jdbcType="VARCHAR" property="imgUrl"/>
</resultMap>

<sql id="allColumns">
`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`
</sql>

<sql id="dynamicWhereConditions">
where 1 = 1
<if test=" null != id ">
and `id` = #{id}
</if>
<if test=" null != tenantId ">
and `tenant_id` like concat('%', #{tenantId},'%')
</if>
<if test=" null != shopNumber ">
and `shop_number` like concat('%', #{shopNumber},'%')
</if>
<if test=" null != buildArea ">
and `build_area` like concat('%', #{buildArea},'%')
</if>
<if test=" null != operationArea ">
and `operation_area` like concat('%', #{operationArea},'%')
</if>
<if test=" null != building ">
and `building` like concat('%', #{building},'%')
</if>
<if test=" null != floor ">
and `floor` = #{floor}
</if>
<if test=" null != status ">
and `status` = #{status}
</if>
<if test=" null != x ">
and `x` = #{x}
</if>
<if test=" null != y ">
and `y` = #{y}
</if>
<if test=" null != addr ">
and `addr` like concat('%', #{addr},'%')
</if>
<if test=" null != baiduPoi ">
and `baidu_poi` like concat('%', #{baiduPoi},'%')
</if>
<if test=" null != longitude ">
and `longitude` = #{longitude}
</if>
<if test=" null != latitude ">
and `latitude` = #{latitude}
</if>
<if test=" null != createDate ">
and `create_date` = #{createDate}
</if>
<if test=" null != updateDate ">
and `update_date` = #{updateDate}
</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns"> order by ${sortColumns} </if>
</sql>
<select id="findList" parameterType="com.simple.domain.po.WxShop" resultMap="BaseResultMap">
select <include refid="allColumns" /> from wx_shop
<include refid="dynamicWhereConditions" />
<sql id="dynamicWhereConditions">
where 1 = 1

<if test=" null != id ">
and `id` = #{id}

</if>

<if test=" null != tenantId ">
and `tenant_id` like concat('%', #{tenantId},'%')

</if>

<if test=" null != shopNumber ">
and `shop_number` like concat('%', #{shopNumber},'%')

</if>

<if test=" null != buildArea ">
and `build_area` like concat('%', #{buildArea},'%')

</if>

<if test=" null != operationArea ">
and `operation_area` like concat('%', #{operationArea},'%')

</if>

<if test=" null != building ">
and `building` like concat('%', #{building},'%')

</if>

<if test=" null != floor ">
and `floor` = #{floor}

</if>

<if test=" null != status ">
and `status` = #{status}

</if>

<if test=" null != x ">
and `x` = #{x}

</if>

<if test=" null != y ">
and `y` = #{y}

</if>

<if test=" null != addr ">
and `addr` like concat('%', #{addr},'%')

</if>

<if test=" null != baiduPoi ">
and `baidu_poi` like concat('%', #{baiduPoi},'%')

</if>

<if test=" null != longitude ">
and `longitude` = #{longitude}

</if>

<if test=" null != latitude ">
and `latitude` = #{latitude}

</if>

<if test=" null != createDate ">
and `create_date` = #{createDate}

</if>

<if test=" null != updateDate ">
and `update_date` = #{updateDate}

</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns">order by ${sortColumns}</if>
</sql>

<select id="findList" parameterType="com.simple.domain.po.WxShop" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from wx_shop
<include refid="dynamicWhereConditions"/>
</select>

<select id="findListMap" parameterType="com.simple.domain.po.WxShop" resultType="hashmap">

select s.id,s.shop_number shopNumber,s.build_area buildArea,
s.img_url imgUrl,s.operation_area operationArea,
s.status,b.name buildName,f.floor_name floorName
from wx_shop s left join wx_mall_building b
on s.building=b.id
left join wx_mall_floor f on s.floor=f.id
where 1 = 1

<if test=" null != id ">
and s.`id` = #{id}

</if>

<if test=" null != tenantId ">
and s.`tenant_id` like concat('%', #{tenantId},'%')

</if>

<if test=" null != shopNumber ">
and s.`shop_number` like concat('%', #{shopNumber},'%')

</if>

<if test=" null != buildArea ">
and s.`build_area` like concat('%', #{buildArea},'%')

</if>

<if test=" null != operationArea ">
and s.`operation_area` like concat('%', #{operationArea},'%')

</if>

<if test=" null != building ">
and s.`building`= #{building}

</if>

<if test=" null != floor ">
and s.`floor` = #{floor}

</if>

<if test=" null != status ">
and s.`status` = #{status}

</if>

<if test=" null != x ">
and s.`x` = #{x}

</if>

<if test=" null != y ">
and s.`y` = #{y}

</if>

<if test=" null != addr ">
and s.`addr` like concat('%', #{addr},'%')

</if>

<if test=" null != baiduPoi ">
and s.`baidu_poi` like concat('%', #{baiduPoi},'%')

</if>

<if test=" null != longitude ">
and s.`longitude` = #{longitude}

</if>

<if test=" null != latitude ">
and s.`latitude` = #{latitude}

</if>

<if test=" null != createDate ">
and s.`create_date` = #{createDate}

</if>

<if test=" null != updateDate ">
and s.`update_date` = #{updateDate}

</if>
<if test=" null != ids ">
and s.id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns">order by s.${sortColumns}</if>



</select>


</mapper>

Загрузка…
Отмена
Сохранить