记得上下班打卡 | 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
48835b64
Commit
48835b64
authored
Aug 13, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去掉 new 主要是arraylist , HashMap
parent
1fe76edd
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
73 additions
and
24 deletions
+73
-24
SweetAppletController.java
...idnet/service/sweet/controller/SweetAppletController.java
+7
-6
SweetAppletMdskController.java
...t/service/sweet/controller/SweetAppletMdskController.java
+12
-11
SweetWechatLoginServiceImpl.java
...rvice/sweet/service/impl/SweetWechatLoginServiceImpl.java
+2
-1
ObjectUtil.java
...in/java/com/liquidnet/service/sweet/utils/ObjectUtil.java
+46
-0
RedisDataUtils.java
...ava/com/liquidnet/service/sweet/utils/RedisDataUtils.java
+3
-3
RedisMDSKDataUtils.java
...com/liquidnet/service/sweet/utils/RedisMDSKDataUtils.java
+3
-3
No files found.
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAppletController.java
View file @
48835b64
...
@@ -8,6 +8,7 @@ import com.liquidnet.service.sweet.dto.SweetManualArtistListDto;
...
@@ -8,6 +8,7 @@ import com.liquidnet.service.sweet.dto.SweetManualArtistListDto;
import
com.liquidnet.service.sweet.entity.SweetManualNotify
;
import
com.liquidnet.service.sweet.entity.SweetManualNotify
;
import
com.liquidnet.service.sweet.entity.SweetManualShop
;
import
com.liquidnet.service.sweet.entity.SweetManualShop
;
import
com.liquidnet.service.sweet.entity.SweetRichtext
;
import
com.liquidnet.service.sweet.entity.SweetRichtext
;
import
com.liquidnet.service.sweet.utils.ObjectUtil
;
import
com.liquidnet.service.sweet.utils.RedisDataUtils
;
import
com.liquidnet.service.sweet.utils.RedisDataUtils
;
import
com.liquidnet.service.sweet.vo.SweetArtistsRelationVo
;
import
com.liquidnet.service.sweet.vo.SweetArtistsRelationVo
;
import
com.liquidnet.service.sweet.vo.SweetManualShopAllVo
;
import
com.liquidnet.service.sweet.vo.SweetManualShopAllVo
;
...
@@ -35,7 +36,7 @@ public class SweetAppletController {
...
@@ -35,7 +36,7 @@ public class SweetAppletController {
})
})
public
ResponseDto
<
List
<
SweetManualAppletDto
>>
timeSelect
(
@RequestParam
String
name
)
{
public
ResponseDto
<
List
<
SweetManualAppletDto
>>
timeSelect
(
@RequestParam
String
name
)
{
List
<
SweetManualAppletDto
>
dto
=
redisDataUtils
.
getPushList
();
List
<
SweetManualAppletDto
>
dto
=
redisDataUtils
.
getPushList
();
List
<
SweetManualAppletDto
>
vo
=
new
ArrayList
<>
();
List
<
SweetManualAppletDto
>
vo
=
ObjectUtil
.
getSweetManualAppletDtoList
();
for
(
SweetManualAppletDto
item
:
dto
)
{
for
(
SweetManualAppletDto
item
:
dto
)
{
if
(
item
.
getTitle
().
contains
(
name
))
{
if
(
item
.
getTitle
().
contains
(
name
))
{
vo
.
add
(
item
);
vo
.
add
(
item
);
...
@@ -90,8 +91,8 @@ public class SweetAppletController {
...
@@ -90,8 +91,8 @@ public class SweetAppletController {
@RequestParam
(
required
=
false
)
Integer
size
,
@RequestParam
(
required
=
false
)
Integer
size
,
@RequestParam
String
uid
)
{
@RequestParam
String
uid
)
{
List
<
SweetManualArtistListDto
>
allReturnArtist
=
new
Array
List
();
List
<
SweetManualArtistListDto
>
allReturnArtist
=
ObjectUtil
.
getSweetManualArtistListDto
List
();
List
<
SweetManualArtistListDto
>
returnArtist
=
new
Array
List
();
List
<
SweetManualArtistListDto
>
returnArtist
=
ObjectUtil
.
getSweetManualArtistListDto
List
();
SweetManualArtistList2Dto
data
=
redisDataUtils
.
getTimeList
(
manualId
);
SweetManualArtistList2Dto
data
=
redisDataUtils
.
getTimeList
(
manualId
);
SweetArtistsRelationVo
relationData
=
redisDataUtils
.
getArtistsRelationRedisVo
(
uid
,
manualId
);
SweetArtistsRelationVo
relationData
=
redisDataUtils
.
getArtistsRelationRedisVo
(
uid
,
manualId
);
...
@@ -296,9 +297,9 @@ public class SweetAppletController {
...
@@ -296,9 +297,9 @@ public class SweetAppletController {
public
ResponseDto
<
SweetManualShopAllVo
>
manualShop
(
@RequestParam
String
manualId
)
{
public
ResponseDto
<
SweetManualShopAllVo
>
manualShop
(
@RequestParam
String
manualId
)
{
List
<
SweetManualShop
>
shopList
=
redisDataUtils
.
getManualShopRedisData
(
manualId
);
List
<
SweetManualShop
>
shopList
=
redisDataUtils
.
getManualShopRedisData
(
manualId
);
List
<
SweetManualShop
>
recommend
=
new
ArrayList
<>
();
List
<
SweetManualShop
>
recommend
=
ObjectUtil
.
getSweetManualShopList
();
List
<
SweetManualShop
>
eat
=
new
ArrayList
<>
();
List
<
SweetManualShop
>
eat
=
ObjectUtil
.
getSweetManualShopList
();
List
<
SweetManualShop
>
play
=
new
ArrayList
<>
();
List
<
SweetManualShop
>
play
=
ObjectUtil
.
getSweetManualShopList
();
SweetManualShopAllVo
vo
=
SweetManualShopAllVo
.
getNew
();
SweetManualShopAllVo
vo
=
SweetManualShopAllVo
.
getNew
();
for
(
SweetManualShop
item
:
shopList
)
{
for
(
SweetManualShop
item
:
shopList
)
{
...
...
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAppletMdskController.java
View file @
48835b64
...
@@ -4,6 +4,7 @@ import com.liquidnet.commons.lang.util.CollectionUtil;
...
@@ -4,6 +4,7 @@ import com.liquidnet.commons.lang.util.CollectionUtil;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.sweet.dto.*
;
import
com.liquidnet.service.sweet.dto.*
;
import
com.liquidnet.service.sweet.entity.*
;
import
com.liquidnet.service.sweet.entity.*
;
import
com.liquidnet.service.sweet.utils.ObjectUtil
;
import
com.liquidnet.service.sweet.utils.RedisDataUtils
;
import
com.liquidnet.service.sweet.utils.RedisDataUtils
;
import
com.liquidnet.service.sweet.utils.RedisMDSKDataUtils
;
import
com.liquidnet.service.sweet.utils.RedisMDSKDataUtils
;
import
com.liquidnet.service.sweet.vo.SweetArtistsRelationVo
;
import
com.liquidnet.service.sweet.vo.SweetArtistsRelationVo
;
...
@@ -36,7 +37,7 @@ public class SweetAppletMdskController {
...
@@ -36,7 +37,7 @@ public class SweetAppletMdskController {
})
})
public
ResponseDto
<
List
<
SweetManualAppletMDSKDto
>>
timeSelect
(
@RequestParam
String
name
)
{
public
ResponseDto
<
List
<
SweetManualAppletMDSKDto
>>
timeSelect
(
@RequestParam
String
name
)
{
List
<
SweetManualAppletMDSKDto
>
dto
=
redisDataUtils
.
getPushList
();
List
<
SweetManualAppletMDSKDto
>
dto
=
redisDataUtils
.
getPushList
();
List
<
SweetManualAppletMDSKDto
>
vo
=
new
ArrayList
<>
();
List
<
SweetManualAppletMDSKDto
>
vo
=
ObjectUtil
.
getSweetManualAppletMDSKDtoList
();
for
(
SweetManualAppletMDSKDto
item
:
dto
)
{
for
(
SweetManualAppletMDSKDto
item
:
dto
)
{
if
(
item
.
getTitle
().
contains
(
name
))
{
if
(
item
.
getTitle
().
contains
(
name
))
{
vo
.
add
(
item
);
vo
.
add
(
item
);
...
@@ -91,8 +92,8 @@ public class SweetAppletMdskController {
...
@@ -91,8 +92,8 @@ public class SweetAppletMdskController {
@RequestParam
(
required
=
false
)
Integer
size
,
@RequestParam
(
required
=
false
)
Integer
size
,
@RequestParam
String
uid
)
{
@RequestParam
String
uid
)
{
List
<
SweetManualArtistListMDSKDto
>
allReturnArtist
=
new
Array
List
();
List
<
SweetManualArtistListMDSKDto
>
allReturnArtist
=
ObjectUtil
.
getSweetManualArtistListMDSKDto
List
();
List
<
SweetManualArtistListMDSKDto
>
returnArtist
=
new
Array
List
();
List
<
SweetManualArtistListMDSKDto
>
returnArtist
=
ObjectUtil
.
getSweetManualArtistListMDSKDto
List
();
SweetManualArtistList2MDSKDto
data
=
redisDataUtils
.
getTimeList
(
manualId
);
SweetManualArtistList2MDSKDto
data
=
redisDataUtils
.
getTimeList
(
manualId
);
SweetArtistsRelationVo
relationData
=
redisDataUtils
.
getArtistsRelationRedisVo
(
uid
,
manualId
);
SweetArtistsRelationVo
relationData
=
redisDataUtils
.
getArtistsRelationRedisVo
(
uid
,
manualId
);
...
@@ -240,9 +241,9 @@ public class SweetAppletMdskController {
...
@@ -240,9 +241,9 @@ public class SweetAppletMdskController {
if
(
vo
.
getWatchList
()
!=
null
)
{
if
(
vo
.
getWatchList
()
!=
null
)
{
watchSize
=
vo
.
getWatchList
().
size
();
watchSize
=
vo
.
getWatchList
().
size
();
}
}
HashMap
<
String
,
Object
>
map
=
CollectionUtil
.
mapStringObject
();
HashMap
<
String
,
Object
>
map
=
CollectionUtil
.
mapStringObject
();
map
.
put
(
"signSize"
,
signSize
);
map
.
put
(
"signSize"
,
signSize
);
map
.
put
(
"watchSize"
,
watchSize
);
map
.
put
(
"watchSize"
,
watchSize
);
return
ResponseDto
.
success
(
map
);
return
ResponseDto
.
success
(
map
);
}
}
...
@@ -254,8 +255,8 @@ public class SweetAppletMdskController {
...
@@ -254,8 +255,8 @@ public class SweetAppletMdskController {
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"String"
,
name
=
"uid"
,
value
=
"用户id"
,
required
=
true
)
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"String"
,
name
=
"uid"
,
value
=
"用户id"
,
required
=
true
)
})
})
public
ResponseDto
<
SweetManualArtistListMDSKDto
>
artistsDetails
(
@RequestParam
String
artistsId
,
public
ResponseDto
<
SweetManualArtistListMDSKDto
>
artistsDetails
(
@RequestParam
String
artistsId
,
@RequestParam
String
manualId
,
@RequestParam
String
manualId
,
@RequestParam
String
uid
)
{
@RequestParam
String
uid
)
{
SweetManualArtistList2MDSKDto
data
=
redisDataUtils
.
getTimeList
(
manualId
);
SweetManualArtistList2MDSKDto
data
=
redisDataUtils
.
getTimeList
(
manualId
);
List
<
SweetManualArtistListMDSKDto
>
dataList
=
data
.
getData
();
List
<
SweetManualArtistListMDSKDto
>
dataList
=
data
.
getData
();
SweetArtistsRelationVo
relationData
=
redisDataUtils
.
getArtistsRelationRedisVo
(
uid
,
manualId
);
SweetArtistsRelationVo
relationData
=
redisDataUtils
.
getArtistsRelationRedisVo
(
uid
,
manualId
);
...
@@ -297,9 +298,9 @@ public class SweetAppletMdskController {
...
@@ -297,9 +298,9 @@ public class SweetAppletMdskController {
public
ResponseDto
<
SweetManualShopMdskAllVo
>
manualShop
(
@RequestParam
String
manualId
)
{
public
ResponseDto
<
SweetManualShopMdskAllVo
>
manualShop
(
@RequestParam
String
manualId
)
{
List
<
SweetManualShopMdsk
>
shopList
=
redisDataUtils
.
getManualShopRedisData
(
manualId
);
List
<
SweetManualShopMdsk
>
shopList
=
redisDataUtils
.
getManualShopRedisData
(
manualId
);
List
<
SweetManualShopMdsk
>
recommend
=
new
ArrayList
<>
();
List
<
SweetManualShopMdsk
>
recommend
=
ObjectUtil
.
getSweetManualShopMdskList
();
List
<
SweetManualShopMdsk
>
eat
=
new
ArrayList
<>
();
List
<
SweetManualShopMdsk
>
eat
=
ObjectUtil
.
getSweetManualShopMdskList
();
List
<
SweetManualShopMdsk
>
play
=
new
ArrayList
<>
();
List
<
SweetManualShopMdsk
>
play
=
ObjectUtil
.
getSweetManualShopMdskList
();
SweetManualShopMdskAllVo
vo
=
SweetManualShopMdskAllVo
.
getNew
();
SweetManualShopMdskAllVo
vo
=
SweetManualShopMdskAllVo
.
getNew
();
for
(
SweetManualShopMdsk
item
:
shopList
)
{
for
(
SweetManualShopMdsk
item
:
shopList
)
{
...
...
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatLoginServiceImpl.java
View file @
48835b64
...
@@ -7,6 +7,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
...
@@ -7,6 +7,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
import
cn.binarywang.wx.miniapp.bean.WxMaUserInfo
;
import
cn.binarywang.wx.miniapp.bean.WxMaUserInfo
;
import
cn.binarywang.wx.miniapp.config.WxMaConfig
;
import
cn.binarywang.wx.miniapp.config.WxMaConfig
;
import
cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl
;
import
cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl
;
import
com.liquidnet.commons.lang.util.CollectionUtil
;
import
com.liquidnet.commons.lang.util.JsonUtils
;
import
com.liquidnet.commons.lang.util.JsonUtils
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.base.ResponseDto
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
...
@@ -94,7 +95,7 @@ public class SweetWechatLoginServiceImpl {
...
@@ -94,7 +95,7 @@ public class SweetWechatLoginServiceImpl {
String
unionId
=
sessionInfo
.
getUnionid
();
String
unionId
=
sessionInfo
.
getUnionid
();
String
openId
=
sessionInfo
.
getOpenid
();
String
openId
=
sessionInfo
.
getOpenid
();
HashMap
userInfo
=
new
HashMap
();
HashMap
<
String
,
Object
>
userInfo
=
CollectionUtil
.
mapStringObject
();
userInfo
.
put
(
"unionId"
,
unionId
);
userInfo
.
put
(
"unionId"
,
unionId
);
userInfo
.
put
(
"openId"
,
openId
);
userInfo
.
put
(
"openId"
,
openId
);
userInfo
.
put
(
"getPhoneNumber"
,
wxMaPhoneNumberInfo
.
getPhoneNumber
());
userInfo
.
put
(
"getPhoneNumber"
,
wxMaPhoneNumberInfo
.
getPhoneNumber
());
...
...
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/ObjectUtil.java
0 → 100644
View file @
48835b64
package
com
.
liquidnet
.
service
.
sweet
.
utils
;
import
com.liquidnet.service.base.PagedResult
;
import
com.liquidnet.service.sweet.dto.SweetManualAppletDto
;
import
com.liquidnet.service.sweet.dto.SweetManualAppletMDSKDto
;
import
com.liquidnet.service.sweet.dto.SweetManualArtistListDto
;
import
com.liquidnet.service.sweet.dto.SweetManualArtistListMDSKDto
;
import
com.liquidnet.service.sweet.entity.SweetManualShop
;
import
com.liquidnet.service.sweet.entity.SweetManualShopMdsk
;
import
java.util.ArrayList
;
public
class
ObjectUtil
{
private
static
final
ArrayList
<
SweetManualAppletDto
>
sweetManualAppletDtoList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
SweetManualArtistListDto
>
sweetManualArtistListDtoList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
SweetManualShop
>
sweetManualShopList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
SweetManualAppletMDSKDto
>
sweetManualAppletMDSKDtoList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
SweetManualArtistListMDSKDto
>
sweetManualArtistListMDSKDtoList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
SweetManualShopMdsk
>
sweetManualShopMDSKList
=
new
ArrayList
<>();
public
static
ArrayList
<
SweetManualAppletDto
>
getSweetManualAppletDtoList
()
{
return
(
ArrayList
<
SweetManualAppletDto
>)
sweetManualAppletDtoList
.
clone
();
}
public
static
ArrayList
<
SweetManualArtistListDto
>
getSweetManualArtistListDtoList
()
{
return
(
ArrayList
<
SweetManualArtistListDto
>)
sweetManualArtistListDtoList
.
clone
();
}
public
static
ArrayList
<
SweetManualShop
>
getSweetManualShopList
()
{
return
(
ArrayList
<
SweetManualShop
>)
sweetManualShopList
.
clone
();
}
public
static
ArrayList
<
SweetManualAppletMDSKDto
>
getSweetManualAppletMDSKDtoList
()
{
return
(
ArrayList
<
SweetManualAppletMDSKDto
>)
sweetManualAppletMDSKDtoList
.
clone
();
}
public
static
ArrayList
<
SweetManualArtistListMDSKDto
>
getSweetManualArtistListMDSKDtoList
()
{
return
(
ArrayList
<
SweetManualArtistListMDSKDto
>)
sweetManualArtistListMDSKDtoList
.
clone
();
}
public
static
ArrayList
<
SweetManualShopMdsk
>
getSweetManualShopMdskList
()
{
return
(
ArrayList
<
SweetManualShopMdsk
>)
sweetManualShopMDSKList
.
clone
();
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java
View file @
48835b64
...
@@ -99,7 +99,7 @@ public class RedisDataUtils {
...
@@ -99,7 +99,7 @@ public class RedisDataUtils {
Date
dateEnd
=
DateUtil
.
parse
(
sweetManualAppletDto
.
getTimeEnd
(),
DateUtil
.
DATE_SMALL_STR
);
Date
dateEnd
=
DateUtil
.
parse
(
sweetManualAppletDto
.
getTimeEnd
(),
DateUtil
.
DATE_SMALL_STR
);
Date
dateStart
=
DateUtil
.
parse
(
sweetManualAppletDto
.
getTimeStart
(),
DateUtil
.
DATE_SMALL_STR
);
Date
dateStart
=
DateUtil
.
parse
(
sweetManualAppletDto
.
getTimeStart
(),
DateUtil
.
DATE_SMALL_STR
);
int
intervalDay
=
(
int
)
DateUtil
.
intervalDays
(
dateStart
,
dateEnd
);
int
intervalDay
=
(
int
)
DateUtil
.
intervalDays
(
dateStart
,
dateEnd
);
ArrayList
<
String
>
list
=
new
ArrayList
<>
();
ArrayList
<
String
>
list
=
CollectionUtil
.
arrayListString
();
list
.
add
(
DateUtil
.
format
(
dateStart
,
DateUtil
.
Formatter
.
yyyy_MM_dd
));
list
.
add
(
DateUtil
.
format
(
dateStart
,
DateUtil
.
Formatter
.
yyyy_MM_dd
));
for
(
int
i
=
0
;
i
<
intervalDay
;
i
++)
{
for
(
int
i
=
0
;
i
<
intervalDay
;
i
++)
{
list
.
add
(
DateUtil
.
format
(
DateUtil
.
addDay
(
dateStart
,
i
+
1
),
DateUtil
.
Formatter
.
yyyy_MM_dd
));
list
.
add
(
DateUtil
.
format
(
DateUtil
.
addDay
(
dateStart
,
i
+
1
),
DateUtil
.
Formatter
.
yyyy_MM_dd
));
...
@@ -220,7 +220,7 @@ public class RedisDataUtils {
...
@@ -220,7 +220,7 @@ public class RedisDataUtils {
vo
.
setUid
(
uid
);
vo
.
setUid
(
uid
);
if
(
type
.
equalsIgnoreCase
(
"sign"
))
{
if
(
type
.
equalsIgnoreCase
(
"sign"
))
{
if
(
vo
.
getSignList
()
==
null
)
{
if
(
vo
.
getSignList
()
==
null
)
{
ArrayList
<
String
>
signList
=
new
ArrayList
<>
();
ArrayList
<
String
>
signList
=
CollectionUtil
.
arrayListString
();
signList
.
add
(
artistsId
);
signList
.
add
(
artistsId
);
vo
.
setSignList
(
signList
);
vo
.
setSignList
(
signList
);
sqls
.
add
(
SqlMapping
.
get
(
"sweet_user_relation.insert"
));
sqls
.
add
(
SqlMapping
.
get
(
"sweet_user_relation.insert"
));
...
@@ -244,7 +244,7 @@ public class RedisDataUtils {
...
@@ -244,7 +244,7 @@ public class RedisDataUtils {
}
}
}
else
if
(
type
.
equalsIgnoreCase
(
"watch"
))
{
}
else
if
(
type
.
equalsIgnoreCase
(
"watch"
))
{
if
(
vo
.
getWatchList
()
==
null
)
{
if
(
vo
.
getWatchList
()
==
null
)
{
ArrayList
<
String
>
watchList
=
new
ArrayList
<>
();
ArrayList
<
String
>
watchList
=
CollectionUtil
.
arrayListString
();
watchList
.
add
(
artistsId
);
watchList
.
add
(
artistsId
);
vo
.
setWatchList
(
watchList
);
vo
.
setWatchList
(
watchList
);
sqls
.
add
(
SqlMapping
.
get
(
"sweet_user_relation.insert"
));
sqls
.
add
(
SqlMapping
.
get
(
"sweet_user_relation.insert"
));
...
...
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisMDSKDataUtils.java
View file @
48835b64
...
@@ -92,7 +92,7 @@ public class RedisMDSKDataUtils {
...
@@ -92,7 +92,7 @@ public class RedisMDSKDataUtils {
Date
dateEnd
=
DateUtil
.
parse
(
sweetManualAppletDto
.
getTimeEnd
(),
DateUtil
.
DATE_SMALL_STR
);
Date
dateEnd
=
DateUtil
.
parse
(
sweetManualAppletDto
.
getTimeEnd
(),
DateUtil
.
DATE_SMALL_STR
);
Date
dateStart
=
DateUtil
.
parse
(
sweetManualAppletDto
.
getTimeStart
(),
DateUtil
.
DATE_SMALL_STR
);
Date
dateStart
=
DateUtil
.
parse
(
sweetManualAppletDto
.
getTimeStart
(),
DateUtil
.
DATE_SMALL_STR
);
int
intervalDay
=
(
int
)
DateUtil
.
intervalDays
(
dateStart
,
dateEnd
);
int
intervalDay
=
(
int
)
DateUtil
.
intervalDays
(
dateStart
,
dateEnd
);
ArrayList
<
String
>
list
=
new
ArrayList
<>
();
ArrayList
<
String
>
list
=
CollectionUtil
.
arrayListString
();
list
.
add
(
DateUtil
.
format
(
dateStart
,
DateUtil
.
Formatter
.
yyyy_MM_dd
));
list
.
add
(
DateUtil
.
format
(
dateStart
,
DateUtil
.
Formatter
.
yyyy_MM_dd
));
for
(
int
i
=
0
;
i
<
intervalDay
;
i
++)
{
for
(
int
i
=
0
;
i
<
intervalDay
;
i
++)
{
list
.
add
(
DateUtil
.
format
(
DateUtil
.
addDay
(
dateStart
,
i
+
1
),
DateUtil
.
Formatter
.
yyyy_MM_dd
));
list
.
add
(
DateUtil
.
format
(
DateUtil
.
addDay
(
dateStart
,
i
+
1
),
DateUtil
.
Formatter
.
yyyy_MM_dd
));
...
@@ -213,7 +213,7 @@ public class RedisMDSKDataUtils {
...
@@ -213,7 +213,7 @@ public class RedisMDSKDataUtils {
vo
.
setUid
(
uid
);
vo
.
setUid
(
uid
);
if
(
type
.
equalsIgnoreCase
(
"sign"
))
{
if
(
type
.
equalsIgnoreCase
(
"sign"
))
{
if
(
vo
.
getSignList
()
==
null
)
{
if
(
vo
.
getSignList
()
==
null
)
{
ArrayList
<
String
>
signList
=
new
ArrayList
<>
();
ArrayList
<
String
>
signList
=
CollectionUtil
.
arrayListString
();
signList
.
add
(
artistsId
);
signList
.
add
(
artistsId
);
vo
.
setSignList
(
signList
);
vo
.
setSignList
(
signList
);
sqls
.
add
(
SqlMapping
.
get
(
"sweet_user_relation_mdsk.insert"
));
sqls
.
add
(
SqlMapping
.
get
(
"sweet_user_relation_mdsk.insert"
));
...
@@ -237,7 +237,7 @@ public class RedisMDSKDataUtils {
...
@@ -237,7 +237,7 @@ public class RedisMDSKDataUtils {
}
}
}
else
if
(
type
.
equalsIgnoreCase
(
"watch"
))
{
}
else
if
(
type
.
equalsIgnoreCase
(
"watch"
))
{
if
(
vo
.
getWatchList
()
==
null
)
{
if
(
vo
.
getWatchList
()
==
null
)
{
ArrayList
<
String
>
watchList
=
new
ArrayList
<>
();
ArrayList
<
String
>
watchList
=
CollectionUtil
.
arrayListString
();
watchList
.
add
(
artistsId
);
watchList
.
add
(
artistsId
);
vo
.
setWatchList
(
watchList
);
vo
.
setWatchList
(
watchList
);
sqls
.
add
(
SqlMapping
.
get
(
"sweet_user_relation_mdsk.insert"
));
sqls
.
add
(
SqlMapping
.
get
(
"sweet_user_relation_mdsk.insert"
));
...
...
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