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
c40fa373
Commit
c40fa373
authored
Sep 20, 2019
by
hanfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改峰会实体
parent
f6a09e73
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
4 deletions
+32
-4
ActivityShow.java
...in/java/com/xxfc/platform/summit/entity/ActivityShow.java
+4
-4
ActivityBiz.java
...c/main/java/com/xxfc/platform/summit/biz/ActivityBiz.java
+16
-0
ActivityController.java
...m/xxfc/platform/summit/controller/ActivityController.java
+12
-0
No files found.
xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/entity/ActivityShow.java
View file @
c40fa373
...
@@ -23,11 +23,11 @@ public class ActivityShow {
...
@@ -23,11 +23,11 @@ public class ActivityShow {
@Column
(
name
=
"activity_id"
)
@Column
(
name
=
"activity_id"
)
@ApiModelProperty
(
"活动id"
)
@ApiModelProperty
(
"活动id"
)
private
String
activityId
;
private
Integer
activityId
;
@Column
(
name
=
"type"
)
@Column
(
name
=
"type"
)
@ApiModelProperty
(
"1-图片;2-视频"
)
@ApiModelProperty
(
"1-图片;2-视频"
)
private
String
type
;
private
Integer
type
;
@Column
(
name
=
"path"
)
@Column
(
name
=
"path"
)
@ApiModelProperty
(
"图片或视频路径"
)
@ApiModelProperty
(
"图片或视频路径"
)
...
@@ -35,11 +35,11 @@ public class ActivityShow {
...
@@ -35,11 +35,11 @@ public class ActivityShow {
@Column
(
name
=
"crt_time"
)
@Column
(
name
=
"crt_time"
)
@ApiModelProperty
(
"创建时间"
)
@ApiModelProperty
(
"创建时间"
)
private
Stri
ng
crtTime
;
private
Lo
ng
crtTime
;
@Column
(
name
=
"is_del"
)
@Column
(
name
=
"is_del"
)
@ApiModelProperty
(
"是否删除:0-正常;1-删除"
)
@ApiModelProperty
(
"是否删除:0-正常;1-删除"
)
private
String
isDel
;
private
Integer
isDel
;
}
}
xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBiz.java
View file @
c40fa373
...
@@ -8,6 +8,8 @@ import com.xxfc.platform.summit.mapper.ActivityMapper;
...
@@ -8,6 +8,8 @@ import com.xxfc.platform.summit.mapper.ActivityMapper;
import
com.xxfc.platform.summit.pojo.ActivityQuery
;
import
com.xxfc.platform.summit.pojo.ActivityQuery
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.interceptor.TransactionAspectSupport
;
import
tk.mybatis.mapper.entity.Example
;
import
tk.mybatis.mapper.entity.Example
;
import
java.util.List
;
import
java.util.List
;
...
@@ -40,4 +42,18 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
...
@@ -40,4 +42,18 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
return
new
PageInfo
<
Activity
>(
activities
);
return
new
PageInfo
<
Activity
>(
activities
);
}
}
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
Boolean
update
(
Activity
activity
)
{
try
{
activity
.
setUpdTime
(
System
.
currentTimeMillis
());
mapper
.
updateByPrimaryKeySelective
(
activity
);
return
true
;
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
TransactionAspectSupport
.
currentTransactionStatus
().
setRollbackOnly
();
return
false
;
}
}
}
}
xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/ActivityController.java
View file @
c40fa373
...
@@ -20,4 +20,16 @@ public class ActivityController extends BaseController<ActivityBiz, Activity> {
...
@@ -20,4 +20,16 @@ public class ActivityController extends BaseController<ActivityBiz, Activity> {
return
ObjectRestResponse
.
succ
(
baseBiz
.
getList
(
query
));
return
ObjectRestResponse
.
succ
(
baseBiz
.
getList
(
query
));
}
}
@Override
@PutMapping
(
"/update"
)
public
ObjectRestResponse
update
(
@RequestBody
Activity
activity
){
if
(
baseBiz
.
update
(
activity
))
{
return
ObjectRestResponse
.
succ
();
}
return
ObjectRestResponse
.
createDefaultFail
();
}
}
}
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