Sfoglia il codice sorgente

build

release_toaliyun_real
xhxu 5 anni fa
parent
commit
43ac35c875
6 ha cambiato i file con 41 aggiunte e 5 eliminazioni
  1. +1
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java
  2. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V202101120001__ADD_wx_mall_floor.sql
  3. +18
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java
  5. +14
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java
  6. +4
    -1
      mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml

+ 1
- 3
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java Vedi File

@@ -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();
} }
} }


+ 2
- 0
mallinkAdmin/src/main/resources/db/migration/V202101120001__ADD_wx_mall_floor.sql Vedi File

@@ -0,0 +1,2 @@
ALTER TABLE `wx_mall_floor`
ADD COLUMN `floor_map` json COMMENT '地图' AFTER `total_area`;

+ 18
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java Vedi File

@@ -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;
}
} }

+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java Vedi File

@@ -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);
} }

+ 14
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java Vedi File

@@ -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);
}



} }

+ 4
- 1
mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml Vedi File

@@ -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">


Caricamento…
Annulla
Salva