Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
8291d678
Commit
8291d678
authored
Jul 05, 2019
by
libin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
campsite bug 修复
parent
5103f818
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
172 additions
and
96 deletions
+172
-96
CampsiteShopDetailDTO.java
...com/xxfc/platform/campsite/dto/CampsiteShopDetailDTO.java
+3
-0
CampsiteShopDetailVo.java
...a/com/xxfc/platform/campsite/vo/CampsiteShopDetailVo.java
+3
-0
CampSiteApplication.java
.../java/com/xxfc/platform/campsite/CampSiteApplication.java
+0
-1
CampsiteShopBiz.java
.../java/com/xxfc/platform/campsite/biz/CampsiteShopBiz.java
+160
-92
RedisConfiguration.java
...com/xxfc/platform/campsite/config/RedisConfiguration.java
+5
-2
CampsiteShopMapper.xml
...e-server/src/main/resources/mapper/CampsiteShopMapper.xml
+1
-1
No files found.
xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/dto/CampsiteShopDetailDTO.java
View file @
8291d678
...
...
@@ -65,4 +65,7 @@ public class CampsiteShopDetailDTO {
@ApiModelProperty
(
value
=
"纬度"
)
private
Double
latitude
;
@ApiModelProperty
(
value
=
"电话"
)
private
String
phone
;
}
xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/vo/CampsiteShopDetailVo.java
View file @
8291d678
...
...
@@ -89,4 +89,7 @@ public class CampsiteShopDetailVo {
*/
@ApiModelProperty
(
"轮播图列表"
)
private
List
<
CampsiteShopCarouselDetailVo
>
campsiteShopCarouselDetailVos
;
@ApiModelProperty
(
value
=
"電話"
)
private
String
phone
;
}
xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/CampSiteApplication.java
View file @
8291d678
...
...
@@ -26,7 +26,6 @@ import tk.mybatis.spring.annotation.MapperScan;
@EnableScheduling
@EnableFeignClients
(
value
=
{
"com.github.wxiaoqi.security.auth.client.feign"
,
"com.github.wxiaoqi.security.admin.feign"
,
"com.xxfc.platform"
},
defaultConfiguration
=
HeaderConfig
.
class
)
@EnableAceCache
@EnableCaching
@MapperScan
(
basePackages
=
"com.xxfc.platform.campsite.mapper"
)
public
class
CampSiteApplication
{
public
static
void
main
(
String
[]
args
)
{
...
...
xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/biz/CampsiteShopBiz.java
View file @
8291d678
This diff is collapsed.
Click to expand it.
xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/config/RedisConfiguration.java
View file @
8291d678
...
...
@@ -5,9 +5,12 @@ import org.springframework.context.annotation.Configuration;
import
org.springframework.context.annotation.Primary
;
import
org.springframework.data.redis.connection.RedisConnectionFactory
;
import
org.springframework.data.redis.core.RedisTemplate
;
import
org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer
;
import
org.springframework.data.redis.serializer.RedisSerializer
;
import
org.springframework.data.redis.serializer.StringRedisSerializer
;
import
java.util.Objects
;
/**
* ${DESCRIPTION}
*
...
...
@@ -19,7 +22,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
@Primary
public
class
RedisConfiguration
{
@Bean
@Bean
(
"customRedisTemplate"
)
public
RedisTemplate
<
String
,
Object
>
customRedisTemplate
(
RedisConnectionFactory
factory
)
{
RedisTemplate
redisTemplate
=
new
RedisTemplate
();
redisTemplate
.
setConnectionFactory
(
factory
);
...
...
@@ -27,7 +30,7 @@ public class RedisConfiguration {
redisTemplate
.
setKeySerializer
(
stringSerializer
);
redisTemplate
.
setValueSerializer
(
stringSerializer
);
redisTemplate
.
setHashKeySerializer
(
stringSerializer
);
redisTemplate
.
setHashValueSerializer
(
stringSerializer
);
redisTemplate
.
setHashValueSerializer
(
new
Jackson2JsonRedisSerializer
<
Object
>(
Object
.
class
)
);
redisTemplate
.
afterPropertiesSet
();
return
redisTemplate
;
}
...
...
xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml
View file @
8291d678
...
...
@@ -58,7 +58,7 @@
<!--根据id查询详情-->
<select
id=
"findCampsiteShopDetailById"
resultType=
"com.xxfc.platform.campsite.dto.CampsiteShopDetailDTO"
>
select `name` as `name`,`province_name` as `provinceName`,`city_name` as `cityName`,`address` as `address`,
select `name` as `name`,`province_name` as `provinceName`,`city_name` as `cityName`,`address` as `address`,
`service_phone` as `phone`,
`content` as `content`,`configure` as `configure`,`longitude` as `longitude`,`latitude` as `latitude` from `campsite_shop` where `id`=#{id}
</select>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment