Browse Source

Merge branch 'release_toaliyun_20210901' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_20210901

release_toaliyun_real
xhxu 4 years ago
parent
commit
f4394225d6
5 changed files with 62 additions and 3 deletions
  1. +5
    -1
      mallinkAdmin/src/main/resources/db/migration/V202109010001__fengniao_map_config.sql
  2. +49
    -0
      mallinkCApi/src/main/java/com/iformall/controller/FengNiaoMapController.java
  3. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/FengNiaoMapConfig.java
  4. +3
    -1
      mallinkService/src/main/resources/mapper/FengNiaoMapConfigMapper.xml
  5. +1
    -1
      mallinkService/src/main/resources/mapper/WxTagsMapper.xml

+ 5
- 1
mallinkAdmin/src/main/resources/db/migration/V202109010001__fengniao_map_config.sql View File

@@ -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;
) 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文件';

+ 49
- 0
mallinkCApi/src/main/java/com/iformall/controller/FengNiaoMapController.java View File

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

+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/po/FengNiaoMapConfig.java View File

@@ -27,4 +27,8 @@ public class FengNiaoMapConfig extends BaseEntity {
private String shopTypeId;
private String remark;
private Integer defaultFloor;
private String themeId;
}

+ 3
- 1
mallinkService/src/main/resources/mapper/FengNiaoMapConfigMapper.xml View File

@@ -9,10 +9,12 @@
<result column="map_id" jdbcType="VARCHAR" property="mapId"/>
<result column="shop_type_id" jdbcType="VARCHAR" property="shopTypeId"/>
<result column="remark" jdbcType="VARCHAR" property="remark"/>
<result column="default_floor" jdbcType="INTEGER" property="defaultFloor"/>
<result column="theme_id" jdbcType="VARCHAR" property="themeId"/>
</resultMap>

<sql id="allColumns">
`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`
</sql>

<select id="findByTenantId" parameterType="String" resultMap="BaseResultMap" >


+ 1
- 1
mallinkService/src/main/resources/mapper/WxTagsMapper.xml View File

@@ -71,7 +71,7 @@
<include refid="allColumnsVo"/>
from wx_tags
<if test=" null != tenantId ">
and (`tenant_id` = #{tenantId} or tenant_id is null or tenant_id = '')
where (`tenant_id` = #{tenantId} or tenant_id is null or tenant_id = '')
</if>
</select>
</mapper>

Loading…
Cancel
Save