diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/FengNiaoMapController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/FengNiaoMapController.java new file mode 100644 index 000000000..08aca96b0 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/FengNiaoMapController.java @@ -0,0 +1,46 @@ +package com.iformall.controller.market; + +import com.iformall.common.Result; +import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.FengNiaoMapConfig; +import com.iformall.service.FengNiaoMapService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + +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; + + @ApiOperation("查询地图配置") + @GetMapping("/getConfig") + public ResultData getConfig() { + String tenantId = ifParentUpdateTenantInfo().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/mallinkAdmin/src/main/resources/db/migration/V202109010001__fengniao_map_config.sql b/mallinkAdmin/src/main/resources/db/migration/V202109010001__fengniao_map_config.sql new file mode 100644 index 000000000..006e10059 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V202109010001__fengniao_map_config.sql @@ -0,0 +1,10 @@ +CREATE TABLE `fengniao_map_config` ( + `id` bigint(20) NOT NULL, + `tenant_id` varchar(5) NOT NULL, + `app_key` varchar(40) NOT NULL COMMENT '蜂鸟地图-我的应用,key值', + `app_name` varchar(100) DEFAULT NULL COMMENT '蜂鸟地图-我的应用,名称', + `map_id` varchar(40) DEFAULT NULL COMMENT '蜂鸟地图-制图,地图编号', + `shop_type_id` text COMMENT '判定为门店的类型的编号。根据地图类型来配置', + `remark` text COMMENT '说明', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; \ 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 new file mode 100644 index 000000000..c70ec8d3e --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/FengNiaoMapConfig.java @@ -0,0 +1,30 @@ +package com.iformall.domain.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@TableName(value = "fengniao_map_config") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class FengNiaoMapConfig extends BaseEntity { + + private static final long serialVersionUID = 1L; + + private Long id; + + private String tenantId; + + private String appKey; + + private String appName; + + private String mapId; + + private String shopTypeId; + + private String remark; +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/FengNiaoMapConfigMapper.java b/mallinkService/src/main/java/com/iformall/mapper/FengNiaoMapConfigMapper.java new file mode 100644 index 000000000..7cf5df80e --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/FengNiaoMapConfigMapper.java @@ -0,0 +1,10 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.FengNiaoMapConfig; +import org.apache.ibatis.annotations.Param; + +public interface FengNiaoMapConfigMapper extends CommonMapper { + + FengNiaoMapConfig findByTenantId(@Param("tenantId")String tenantId); +} diff --git a/mallinkService/src/main/java/com/iformall/service/FengNiaoMapService.java b/mallinkService/src/main/java/com/iformall/service/FengNiaoMapService.java new file mode 100644 index 000000000..d164a0745 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/FengNiaoMapService.java @@ -0,0 +1,8 @@ +package com.iformall.service; + +import com.iformall.domain.po.FengNiaoMapConfig; + +public interface FengNiaoMapService { + + FengNiaoMapConfig getConfigByTenantId(String tenantId); +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/FengNiaoMapServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/FengNiaoMapServiceImpl.java new file mode 100644 index 000000000..023b1faaa --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/impl/FengNiaoMapServiceImpl.java @@ -0,0 +1,22 @@ +package com.iformall.service.impl; + +import com.iformall.domain.po.FengNiaoMapConfig; +import com.iformall.mapper.FengNiaoMapConfigMapper; +import com.iformall.service.FengNiaoMapService; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class FengNiaoMapServiceImpl implements FengNiaoMapService { + + @Autowired + private FengNiaoMapConfigMapper fengNiaoMapConfigMapper; + + @Override + public FengNiaoMapConfig getConfigByTenantId(String tenantId) { + return fengNiaoMapConfigMapper.findByTenantId(tenantId); + } + + +} diff --git a/mallinkService/src/main/resources/mapper/FengNiaoMapConfigMapper.xml b/mallinkService/src/main/resources/mapper/FengNiaoMapConfigMapper.xml new file mode 100644 index 000000000..a2e0f3209 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/FengNiaoMapConfigMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + `id`,`tenant_id`,`app_key`,`app_name`,`map_id`,`shop_type_id`,`remark` + + + + +