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
e0d8a51f
Commit
e0d8a51f
authored
Jun 19, 2019
by
libin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
营地
parent
d81b08a4
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
51 additions
and
13 deletions
+51
-13
CampsiteShopDTO.java
.../java/com/xxfc/platform/campsite/dto/CampsiteShopDTO.java
+4
-10
CampsiteShop.java
.../java/com/xxfc/platform/campsite/entity/CampsiteShop.java
+12
-0
CampsiteTag.java
...n/java/com/xxfc/platform/campsite/entity/CampsiteTag.java
+8
-3
CampsiteTagBiz.java
...n/java/com/xxfc/platform/campsite/biz/CampsiteTagBiz.java
+9
-0
CampsiteTagMapper.java
.../com/xxfc/platform/campsite/mapper/CampsiteTagMapper.java
+4
-0
CampsiteTagController.java
...om/xxfc/platform/campsite/rest/CampsiteTagController.java
+14
-0
No files found.
xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/dto/CampsiteShopDTO.java
View file @
e0d8a51f
...
@@ -17,14 +17,9 @@ import java.io.Serializable;
...
@@ -17,14 +17,9 @@ import java.io.Serializable;
*/
*/
@Data
@Data
@Table
(
name
=
"campsite_shop"
)
@Table
(
name
=
"campsite_shop"
)
@ApiModel
(
value
=
"营地店铺
v
o"
)
@ApiModel
(
value
=
"营地店铺
dt
o"
)
public
class
CampsiteShopDTO
implements
Serializable
{
public
class
CampsiteShopDTO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
@ApiModelProperty
(
"主键id"
)
private
Integer
id
;
/**
/**
* 店铺名称
* 店铺名称
*/
*/
...
@@ -164,10 +159,9 @@ public class CampsiteShopDTO implements Serializable {
...
@@ -164,10 +159,9 @@ public class CampsiteShopDTO implements Serializable {
private
Long
updTime
;
private
Long
updTime
;
/**
/**
*
是否删除:0-正常;1-删除
*
热度值
*/
*/
@ApiModelProperty
(
value
=
"是否删除:0-正常;1-删除"
)
@ApiModelProperty
(
value
=
"热度值"
)
private
Integer
isDel
;
private
Integer
hot
;
}
}
xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/entity/CampsiteShop.java
View file @
e0d8a51f
...
@@ -196,5 +196,17 @@ public class CampsiteShop implements Serializable {
...
@@ -196,5 +196,17 @@ public class CampsiteShop implements Serializable {
@ApiModelProperty
(
value
=
"是否删除:0-正常;1-删除"
)
@ApiModelProperty
(
value
=
"是否删除:0-正常;1-删除"
)
private
Integer
isDel
;
private
Integer
isDel
;
/**
* 热度值
*/
@Column
(
name
=
"hot"
)
@ApiModelProperty
(
value
=
"热度值"
)
private
Integer
hot
;
/**
* 上下架状态 0-创建状态 1-上架 2-下架
*/
@Column
(
name
=
"sale_state"
)
@ApiModelProperty
(
value
=
"上下架状态 0-创建状态 1-上架 2-下架"
)
private
Integer
saleState
;
}
}
xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/entity/CampsiteTag.java
View file @
e0d8a51f
...
@@ -59,9 +59,9 @@ public class CampsiteTag implements Serializable {
...
@@ -59,9 +59,9 @@ public class CampsiteTag implements Serializable {
/**
/**
* 创建时间
* 创建时间
*/
*/
@Column
(
name
=
"c
tr
_time"
)
@Column
(
name
=
"c
rt
_time"
)
@ApiModelProperty
(
value
=
"创建时间"
)
@ApiModelProperty
(
value
=
"创建时间"
)
private
Long
c
tr
Time
;
private
Long
c
rt
Time
;
/**
/**
* 更新时间
* 更新时间
...
@@ -77,5 +77,10 @@ public class CampsiteTag implements Serializable {
...
@@ -77,5 +77,10 @@ public class CampsiteTag implements Serializable {
@ApiModelProperty
(
value
=
"是否删除:0-正常;1-删除"
)
@ApiModelProperty
(
value
=
"是否删除:0-正常;1-删除"
)
private
Integer
isDel
;
private
Integer
isDel
;
/**
* 标签底图
*/
@Column
(
name
=
"tag_url"
)
@ApiModelProperty
(
value
=
"标签底图"
)
private
String
tagUrl
;
}
}
xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/biz/CampsiteTagBiz.java
View file @
e0d8a51f
...
@@ -36,4 +36,13 @@ public class CampsiteTagBiz extends BaseBiz<CampsiteTagMapper,CampsiteTag> {
...
@@ -36,4 +36,13 @@ public class CampsiteTagBiz extends BaseBiz<CampsiteTagMapper,CampsiteTag> {
List
<
CampsiteTagListVo
>
campsiteTagListVos
=
JSONObject
.
parseObject
(
JSONObject
.
toJSONString
(
campsiteTagListDTOS
),
new
TypeReference
<
List
<
CampsiteTagListVo
>>(){});
List
<
CampsiteTagListVo
>
campsiteTagListVos
=
JSONObject
.
parseObject
(
JSONObject
.
toJSONString
(
campsiteTagListDTOS
),
new
TypeReference
<
List
<
CampsiteTagListVo
>>(){});
return
campsiteTagListVos
;
return
campsiteTagListVos
;
}
}
/**
* 更新营地类型状态
* @param tagId
* @return
*/
public
int
updateCampsiteTagStatus
(
int
tagId
)
{
return
mapper
.
updateCampsiteTagStatus
(
tagId
,
1
);
}
}
}
\ No newline at end of file
xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/mapper/CampsiteTagMapper.java
View file @
e0d8a51f
...
@@ -2,6 +2,7 @@ package com.xxfc.platform.campsite.mapper;
...
@@ -2,6 +2,7 @@ package com.xxfc.platform.campsite.mapper;
import
com.xxfc.platform.campsite.dto.CampsiteTagListDTO
;
import
com.xxfc.platform.campsite.dto.CampsiteTagListDTO
;
import
com.xxfc.platform.campsite.entity.CampsiteTag
;
import
com.xxfc.platform.campsite.entity.CampsiteTag
;
import
org.apache.ibatis.annotations.Update
;
import
tk.mybatis.mapper.common.Mapper
;
import
tk.mybatis.mapper.common.Mapper
;
import
java.util.List
;
import
java.util.List
;
...
@@ -21,4 +22,7 @@ public interface CampsiteTagMapper extends Mapper<CampsiteTag> {
...
@@ -21,4 +22,7 @@ public interface CampsiteTagMapper extends Mapper<CampsiteTag> {
* @return
* @return
*/
*/
List
<
CampsiteTagListDTO
>
findCampsiteTags
();
List
<
CampsiteTagListDTO
>
findCampsiteTags
();
//@Update("update `campsite_tag` set `is_del`=#{status} where ")
int
updateCampsiteTagStatus
(
int
tagId
,
int
status
);
}
}
xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/rest/CampsiteTagController.java
View file @
e0d8a51f
...
@@ -7,6 +7,7 @@ import com.xxfc.platform.campsite.biz.CampsiteTagBiz;
...
@@ -7,6 +7,7 @@ import com.xxfc.platform.campsite.biz.CampsiteTagBiz;
import
com.xxfc.platform.campsite.entity.CampsiteTag
;
import
com.xxfc.platform.campsite.entity.CampsiteTag
;
import
com.xxfc.platform.campsite.vo.CampsiteTagListVo
;
import
com.xxfc.platform.campsite.vo.CampsiteTagListVo
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
...
@@ -33,4 +34,17 @@ public class CampsiteTagController extends BaseController<CampsiteTagBiz,Campsit
...
@@ -33,4 +34,17 @@ public class CampsiteTagController extends BaseController<CampsiteTagBiz,Campsit
return
ObjectRestResponse
.
succ
(
campsiteTagListVolist
);
return
ObjectRestResponse
.
succ
(
campsiteTagListVolist
);
}
}
/**
* 根据id删除
* @param id
* @return
*/
@Override
public
ObjectRestResponse
<
CampsiteTag
>
remove
(
@PathVariable
(
"id"
)
int
id
)
{
int
effectRows
=
getBaseBiz
().
updateCampsiteTagStatus
(
id
);
if
(
effectRows
>
0
){
ObjectRestResponse
.
succ
();
}
return
ObjectRestResponse
.
createDefaultFail
();
}
}
}
\ No newline at end of file
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