From 153eddb1b770b54c4f082336c7f95c9fa828613e Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 14 Aug 2019 15:02:08 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=A5=BC=E5=BA=A7=E9=9D=A2=E7=A7=AF][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E6=B7=BB=E5=8A=A0=E6=A5=BC=E5=BA=A7?= =?UTF-8?q?=E9=9D=A2=E7=A7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V201908141417__FLOOR_AREA.sql | 4 ++++ .../com/iformall/domain/po/WxMallFloor.java | 5 ++++ .../service/WxMallBuildingService.java | 8 +++++++ .../impl/WxMallBuildingServiceImpl.java | 23 ++++++++++++++++++- .../java/com/iformall/utils/Constant.java | 3 +++ .../resources/mapper/WxMallFloorMapper.xml | 4 +++- .../basic/WxMallBuildingController.java | 20 ++++++++++++++++ 7 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201908141417__FLOOR_AREA.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201908141417__FLOOR_AREA.sql b/mallinkAdmin/src/main/resources/db/migration/V201908141417__FLOOR_AREA.sql new file mode 100644 index 000000000..97e836b6c --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201908141417__FLOOR_AREA.sql @@ -0,0 +1,4 @@ +ALTER TABLE `wx_mall_floor` +ADD COLUMN `operating_area` `operating_area` decimal(10,2) NULL COMMENT '营业面积', +ADD COLUMN `total_area` `total_area` decimal(10,2) NULL COMMENT '总面积' +; \ 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 ae9c496d7..a1b6da5cc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import javax.persistence.*; +import java.math.BigDecimal; import java.util.*; import javax.persistence.Transient; import java.util.List; @@ -31,6 +32,10 @@ public class WxMallFloor extends BaseEntity { private String floorName; @io.swagger.annotations.ApiModelProperty(value="底图路径",name="backgroundImg") private String backgroundImg; + @io.swagger.annotations.ApiModelProperty(value="总面积",name="totalArea") + private BigDecimal totalArea; + @io.swagger.annotations.ApiModelProperty(value="营业面积",name="operatingArea") + private BigDecimal operatingArea; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") diff --git a/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java b/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java index 59d703841..b75de2a71 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxMallBuildingFloorDto; import com.iformall.domain.po.WxMallBuilding; +import com.iformall.domain.po.WxMallFloor; public interface WxMallBuildingService { @@ -51,4 +52,11 @@ public interface WxMallBuildingService { */ void addBuildingAndFloors(WxMallBuildingFloorDto record); + /** + * 保存楼层楼座面积 + * + * @param record + */ + void saveFloorArea(WxMallFloor record); + } 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 80e45f051..48ddd4fa0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java @@ -10,6 +10,7 @@ import com.iformall.domain.po.WxMallFloor; import com.iformall.mapper.WxMallBuildingMapper; import com.iformall.mapper.WxMallFloorMapper; import com.iformall.service.WxMallBuildingService; +import com.iformall.utils.Constant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -82,6 +83,12 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { WxMallFloor tempf = new WxMallFloor(); tempf.setId(f.getId()); tempf.setFloorName(f.getFloorName()); + if (f.getTotalArea() != null) { + tempf.setTotalArea(f.getTotalArea()); + } + if (f.getOperatingArea() != null) { + tempf.setOperatingArea(f.getOperatingArea()); + } return tempf; }).collect(Collectors.toList()); building.setFloors(wxMallFloors); @@ -112,10 +119,24 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { mallFloor.setTenantId(record.getTenantId()); mallFloor.setBuildingId(mallBuilding.getId()); mallFloor.setFloorName(floor); - mallFloor.setBackgroundImg("https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/789/9eea8e0e-15ea-4be0-a43d-31e2e9d8db8c.jpg"); + mallFloor.setBackgroundImg(Constant.floor_back_img); wxMallFloorMapper.insertSelective(mallFloor); } } + @Override + public void saveFloorArea(WxMallFloor record) { + WxMallFloor mallFloor = new WxMallFloor(); + mallFloor.setId(record.getId()); + mallFloor.setTenantId(record.getTenantId()); + if (record.getTotalArea() != null) { + mallFloor.setTotalArea(record.getTotalArea()); + } + if (record.getOperatingArea() != null) { + mallFloor.setOperatingArea(record.getOperatingArea()); + } + wxMallFloorMapper.updateByPrimaryKeySelective(mallFloor); + } + } diff --git a/mallinkService/src/main/java/com/iformall/utils/Constant.java b/mallinkService/src/main/java/com/iformall/utils/Constant.java index 8daefc128..3447c5646 100644 --- a/mallinkService/src/main/java/com/iformall/utils/Constant.java +++ b/mallinkService/src/main/java/com/iformall/utils/Constant.java @@ -31,4 +31,7 @@ public class Constant { public static final String importMemPrev = "importmem:"; public static final String adminPage = "https://admin.malls.iformall.com"; + + + public static final String floor_back_img = "https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/789/9eea8e0e-15ea-4be0-a43d-31e2e9d8db8c.jpg"; } diff --git a/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml b/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml index e29b3da19..27e17f901 100644 --- a/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml @@ -10,10 +10,12 @@ + + - `id`,`tenant_id`,`mall_id`,`building_id`,`floor_name`,`background_img`,`create_date`,`update_date` + `id`,`tenant_id`,`mall_id`,`building_id`,`floor_name`,`background_img`,`create_date`,`update_date`,`total_area`,`operating_area` diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java index 805efbaa6..056d362ec 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java @@ -8,6 +8,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.WxMallBuildingFloorDto; import com.iformall.domain.po.WxMallBuilding; +import com.iformall.domain.po.WxMallFloor; import com.iformall.service.WxMallBuildingService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -116,5 +117,24 @@ public class WxMallBuildingController extends BaseController { return new ResultData(); } + @ApiOperation("保存楼层楼座面积") + @PostMapping("saveFloorArea") + @SystemControllerLog(description = "商城-楼座/楼层-保存面积") + public ResultData saveFloorArea(@RequestBody WxMallFloor record) { + logger.debug("[" + getIpAddr() + "] WxMallBuildingController::addBuildingAndFloor"); + if(record == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + if (record.getId() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + if (record.getTotalArea() == null && record.getOperatingArea() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + record.setTenantId(getTenantId()); + wxMallBuildingService.saveFloorArea(record); + return new ResultData(); + } + }