记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
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
董敬伟
liquidnet-bus-v1
Commits
166b1f62
Commit
166b1f62
authored
Dec 07, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
commit
parent
60bacbea
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
111 additions
and
11 deletions
+111
-11
MerchantAuthorizationPermissionParam.java
...chant/dto/param/MerchantAuthorizationPermissionParam.java
+13
-1
RedisUtil.java
...java/com.liquidnet.common.cache/redis/util/RedisUtil.java
+2
-2
DataImpl.java
...quidnet/service/platform/service/impl/kylin/DataImpl.java
+96
-8
No files found.
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/param/MerchantAuthorizationPermissionParam.java
View file @
166b1f62
package
com
.
liquidnet
.
service
.
merchant
.
dto
.
param
;
import
com.liquidnet.commons.lang.constant.LnsRegex
;
import
com.liquidnet.service.merchant.dto.vo.MerchantFieldCheckersVo
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
...
...
@@ -10,7 +11,7 @@ import javax.validation.constraints.Pattern;
@ApiModel
(
value
=
"MerchantAuthorizationPermissionParam"
,
description
=
"授权权限"
)
@Data
public
class
MerchantAuthorizationPermissionParam
implements
java
.
io
.
Serializable
{
public
class
MerchantAuthorizationPermissionParam
implements
java
.
io
.
Serializable
,
Cloneable
{
private
static
final
long
serialVersionUID
=
-
8463419578205447151L
;
@ApiModelProperty
(
position
=
10
,
required
=
true
,
value
=
"权限ID"
)
...
...
@@ -23,4 +24,15 @@ public class MerchantAuthorizationPermissionParam implements java.io.Serializabl
@ApiModelProperty
(
position
=
12
,
required
=
false
,
value
=
"授权结束时间[yyyy-MM-dd HH:mm:ss]"
,
example
=
"2021-05-17 20:20:20"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
DATETIME_FULL
,
message
=
"时间格式有误"
)
private
String
endTime
;
private
static
final
MerchantAuthorizationPermissionParam
obj
=
new
MerchantAuthorizationPermissionParam
();
public
static
MerchantAuthorizationPermissionParam
getNew
()
{
try
{
return
(
MerchantAuthorizationPermissionParam
)
obj
.
clone
();
}
catch
(
CloneNotSupportedException
e
)
{
e
.
printStackTrace
();
}
return
new
MerchantAuthorizationPermissionParam
();
}
}
liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisUtil.java
View file @
166b1f62
...
...
@@ -38,8 +38,8 @@ public final class RedisUtil extends AbstractRedisUtil{
"kylin:performances_inventory:ticket:id:575423832945909762737992:surplusGeneral"
,
"kylin:performances_inventory:ticket:id:575424371127296001891205:surplusGeneral"
,
"kylin:performances_inventory:ticket:id:575424699866603521727423:surplusGeneral"
,
"kylin:order:id:5853
35405046292488883367
"
,
"kylin:order:id:5853
37076784250883411769
"
"kylin:order:id:5853
22149365514243983160
"
,
"kylin:order:id:5853
26057257123847506471
"
};
for
(
String
key
:
keys
)
{
long
value
=
key
.
hashCode
();
...
...
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/DataImpl.java
View file @
166b1f62
package
com
.
liquidnet
.
service
.
platform
.
service
.
impl
.
kylin
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.fasterxml.jackson.core.type.TypeReference
;
import
com.liquidnet.common.cache.redis.util.RedisDataSourceUtil
;
import
com.liquidnet.common.exception.LiquidnetServiceException
;
import
com.liquidnet.commons.lang.util.*
;
import
com.liquidnet.service.adam.dto.vo.AdamUserInfoVo
;
import
com.liquidnet.service.adam.mapper.AdamUserMapper
;
...
...
@@ -11,15 +14,11 @@ import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo
;
import
com.liquidnet.service.kylin.entity.KylinPerformanceRelations
;
import
com.liquidnet.service.kylin.mapper.*
;
import
com.liquidnet.service.merchant.constant.MerchantAuthorizationConst
;
import
com.liquidnet.service.merchant.constant.MerchantRedisConst
;
import
com.liquidnet.service.merchant.dto.vo.MerchantFieldAppliesVo
;
import
com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo
;
import
com.liquidnet.service.merchant.dto.vo.MerchantSponsorAppliesVo
;
import
com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo
;
import
com.liquidnet.service.merchant.entity.MerchantFieldApplies
;
import
com.liquidnet.service.merchant.entity.MerchantFields
;
import
com.liquidnet.service.merchant.entity.MerchantSponsorApplies
;
import
com.liquidnet.service.merchant.entity.MerchantSponsors
;
import
com.liquidnet.service.merchant.dto.param.MerchantAuthorizationPermissionParam
;
import
com.liquidnet.service.merchant.dto.vo.*
;
import
com.liquidnet.service.merchant.entity.*
;
import
com.liquidnet.service.merchant.mapper.MerchantFieldAppliesMapper
;
import
com.liquidnet.service.merchant.mapper.MerchantFieldsMapper
;
import
com.liquidnet.service.merchant.mapper.MerchantSponsorAppliesMapper
;
...
...
@@ -46,6 +45,7 @@ import java.time.LocalDateTime;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.stream.Collectors
;
@Service
@Slf4j
...
...
@@ -368,6 +368,8 @@ public class DataImpl {
}
//相关权限迁移
public
void
checkTicket
()
{
}
private
void
judgeSponsor
(
String
sponsorId
,
String
uid
,
MerchantSponsorAppliesVo
appliesVo
,
MerchantSponsorsVo
vo
)
{
...
...
@@ -403,4 +405,90 @@ public class DataImpl {
// MerchantFieldsVo REDIS
redisDataSourceUtil
.
getRedisKylinUtil
().
set
(
MerchantRedisConst
.
INFO_FIELD
.
concat
(
fieldId
),
vo
);
}
private
List
<
MerchantAuthorizationPermissionParam
>
initPermission
(
String
type
)
{
List
<
MerchantAuthorizationPermissionParam
>
checkPermissionParam
=
new
ArrayList
();
MerchantAuthorizationPermissionParam
paramCheck
=
MerchantAuthorizationPermissionParam
.
getNew
();
paramCheck
.
setPermissionId
(
MerchantAuthorizationConst
.
PerformancePermission
.
CHECK
.
getId
());
MerchantAuthorizationPermissionParam
paramSales
=
MerchantAuthorizationPermissionParam
.
getNew
();
paramSales
.
setPermissionId
(
MerchantAuthorizationConst
.
PerformancePermission
.
SALES
.
getId
());
paramSales
.
setStartTime
(
DateUtil
.
getNowTime
());
paramSales
.
setEndTime
(
"2022-10-01 00:00:00"
);
MerchantAuthorizationPermissionParam
paramGrant
=
MerchantAuthorizationPermissionParam
.
getNew
();
paramGrant
.
setPermissionId
(
MerchantAuthorizationConst
.
PerformancePermission
.
GRANT
.
getId
());
MerchantAuthorizationPermissionParam
paramRead
=
MerchantAuthorizationPermissionParam
.
getNew
();
paramRead
.
setPermissionId
(
MerchantAuthorizationConst
.
PerformancePermission
.
READ
.
getId
());
MerchantAuthorizationPermissionParam
paramEdit
=
MerchantAuthorizationPermissionParam
.
getNew
();
paramRead
.
setPermissionId
(
MerchantAuthorizationConst
.
PerformancePermission
.
EDIT
.
getId
());
MerchantAuthorizationPermissionParam
paramLine
=
MerchantAuthorizationPermissionParam
.
getNew
();
paramRead
.
setPermissionId
(
MerchantAuthorizationConst
.
PerformancePermission
.
LINE
.
getId
());
MerchantAuthorizationPermissionParam
paramAudit
=
MerchantAuthorizationPermissionParam
.
getNew
();
paramRead
.
setPermissionId
(
MerchantAuthorizationConst
.
PerformancePermission
.
AUDIT
.
getId
());
switch
(
type
)
{
case
"sponsor"
:
checkPermissionParam
.
add
(
paramCheck
);
checkPermissionParam
.
add
(
paramGrant
);
checkPermissionParam
.
add
(
paramRead
);
checkPermissionParam
.
add
(
paramEdit
);
checkPermissionParam
.
add
(
paramLine
);
checkPermissionParam
.
add
(
paramAudit
);
checkPermissionParam
.
add
(
paramSales
);
break
;
case
"field"
:
checkPermissionParam
.
add
(
paramCheck
);
checkPermissionParam
.
add
(
paramGrant
);
checkPermissionParam
.
add
(
paramRead
);
break
;
case
"check"
:
checkPermissionParam
.
add
(
paramCheck
);
checkPermissionParam
.
add
(
paramSales
);
break
;
}
return
checkPermissionParam
;
}
// 添加权限
private
List
<
MerchantAuthorizationRecords
>
initRecords
(
String
type
,
String
cuid
,
String
performanceId
,
String
fieldOwnId
,
String
checkName
,
String
checkId
,
String
checkMobile
){
LocalDateTime
now
=
LocalDateTime
.
now
();
List
<
MerchantAuthorizationRecords
>
authorizationRecordsArrayList
=
new
ArrayList
<>();
MerchantAuthorizationRecords
authorizationRecords
=
new
MerchantAuthorizationRecords
();
switch
(
type
)
{
case
"sponsor"
:
authorizationRecords
.
setAuthorizationRecordId
(
IDGenerator
.
nextSnowId
());
authorizationRecords
.
setPerformanceId
(
performanceId
);
authorizationRecords
.
setUidRole
(
MerchantAuthorizationConst
.
PerformanceRole
.
CREATOR
.
getRole
());
authorizationRecords
.
setUid
(
cuid
);
authorizationRecords
.
setMobile
(
""
);
authorizationRecords
.
setName
(
""
);
authorizationRecords
.
setCuid
(
""
);
authorizationRecords
.
setCuidRole
(
""
);
authorizationRecords
.
setCreatedAt
(
now
);
break
;
case
"field"
:
authorizationRecords
.
setAuthorizationRecordId
(
IDGenerator
.
nextSnowId
());
authorizationRecords
.
setPerformanceId
(
performanceId
);
authorizationRecords
.
setUidRole
(
MerchantAuthorizationConst
.
PerformanceRole
.
FIELDER
.
getRole
());
authorizationRecords
.
setUid
(
fieldOwnId
);
authorizationRecords
.
setMobile
(
""
);
authorizationRecords
.
setName
(
""
);
authorizationRecords
.
setCuid
(
""
);
authorizationRecords
.
setCuidRole
(
""
);
authorizationRecords
.
setCreatedAt
(
now
);
break
;
case
"check"
:
authorizationRecords
.
setAuthorizationRecordId
(
IDGenerator
.
nextSnowId
());
authorizationRecords
.
setPerformanceId
(
performanceId
);
authorizationRecords
.
setUidRole
(
MerchantAuthorizationConst
.
PerformanceRole
.
CHECKER
.
getRole
());
authorizationRecords
.
setUid
(
checkId
);
authorizationRecords
.
setMobile
(
checkMobile
);
authorizationRecords
.
setName
(
checkName
);
authorizationRecords
.
setCuid
(
fieldOwnId
);
authorizationRecords
.
setCuidRole
(
MerchantAuthorizationConst
.
PerformanceRole
.
FIELDER
.
getRole
());
authorizationRecords
.
setCreatedAt
(
now
);
break
;
}
authorizationRecordsArrayList
.
add
(
authorizationRecords
);
return
authorizationRecordsArrayList
;
}
}
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