diff --git a/mallinkAdmin/src/main/resources/db/migration/V202109010001__fengniao_map_config.sql b/mallinkAdmin/src/main/resources/db/migration/V202109010001__fengniao_map_config.sql index 3efd17507..fd2538e4e 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202109010001__fengniao_map_config.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202109010001__fengniao_map_config.sql @@ -8,4 +8,8 @@ CREATE TABLE `fengniao_map_config` ( `remark` text COMMENT '说明', PRIMARY KEY (`id`), UNIQUE KEY `UNIQUE_TENANT_ID` (`tenant_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +ALTER TABLE fengniao_map_config ADD COLUMN default_floor VARCHAR(5) COMMENT '默认显示第几层'; + +ALTER TABLE fengniao_map_config ADD COLUMN theme_id VARCHAR(20) COMMENT '主题编号,金茂地图文件,theme文件夹下面的目录即编号,并且该文件夹下面存在同名的.theme文件'; \ No newline at end of file diff --git a/mallinkCApi/src/main/java/com/iformall/controller/FengNiaoMapController.java b/mallinkCApi/src/main/java/com/iformall/controller/FengNiaoMapController.java new file mode 100644 index 000000000..c28a1fa6f --- /dev/null +++ b/mallinkCApi/src/main/java/com/iformall/controller/FengNiaoMapController.java @@ -0,0 +1,49 @@ +package com.iformall.controller; + +import com.iformall.annotation.RedisCache; +import com.iformall.common.Result; +import com.iformall.common.ResultData; +import com.iformall.domain.po.FengNiaoMapConfig; +import com.iformall.service.FengNiaoMapService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + +import java.util.concurrent.TimeUnit; + +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author gongbiao + */ +@RestController +@RequestMapping("fengniaomap") +@Api(description = "蜂鸟地图") +public class FengNiaoMapController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private FengNiaoMapService fengNiaoMapService; + + @RedisCache(expireTime = 3600, dateUnit = TimeUnit.SECONDS) + @ApiOperation("查询地图配置") + @GetMapping("/getConfig") + public ResultData getConfig() { + String tenantId = getTenantInfo().getTenantId(); + if (!StringUtils.isBlank(tenantId)) { + try { + FengNiaoMapConfig config = fengNiaoMapService.getConfigByTenantId(tenantId); + return new ResultData(Result.SUCCESS, "查询成功", config); + }catch(Exception e) { + logger.error("fengniaomap getConfig error.",e); + return new ResultData(Result.SUCCESS, "查询成功", null); + } + + }else { + return new ResultData(Result.SUCCESS, "查询成功", null); + } + } +} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/FengNiaoMapConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/FengNiaoMapConfig.java index c70ec8d3e..40040909d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/FengNiaoMapConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/FengNiaoMapConfig.java @@ -27,4 +27,8 @@ public class FengNiaoMapConfig extends BaseEntity { private String shopTypeId; private String remark; + + private Integer defaultFloor; + + private String themeId; } diff --git a/mallinkService/src/main/resources/mapper/FengNiaoMapConfigMapper.xml b/mallinkService/src/main/resources/mapper/FengNiaoMapConfigMapper.xml index 705caaffa..0ba641097 100644 --- a/mallinkService/src/main/resources/mapper/FengNiaoMapConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/FengNiaoMapConfigMapper.xml @@ -9,10 +9,12 @@ + + - `id`,`tenant_id`,`app_key`,`app_name`,`map_id`,`shop_type_id`,`remark` + `id`,`tenant_id`,`app_key`,`app_name`,`map_id`,`shop_type_id`,`remark`,`default_floor`,`theme_id`