Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cash-loan-flow-boss
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
QG
cash-loan-flow-boss
Commits
b3b9efe6
Commit
b3b9efe6
authored
Aug 06, 2019
by
suntao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
通过切面注入channelId ,确点channelId 必须是第一个参数
parent
3553c113
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
15 deletions
+16
-15
ChannelConfController.java
...lowboss/api/channel/controller/ChannelConfController.java
+4
-3
ChannelConf.java
...cashloanflowboss/api/channel/entity/boss/ChannelConf.java
+1
-1
ChannelConfRepository.java
...ss/api/channel/repository/boss/ChannelConfRepository.java
+1
-1
ChannelConfService.java
...hloanflowboss/api/channel/service/ChannelConfService.java
+7
-8
RoleDataLoadAspect.java
...roup/cashloanflowboss/core/aspect/RoleDataLoadAspect.java
+3
-2
No files found.
src/main/java/cn/quantgroup/cashloanflowboss/api/channel/controller/ChannelConfController.java
View file @
b3b9efe6
package
cn
.
quantgroup
.
cashloanflowboss
.
api
.
channel
.
controller
;
import
cn.quantgroup.cashloanflowboss.api.channel.model.ChannelListModel
;
import
cn.quantgroup.cashloanflowboss.api.channel.util.ChannelConfUtil
;
import
cn.quantgroup.cashloanflowboss.core.annotation.RoleDataLoad
;
import
cn.quantgroup.cashloanflowboss.spi.clf.entity.ChannelConfiguration
;
import
cn.quantgroup.cashloanflowboss.api.channel.service.ChannelConfService
;
...
...
@@ -27,14 +28,14 @@ public class ChannelConfController {
@RoleDataLoad
@PostMapping
(
"/info"
)
public
Page
<
ChannelListModel
>
channelInfo
(
Integer
channelId
,
Integer
pageNumber
,
Integer
pageSize
)
{
public
Page
<
ChannelListModel
>
channelInfo
(
Long
channelId
,
Integer
pageNumber
,
Integer
pageSize
)
{
return
channelConfService
.
getChannelInfo
(
pageNumber
,
pageSize
,
channelId
);
}
@GetMapping
(
"/cfg/info"
)
public
Result
channelConfInfo
(
Integer
channelId
)
{
return
channelConfService
.
getChannelConf
(
channelId
);
public
Result
channelConfInfo
(
Long
channelId
)
{
return
Result
.
buildSuccess
(
channelConfService
.
getChannelConf
(
channelId
),
"success"
);
}
...
...
src/main/java/cn/quantgroup/cashloanflowboss/api/channel/entity/boss/ChannelConf.java
View file @
b3b9efe6
...
...
@@ -18,7 +18,7 @@ public class ChannelConf extends Primary {
* 渠道id
*/
@Column
(
name
=
"channel_id"
)
private
Integer
channelId
;
private
Long
channelId
;
/**
* 渠道code
...
...
src/main/java/cn/quantgroup/cashloanflowboss/api/channel/repository/boss/ChannelConfRepository.java
View file @
b3b9efe6
...
...
@@ -18,7 +18,7 @@ public interface ChannelConfRepository extends JpaRepository<ChannelConf, Long>
* @param channelId 用户名
* @return
*/
ChannelConf
getByChannelId
(
Integer
channelId
);
ChannelConf
getByChannelId
(
Long
channelId
);
}
src/main/java/cn/quantgroup/cashloanflowboss/api/channel/service/ChannelConfService.java
View file @
b3b9efe6
package
cn
.
quantgroup
.
cashloanflowboss
.
api
.
channel
.
service
;
import
java.util.
Date
;
import
java.util.
*
;
import
cn.quantgroup.cashloanflowboss.api.channel.entity.boss.ChannelConf
;
import
cn.quantgroup.cashloanflowboss.api.channel.model.ChannelListModel
;
...
...
@@ -15,9 +15,6 @@ import org.springframework.data.domain.PageRequest;
import
org.springframework.stereotype.Service
;
import
javax.persistence.criteria.Predicate
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Objects
;
/**
* function:
...
...
@@ -37,7 +34,7 @@ public class ChannelConfService {
public
Page
<
ChannelListModel
>
getChannelInfo
(
Integer
pageNumber
,
Integer
pageSize
,
Integer
channelId
)
{
public
Page
<
ChannelListModel
>
getChannelInfo
(
Integer
pageNumber
,
Integer
pageSize
,
Long
channelId
)
{
Page
<
ChannelConfiguration
>
page
=
this
.
clfChannelConfigurationRepository
.
findAll
((
root
,
criteriaQuery
,
criteriaBuilder
)
->
{
...
...
@@ -45,9 +42,11 @@ public class ChannelConfService {
// 指定渠道号
if
(
Objects
.
nonNull
(
channelId
))
{
predicates
.
add
(
criteriaBuilder
.
equal
(
root
.
get
(
"
channelId"
),
channelId
));
predicates
.
add
(
criteriaBuilder
.
equal
(
root
.
get
(
"
registeredFrom"
),
channelId
.
longValue
()
));
}
// 设置查询条件
criteriaQuery
.
where
(
criteriaBuilder
.
and
(
predicates
.
toArray
(
new
Predicate
[
predicates
.
size
()])));
// 指定排序
criteriaQuery
.
orderBy
(
criteriaBuilder
.
desc
(
root
.
get
(
"id"
)));
...
...
@@ -69,9 +68,9 @@ public class ChannelConfService {
}
public
Result
getChannelConf
(
Integer
channelId
)
{
public
Map
<
String
,
Object
>
getChannelConf
(
Long
channelId
)
{
ChannelConf
channelConf
=
channelConfRepository
.
getByChannelId
(
channelId
);
return
Result
.
buildSuccess
(
ChannelConfUtil
.
channelConfConvertVOModel
(
channelConf
),
"success"
);
return
ChannelConfUtil
.
channelConfConvertVOModel
(
channelConf
);
}
...
...
src/main/java/cn/quantgroup/cashloanflowboss/core/aspect/RoleDataLoadAspect.java
View file @
b3b9efe6
...
...
@@ -45,13 +45,14 @@ public class RoleDataLoadAspect {
UserSessionInfo
userSessionInfo
=
userSessionService
.
findUserSessionInfo
();
if
(
annotation
!=
null
&&
"channel_role"
.
equals
(
userSessionInfo
.
getRoleInfo
().
getRoleName
()))
{
System
.
out
.
println
(
userSessionInfo
.
getChannelId
()
);
args
[
0
]
=
userSessionInfo
.
getChannelId
(
);
}
try
{
return
pjp
.
proceed
(
args
);
}
catch
(
Throwable
throwable
)
{
return
Result
.
buildFial
(
ExceptionUtils
.
getMessage
(
throwable
));
System
.
out
.
println
(
ExceptionUtils
.
getStackTrace
(
throwable
));
return
"1"
;
}
}
...
...
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