From 43ac35c87527ae7be5ae16956f4fb461c4f33f47 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 12 Jan 2021 15:10:12 +0800 Subject: [PATCH] build --- .../basic/WxMallBuildingController.java | 4 +--- .../V202101120001__ADD_wx_mall_floor.sql | 2 ++ .../com/iformall/domain/po/WxMallFloor.java | 18 ++++++++++++++++++ .../service/WxMallBuildingService.java | 2 ++ .../impl/WxMallBuildingServiceImpl.java | 15 ++++++++++++++- .../resources/mapper/WxMallFloorMapper.xml | 5 ++++- 6 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V202101120001__ADD_wx_mall_floor.sql diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java index ab0eb023b..ccb3d112b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java @@ -47,9 +47,7 @@ public class WxMallBuildingController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } floor.updateTenantInfo(getTenantInfo()); - floor.setTotalArea(null); - floor.setOperatingArea(null); - wxMallBuildingService.saveFloorArea(floor); + wxMallBuildingService.saveFloorImg(floor); return new ResultData(); } } diff --git a/mallinkAdmin/src/main/resources/db/migration/V202101120001__ADD_wx_mall_floor.sql b/mallinkAdmin/src/main/resources/db/migration/V202101120001__ADD_wx_mall_floor.sql new file mode 100644 index 000000000..7d139160e --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V202101120001__ADD_wx_mall_floor.sql @@ -0,0 +1,2 @@ +ALTER TABLE `wx_mall_floor` +ADD COLUMN `floor_map` json COMMENT '地图' AFTER `total_area`; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java index 1060ab8ee..6b67b2afa 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java @@ -1,9 +1,13 @@ package com.iformall.domain.po; +import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.google.gson.JsonObject; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; import java.util.*; @@ -31,5 +35,19 @@ public class WxMallFloor extends TenantEntity { private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; + + @io.swagger.annotations.ApiModelProperty(value="地图",name="floorMap") + private String floorMap; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="",name="") + private List floorMaps; + + public List getFloorMaps(){ + if(StringUtils.isNotBlank(floorMap)){ + floorMaps = JSONArray.parseArray(floorMap,Map.class); + } + return floorMaps; + } } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java b/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java index 8de2c765f..5471dd4ff 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java @@ -69,4 +69,6 @@ public interface WxMallBuildingService { void saveFloorArea(WxMallFloor record); void deleteByTenantId(String tenantId); + + void saveFloorImg(WxMallFloor floor); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java index 2ce2a5aaa..47bb5d8fe 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java @@ -190,7 +190,6 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { if (record.getOperatingArea() != null) { setOperatingArea(record.getOperatingArea()); } - setBackgroundImg(record.getBackgroundImg()); }}; wxMallFloorMapper.updateById(mallFloor); } @@ -200,5 +199,19 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { wxMallBuildingMapper.deleteByTenantId(tenantId); } + @Override + public void saveFloorImg(WxMallFloor record) { + WxMallFloor mallFloor = new WxMallFloor() {{ + setId(record.getId()); + updateTenantInfo(record); + if(record.getFloorMaps() == null || record.getFloorMaps().size() == 0){ + setFloorMap("[]"); + }else{ + setFloorMap(JSON.toJSONString(record.getFloorMaps())); + } + }}; + wxMallFloorMapper.updateById(mallFloor); + } + } diff --git a/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml b/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml index ddf4fd1d2..83f2d8aaf 100644 --- a/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml @@ -13,10 +13,13 @@ + + + - `id`,`tenant_id`,`parent_tenant_id`,`mall_id`,`building_id`,`floor_name`,`background_img`,`create_date`,`update_date`,`total_area`,`operating_area` + `id`,`tenant_id`,`parent_tenant_id`,`mall_id`,`building_id`,`floor_name`,`background_img`,`create_date`,`update_date`,`total_area`,`operating_area`,`floor_map`