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
2d07e21f
Commit
2d07e21f
authored
Jul 11, 2019
by
hanfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改会员
parent
1faaf47b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
+10
-3
AppUserManageDTO.java
...m/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java
+6
-0
BaseUserMemberBiz.java
.../github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java
+1
-1
UserMemberController.java
...hub/wxiaoqi/security/admin/rest/UserMemberController.java
+3
-2
No files found.
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java
View file @
2d07e21f
...
...
@@ -52,4 +52,10 @@ public class AppUserManageDTO {
*/
private
Integer
source
;
/**
*
*/
private
String
registrationDate
;
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java
View file @
2d07e21f
...
...
@@ -220,7 +220,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
return
;
}
else
if
(
baseUserMembers
.
size
()==
1
){
baseUserMember
.
setUpdTime
(
System
.
currentTimeMillis
());
updateSelectiveById
(
baseUserMember
);
getMyBiz
().
updateSelectiveById
(
baseUserMember
);
}
else
{
throw
new
BaseException
(
"Member purchase repeat!"
);
}
...
...
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/UserMemberController.java
View file @
2d07e21f
...
...
@@ -4,6 +4,7 @@ import com.github.wxiaoqi.security.admin.AdminBootstrap;
import
com.github.wxiaoqi.security.admin.biz.BaseUserMemberBiz
;
import
com.github.wxiaoqi.security.admin.biz.BaseUserMemberExportBiz
;
import
com.github.wxiaoqi.security.admin.dto.UserMemberDTO
;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken
;
import
com.github.wxiaoqi.security.common.exception.BaseException
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.util.excel.ExcelImport
;
...
...
@@ -67,7 +68,7 @@ public class UserMemberController {
}
@PostMapping
(
"/user/export"
)
public
ObjectRestResponse
importUserMember
(
MultipartFile
userMemberExcel
)
{
public
ObjectRestResponse
importUserMember
(
@RequestPart
(
"file"
)
MultipartFile
userMemberExcel
)
{
List
<
String
[]>
userMemberData
=
ExcelImport
.
getExcelData
(
userMemberExcel
);
if
(
userMemberData
.
size
()
<
1
)
{
return
ObjectRestResponse
.
createFailedResult
(
1001
,
"导入不能没数据!!!"
);
...
...
@@ -86,7 +87,7 @@ public class UserMemberController {
}
}
@GetMapping
(
"/user/excel_model/dowload"
)
@GetMapping
(
"/
app/unauth/
user/excel_model/dowload"
)
public
ResponseEntity
<
byte
[]>
dowloadUserMemberExcelModel
(
HttpServletResponse
response
){
// 重置response
response
.
reset
();
...
...
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