From c6cf1f6a5ed38c638105f480c89391697ea303eb Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sun, 22 Aug 2021 00:32:33 +0800 Subject: [PATCH 1/4] fix map --- .../db/migration/V202109010001__fengniao_map_config.sql | 4 +++- .../main/java/com/iformall/domain/po/FengNiaoMapConfig.java | 2 ++ .../src/main/resources/mapper/FengNiaoMapConfigMapper.xml | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) 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..9e4c3dd28 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,6 @@ 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 '默认显示第几层'; \ No newline at end of file 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..6af7645aa 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,6 @@ public class FengNiaoMapConfig extends BaseEntity { private String shopTypeId; private String remark; + + private String defaultFloor; } diff --git a/mallinkService/src/main/resources/mapper/FengNiaoMapConfigMapper.xml b/mallinkService/src/main/resources/mapper/FengNiaoMapConfigMapper.xml index 705caaffa..606244e7b 100644 --- a/mallinkService/src/main/resources/mapper/FengNiaoMapConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/FengNiaoMapConfigMapper.xml @@ -9,10 +9,11 @@ + - `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` From 337dd4a69e1db911f9725993aa3cbb8a65719a51 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sun, 22 Aug 2021 01:09:51 +0800 Subject: [PATCH 3/4] fix map --- .../controller/FengNiaoMapController.java | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 mallinkCApi/src/main/java/com/iformall/controller/FengNiaoMapController.java 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); + } + } +} From ac567e6ad22167831ba498c662cf5f0ff8461306 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sun, 22 Aug 2021 01:16:32 +0800 Subject: [PATCH 4/4] fix tags --- mallinkService/src/main/resources/mapper/WxTagsMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxTagsMapper.xml b/mallinkService/src/main/resources/mapper/WxTagsMapper.xml index 830b8bcf1..11c97b2b1 100644 --- a/mallinkService/src/main/resources/mapper/WxTagsMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTagsMapper.xml @@ -71,7 +71,7 @@ from wx_tags - and (`tenant_id` = #{tenantId} or tenant_id is null or tenant_id = '') + where (`tenant_id` = #{tenantId} or tenant_id is null or tenant_id = '')