Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-auth
Overview
Overview
Details
Activity
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
base_platform_enterprise
gic-platform-auth
Commits
cebc5417
Commit
cebc5417
authored
Apr 28, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加接口
parent
64e2cc1c
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
67 additions
and
16 deletions
+67
-16
ResourceController.java
.../java/com/gic/auth/web/controller/ResourceController.java
+4
-6
ChannelResourceVO.java
.../src/main/java/com/gic/auth/web/vo/ChannelResourceVO.java
+5
-0
OrderResourceVO.java
...eb/src/main/java/com/gic/auth/web/vo/OrderResourceVO.java
+4
-2
ResourceVO.java
...uth-web/src/main/java/com/gic/auth/web/vo/ResourceVO.java
+8
-8
SmsSignResourceVO.java
.../src/main/java/com/gic/auth/web/vo/SmsSignResourceVO.java
+46
-0
No files found.
gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/ResourceController.java
View file @
cebc5417
...
...
@@ -3,9 +3,7 @@ package com.gic.auth.web.controller;
import
com.alibaba.fastjson.JSON
;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.auth.dto.ChannelResourceDTO
;
import
com.gic.auth.dto.ResourceDTO
;
import
com.gic.auth.dto.SmsSignResourceDTO
;
import
com.gic.auth.service.ResourceApiService
;
import
com.gic.auth.web.qo.OrderResourceQO
;
import
com.gic.auth.web.qo.PageQO
;
...
...
@@ -135,13 +133,13 @@ public class ResourceController {
vo
.
setOrderResourceJSON
(
orderResourceList
);
}
if
(
StringUtils
.
isNotBlank
(
dto
.
getSmsSignResourceJson
()))
{
SmsSignResource
DT
O
smsSignResourceDTO
=
JSON
.
parseObject
(
dto
.
getSmsSignResourceJson
(),
SmsSignResource
DT
O
.
class
);
SmsSignResource
V
O
smsSignResourceDTO
=
JSON
.
parseObject
(
dto
.
getSmsSignResourceJson
(),
SmsSignResource
V
O
.
class
);
vo
.
setSmsResourceJSON
(
smsSignResourceDTO
);
}
if
(
StringUtils
.
isNotBlank
(
dto
.
getChannelResourceJson
()))
{
ChannelResource
DT
O
channelResourceDTO
=
JSON
.
parseObject
(
dto
.
getChannelResourceJson
(),
ChannelResource
DT
O
.
class
);
ChannelResource
V
O
channelResourceDTO
=
JSON
.
parseObject
(
dto
.
getChannelResourceJson
(),
ChannelResource
V
O
.
class
);
vo
.
setChannelResourceJSON
(
channelResourceDTO
);
}
return
RestResponse
.
success
(
vo
);
...
...
gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/ChannelResourceVO.java
View file @
cebc5417
package
com
.
gic
.
auth
.
web
.
vo
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
java.io.Serializable
;
import
java.util.List
;
...
...
@@ -11,8 +13,11 @@ import java.util.List;
public
class
ChannelResourceVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
7372101518056686792L
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
private
List
<
Long
>
cardConfigIdList
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
private
List
<
Long
>
appletConfigIdList
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
private
List
<
Long
>
serviceConfigIdList
;
public
List
<
Long
>
getCardConfigIdList
()
{
...
...
gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/OrderResourceVO.java
View file @
cebc5417
package
com
.
gic
.
auth
.
web
.
vo
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
java.io.Serializable
;
import
java.util.List
;
...
...
@@ -21,10 +23,10 @@ public class OrderResourceVO implements Serializable {
/**
* channel:2 或者 channel:3时 传店铺ids,
*/
//
@JsonFormat(shape = JsonFormat.Shape.STRING)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
private
List
<
Long
>
storeContent
;
//
@JsonFormat(shape = JsonFormat.Shape.STRING)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
private
Long
storeWidgetId
;
public
Integer
getChannel
()
{
...
...
gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/ResourceVO.java
View file @
cebc5417
package
com
.
gic
.
auth
.
web
.
vo
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.gic.auth.dto.ChannelResourceDTO
;
import
com.gic.auth.dto.SmsSignResourceDTO
;
import
java.io.Serializable
;
import
java.util.List
;
...
...
@@ -30,11 +28,13 @@ public class ResourceVO implements Serializable{
*/
private
Integer
enterpriseId
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
private
Long
userResource
;
/**
* 门店资源
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
private
Long
storeResource
;
/**
...
...
@@ -42,13 +42,13 @@ public class ResourceVO implements Serializable{
*/
private
List
<
OrderResourceVO
>
orderResourceJSON
;
private
SmsSignResource
DT
O
smsResourceJSON
;
private
SmsSignResource
V
O
smsResourceJSON
;
private
Integer
userResourceCount
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
private
Long
goodsResourceId
;
private
ChannelResource
DT
O
channelResourceJSON
;
private
ChannelResource
V
O
channelResourceJSON
;
public
Integer
getResourceId
()
{
return
resourceId
;
...
...
@@ -98,11 +98,11 @@ public class ResourceVO implements Serializable{
this
.
orderResourceJSON
=
orderResourceJSON
;
}
public
SmsSignResource
DT
O
getSmsResourceJSON
()
{
public
SmsSignResource
V
O
getSmsResourceJSON
()
{
return
smsResourceJSON
;
}
public
void
setSmsResourceJSON
(
SmsSignResource
DT
O
smsResourceJSON
)
{
public
void
setSmsResourceJSON
(
SmsSignResource
V
O
smsResourceJSON
)
{
this
.
smsResourceJSON
=
smsResourceJSON
;
}
...
...
@@ -122,11 +122,11 @@ public class ResourceVO implements Serializable{
this
.
goodsResourceId
=
goodsResourceId
;
}
public
ChannelResource
DT
O
getChannelResourceJSON
()
{
public
ChannelResource
V
O
getChannelResourceJSON
()
{
return
channelResourceJSON
;
}
public
void
setChannelResourceJSON
(
ChannelResource
DT
O
channelResourceJSON
)
{
public
void
setChannelResourceJSON
(
ChannelResource
V
O
channelResourceJSON
)
{
this
.
channelResourceJSON
=
channelResourceJSON
;
}
}
gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/SmsSignResourceVO.java
0 → 100644
View file @
cebc5417
package
com
.
gic
.
auth
.
web
.
vo
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
java.io.Serializable
;
import
java.util.List
;
/**
*
* @Description:
* @author zhiwj
* @date 2019-12-17 16:46
*/
public
class
SmsSignResourceVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
6009818220117316815L
;
private
String
ids
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
private
List
<
Long
>
idList
;
// 1:全部 2:部分
private
Integer
type
;
public
String
getIds
()
{
return
ids
;
}
public
void
setIds
(
String
ids
)
{
this
.
ids
=
ids
;
}
public
List
<
Long
>
getIdList
()
{
return
idList
;
}
public
void
setIdList
(
List
<
Long
>
idList
)
{
this
.
idList
=
idList
;
}
public
Integer
getType
()
{
return
type
;
}
public
void
setType
(
Integer
type
)
{
this
.
type
=
type
;
}
}
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