| @@ -47,9 +47,7 @@ public class WxMallBuildingController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| } | } | ||||
| floor.updateTenantInfo(getTenantInfo()); | floor.updateTenantInfo(getTenantInfo()); | ||||
| floor.setTotalArea(null); | |||||
| floor.setOperatingArea(null); | |||||
| wxMallBuildingService.saveFloorArea(floor); | |||||
| wxMallBuildingService.saveFloorImg(floor); | |||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| } | } | ||||
| @@ -0,0 +1,2 @@ | |||||
| ALTER TABLE `wx_mall_floor` | |||||
| ADD COLUMN `floor_map` json COMMENT '地图' AFTER `total_area`; | |||||
| @@ -1,9 +1,13 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.alibaba.fastjson.JSONArray; | |||||
| import com.baomidou.mybatisplus.annotation.TableField; | |||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.google.gson.JsonObject; | |||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import org.apache.commons.lang3.StringUtils; | |||||
| import java.math.BigDecimal; | import java.math.BigDecimal; | ||||
| import java.util.*; | import java.util.*; | ||||
| @@ -31,5 +35,19 @@ public class WxMallFloor extends TenantEntity { | |||||
| private Date createDate; | private Date createDate; | ||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date 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<Map> floorMaps; | |||||
| public List<Map> getFloorMaps(){ | |||||
| if(StringUtils.isNotBlank(floorMap)){ | |||||
| floorMaps = JSONArray.parseArray(floorMap,Map.class); | |||||
| } | |||||
| return floorMaps; | |||||
| } | |||||
| } | } | ||||
| @@ -69,4 +69,6 @@ public interface WxMallBuildingService { | |||||
| void saveFloorArea(WxMallFloor record); | void saveFloorArea(WxMallFloor record); | ||||
| void deleteByTenantId(String tenantId); | void deleteByTenantId(String tenantId); | ||||
| void saveFloorImg(WxMallFloor floor); | |||||
| } | } | ||||
| @@ -190,7 +190,6 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { | |||||
| if (record.getOperatingArea() != null) { | if (record.getOperatingArea() != null) { | ||||
| setOperatingArea(record.getOperatingArea()); | setOperatingArea(record.getOperatingArea()); | ||||
| } | } | ||||
| setBackgroundImg(record.getBackgroundImg()); | |||||
| }}; | }}; | ||||
| wxMallFloorMapper.updateById(mallFloor); | wxMallFloorMapper.updateById(mallFloor); | ||||
| } | } | ||||
| @@ -200,5 +199,19 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { | |||||
| wxMallBuildingMapper.deleteByTenantId(tenantId); | 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); | |||||
| } | |||||
| } | } | ||||
| @@ -13,10 +13,13 @@ | |||||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | ||||
| <result column="total_area" jdbcType="DECIMAL" property="totalArea"/> | <result column="total_area" jdbcType="DECIMAL" property="totalArea"/> | ||||
| <result column="operating_area" jdbcType="DECIMAL" property="operatingArea"/> | <result column="operating_area" jdbcType="DECIMAL" property="operatingArea"/> | ||||
| <result column="floor_map" jdbcType="VARCHAR" property="floorMap"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `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` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||