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
4c61cc99
Commit
4c61cc99
authored
Jul 12, 2019
by
libin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
会员
parent
7bb19fd2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
17 deletions
+7
-17
UserMemberController.java
...hub/wxiaoqi/security/admin/rest/UserMemberController.java
+0
-17
UserMemberAdminController.java
.../security/admin/rest/admin/UserMemberAdminController.java
+7
-0
No files found.
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/UserMemberController.java
View file @
4c61cc99
package
com
.
github
.
wxiaoqi
.
security
.
admin
.
rest
;
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
;
import
org.apache.commons.io.IOUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.util.List
;
/**
* ${DESCRIPTION}
...
...
@@ -66,8 +53,4 @@ public class UserMemberController {
)
throws
Exception
{
return
memberBiz
.
upMemberDays
(
userId
,
days
,
type
);
}
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/UserMemberAdminController.java
View file @
4c61cc99
...
...
@@ -6,6 +6,8 @@ import com.github.wxiaoqi.security.admin.dto.UserMemberSaveDTO;
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
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.apache.commons.io.IOUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.http.HttpStatus
;
...
...
@@ -26,11 +28,13 @@ import java.util.List;
*/
@RestController
@RequestMapping
(
"/admin/member"
)
@Api
(
"后台*会员管理"
)
public
class
UserMemberAdminController
{
@Autowired
private
BaseUserMemberExportBiz
baseUserMemberExportBiz
;
@ApiOperation
(
"批量导入会员"
)
@PostMapping
(
"/user/export"
)
public
ObjectRestResponse
importUserMember
(
@RequestPart
(
"file"
)
MultipartFile
userMemberExcel
)
{
List
<
String
[]>
userMemberData
=
ExcelImport
.
getExcelData
(
userMemberExcel
);
...
...
@@ -52,6 +56,7 @@ public class UserMemberAdminController {
}
@ApiOperation
(
"会员excel模板下载"
)
@GetMapping
(
"/app/unauth/user/excel_model/dowload"
)
public
ResponseEntity
<
byte
[]>
dowloadUserMemberExcelModel
(
HttpServletResponse
response
){
// 重置response
...
...
@@ -68,6 +73,8 @@ public class UserMemberAdminController {
}
return
ResponseEntity
.
status
(
HttpStatus
.
BAD_REQUEST
).
body
(
null
);
}
@ApiOperation
(
"会员新增"
)
@PostMapping
(
"/save"
)
public
ObjectRestResponse
<
Void
>
saveUserMember
(
@RequestBody
UserMemberSaveDTO
userMemberSaveDTO
)
{
baseUserMemberExportBiz
.
saveUserMember
(
userMemberSaveDTO
);
...
...
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