记得上下班打卡 | 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
fbeafb4c
Commit
fbeafb4c
authored
Oct 20, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'hjc_yb_banner' into pre
parents
0a4eacd1
5e3cf743
Changes
11
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
58 additions
and
40 deletions
+58
-40
SweetYbEnrollParam.java
...liquidnet/service/sweet/dto/param/SweetYbEnrollParam.java
+5
-0
SweetYbActivityController.java
.../controller/zhengzai/sweet/SweetYbActivityController.java
+10
-7
bannerList.html
.../src/main/resources/templates/zhengzai/yb/bannerList.html
+1
-1
creatAndEdit.html
...rc/main/resources/templates/zhengzai/yb/creatAndEdit.html
+4
-0
SweetYbActivityExportVo.java
...ent/admin/zhengzai/sweet/dto/SweetYbActivityExportVo.java
+7
-1
ISweetYbActivityService.java
...admin/zhengzai/sweet/service/ISweetYbActivityService.java
+1
-1
SweetYbActivityServiceImpl.java
...engzai/sweet/service/impl/SweetYbActivityServiceImpl.java
+11
-22
SweetYbEnroll.java
...ava/com/liquidnet/service/sweet/entity/SweetYbEnroll.java
+5
-0
db_sweetsugar_structure.sql
.../liquidnet-service-sweet/docu/db_sweetsugar_structure.sql
+2
-0
SweetYbEnrollServiceImpl.java
.../service/sweet/service/impl/SweetYbEnrollServiceImpl.java
+11
-7
sqlmap.properties
...uidnet-service-sweet/src/main/resources/sqlmap.properties
+1
-1
No files found.
liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/param/SweetYbEnrollParam.java
View file @
fbeafb4c
...
@@ -46,4 +46,9 @@ public class SweetYbEnrollParam implements Serializable {
...
@@ -46,4 +46,9 @@ public class SweetYbEnrollParam implements Serializable {
@ApiModelProperty
(
position
=
19
,
required
=
false
,
value
=
"活动id"
,
example
=
"0"
)
@ApiModelProperty
(
position
=
19
,
required
=
false
,
value
=
"活动id"
,
example
=
"0"
)
private
String
activityId
;
private
String
activityId
;
@ApiModelProperty
(
position
=
20
,
required
=
false
,
value
=
"平均年龄"
,
example
=
"0"
)
private
Integer
age
;
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/sweet/SweetYbActivityController.java
View file @
fbeafb4c
package
com
.
liquidnet
.
client
.
admin
.
web
.
controller
.
zhengzai
.
sweet
;
package
com
.
liquidnet
.
client
.
admin
.
web
.
controller
.
zhengzai
.
sweet
;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageInfo
;
import
com.github.pagehelper.PageInfo
;
import
com.liquidnet.client.admin.common.core.controller.BaseController
;
import
com.liquidnet.client.admin.common.core.domain.AjaxResult
;
import
com.liquidnet.client.admin.common.core.domain.AjaxResult
;
import
com.liquidnet.client.admin.common.core.page.TableDataInfo
;
import
com.liquidnet.client.admin.common.core.page.TableDataInfo
;
import
com.liquidnet.client.admin.common.utils.poi.ExcelUtil
;
import
com.liquidnet.client.admin.common.utils.poi.ExcelUtil
;
...
@@ -35,7 +37,7 @@ import java.util.List;
...
@@ -35,7 +37,7 @@ import java.util.List;
@Api
(
tags
=
"YB活动管理"
)
@Api
(
tags
=
"YB活动管理"
)
@RestController
@RestController
@RequestMapping
(
"/sweet/activity"
)
@RequestMapping
(
"/sweet/activity"
)
public
class
SweetYbActivityController
{
public
class
SweetYbActivityController
extends
BaseController
{
@Autowired
@Autowired
ISweetYbActivityService
sweetYbActivityService
;
ISweetYbActivityService
sweetYbActivityService
;
...
@@ -80,12 +82,13 @@ public class SweetYbActivityController {
...
@@ -80,12 +82,13 @@ public class SweetYbActivityController {
@ApiOperation
(
"活动列表"
)
@ApiOperation
(
"活动列表"
)
@ResponseBody
@ResponseBody
public
TableDataInfo
aList
(
SweetYbActivityListParam
param
)
{
public
TableDataInfo
aList
(
SweetYbActivityListParam
param
)
{
PageInfo
<
SweetYbActivityVo
>
result
=
sweetYbActivityService
.
aList
(
param
);
PageHelper
.
startPage
(
param
.
getPageNum
(),
param
.
getPageSize
());
TableDataInfo
rspData
=
new
TableDataInfo
();
List
<
SweetYbActivity
>
result
=
sweetYbActivityService
.
aList
(
param
);
rspData
.
setCode
(
0
);
// TableDataInfo rspData = new TableDataInfo();
rspData
.
setRows
(
result
.
getList
());
// rspData.setCode(0);
rspData
.
setTotal
(
result
.
getTotal
());
// rspData.setRows(result.getList());
return
rspData
;
// rspData.setTotal(result.getTotal());
return
getDataTable
(
result
);
}
}
@PostMapping
(
"/export"
)
@PostMapping
(
"/export"
)
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/yb/bannerList.html
View file @
fbeafb4c
...
@@ -117,7 +117,7 @@
...
@@ -117,7 +117,7 @@
// onCheckAll: onCheckAll,
// onCheckAll: onCheckAll,
sortName
:
"createdAt"
,
sortName
:
"createdAt"
,
sortOrder
:
"desc"
,
sortOrder
:
"desc"
,
modalName
:
"
活动
"
,
modalName
:
"
本活动名单
"
,
columns
:
[
columns
:
[
{
{
field
:
'cover'
,
field
:
'cover'
,
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/yb/creatAndEdit.html
View file @
fbeafb4c
...
@@ -173,6 +173,10 @@
...
@@ -173,6 +173,10 @@
$
(
this
).
fileinput
(
"upload"
);
$
(
this
).
fileinput
(
"upload"
);
})
})
.
on
(
"fileuploaded"
,
function
(
event
,
data
)
{
//上传回调事件
.
on
(
"fileuploaded"
,
function
(
event
,
data
)
{
//上传回调事件
console
.
log
(
event
,
data
,
'????'
)
if
(
data
.
response
.
code
==
1
)
{
return
layer
.
msg
(
data
.
response
.
message
)
}
let
showPicture
=
'https://img.zhengzai.tv/'
+
data
.
response
.
data
.
ossPath
;
let
showPicture
=
'https://img.zhengzai.tv/'
+
data
.
response
.
data
.
ossPath
;
$
(
"#viewImg"
).
attr
(
'src'
,
showPicture
)
$
(
"#viewImg"
).
attr
(
'src'
,
showPicture
)
})
})
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/dto/SweetYbActivityExportVo.java
View file @
fbeafb4c
...
@@ -11,12 +11,16 @@ import java.time.format.DateTimeFormatter;
...
@@ -11,12 +11,16 @@ import java.time.format.DateTimeFormatter;
@Data
@Data
public
class
SweetYbActivityExportVo
implements
Serializable
,
Cloneable
{
public
class
SweetYbActivityExportVo
implements
Serializable
,
Cloneable
{
@Excel
(
name
=
"活动名称"
,
cellType
=
Excel
.
ColumnType
.
STRING
)
private
String
activityName
;
@Excel
(
name
=
"联系电话"
,
cellType
=
Excel
.
ColumnType
.
STRING
)
@Excel
(
name
=
"联系电话"
,
cellType
=
Excel
.
ColumnType
.
STRING
)
private
String
contactTell
;
private
String
contactTell
;
@Excel
(
name
=
"联系微信"
,
cellType
=
Excel
.
ColumnType
.
STRING
)
@Excel
(
name
=
"联系微信"
,
cellType
=
Excel
.
ColumnType
.
STRING
)
private
String
contactWechat
;
private
String
contactWechat
;
@Excel
(
name
=
"乐队名称"
,
cellType
=
Excel
.
ColumnType
.
STRING
)
@Excel
(
name
=
"乐队名称"
,
cellType
=
Excel
.
ColumnType
.
STRING
)
private
String
nickname
;
private
String
nickname
;
@Excel
(
name
=
"平均年龄"
,
cellType
=
Excel
.
ColumnType
.
STRING
)
private
String
age
;
@Excel
(
name
=
"风格"
,
cellType
=
Excel
.
ColumnType
.
STRING
)
@Excel
(
name
=
"风格"
,
cellType
=
Excel
.
ColumnType
.
STRING
)
private
String
style
;
private
String
style
;
@Excel
(
name
=
"图片地址"
,
cellType
=
Excel
.
ColumnType
.
STRING
)
@Excel
(
name
=
"图片地址"
,
cellType
=
Excel
.
ColumnType
.
STRING
)
...
@@ -42,7 +46,9 @@ public class SweetYbActivityExportVo implements Serializable, Cloneable {
...
@@ -42,7 +46,9 @@ public class SweetYbActivityExportVo implements Serializable, Cloneable {
return
new
SweetYbActivityExportVo
();
return
new
SweetYbActivityExportVo
();
}
}
public
SweetYbActivityExportVo
copyOrderExportVo
(
SweetYbEnroll
source
)
{
public
SweetYbActivityExportVo
copyOrderExportVo
(
SweetYbEnroll
source
,
String
name
)
{
this
.
setActivityName
(
name
);
this
.
setAge
(
source
.
getAge
()+
""
);
this
.
setContactTell
(
source
.
getContactTell
());
this
.
setContactTell
(
source
.
getContactTell
());
this
.
setContactWechat
(
source
.
getContactWechat
());
this
.
setContactWechat
(
source
.
getContactWechat
());
this
.
setNickname
(
source
.
getNickname
());
this
.
setNickname
(
source
.
getNickname
());
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/service/ISweetYbActivityService.java
View file @
fbeafb4c
...
@@ -31,7 +31,7 @@ public interface ISweetYbActivityService {
...
@@ -31,7 +31,7 @@ public interface ISweetYbActivityService {
SweetYbActivityVo
aDetails
(
String
activityId
);
SweetYbActivityVo
aDetails
(
String
activityId
);
PageInfo
<
SweetYbActivityVo
>
aList
(
SweetYbActivityListParam
param
);
List
<
SweetYbActivity
>
aList
(
SweetYbActivityListParam
param
);
AjaxResult
aUpdate
(
SweetYbActivityParam
param
);
AjaxResult
aUpdate
(
SweetYbActivityParam
param
);
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/service/impl/SweetYbActivityServiceImpl.java
View file @
fbeafb4c
package
com
.
liquidnet
.
client
.
admin
.
zhengzai
.
sweet
.
service
.
impl
;
package
com
.
liquidnet
.
client
.
admin
.
zhengzai
.
sweet
.
service
.
impl
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.github.pagehelper.PageInfo
;
import
com.liquidnet.client.admin.common.core.domain.AjaxResult
;
import
com.liquidnet.client.admin.common.core.domain.AjaxResult
;
import
com.liquidnet.client.admin.common.exception.BusinessException
;
import
com.liquidnet.client.admin.common.exception.BusinessException
;
import
com.liquidnet.client.admin.zhengzai.kylin.dto.OrderDetailedExportVo
;
import
com.liquidnet.client.admin.zhengzai.sweet.dto.SweetYbActivityExportVo
;
import
com.liquidnet.client.admin.zhengzai.sweet.dto.SweetYbActivityExportVo
;
import
com.liquidnet.client.admin.zhengzai.sweet.service.ISweetAdminQrCodeService
;
import
com.liquidnet.client.admin.zhengzai.sweet.service.ISweetYbActivityService
;
import
com.liquidnet.client.admin.zhengzai.sweet.service.ISweetYbActivityService
;
import
com.liquidnet.client.admin.zhengzai.sweet.utils.SweetRedisAdminUtils
;
import
com.liquidnet.client.admin.zhengzai.sweet.utils.SweetRedisAdminUtils
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.commons.lang.util.IDGenerator
;
import
com.liquidnet.commons.lang.util.IDGenerator
;
import
com.liquidnet.service.kylin.dao.OrderExportDao
;
import
com.liquidnet.service.kylin.dao.PerformanceAdminListDao
;
import
com.liquidnet.service.kylin.dto.param.CreateActiveQrCodeParam
;
import
com.liquidnet.service.sweet.dto.param.admin.SweetYbActivityListParam
;
import
com.liquidnet.service.sweet.dto.param.admin.SweetYbActivityListParam
;
import
com.liquidnet.service.sweet.dto.param.admin.SweetYbActivityParam
;
import
com.liquidnet.service.sweet.dto.param.admin.SweetYbActivityParam
;
import
com.liquidnet.service.sweet.dto.vo.SweetYbActivityVo
;
import
com.liquidnet.service.sweet.dto.vo.SweetYbActivityVo
;
import
com.liquidnet.service.sweet.entity.SweetQrCode
;
import
com.liquidnet.service.sweet.entity.SweetYbActivity
;
import
com.liquidnet.service.sweet.entity.SweetYbActivity
;
import
com.liquidnet.service.sweet.entity.SweetYbEnroll
;
import
com.liquidnet.service.sweet.entity.SweetYbEnroll
;
import
com.liquidnet.service.sweet.mapper.SweetQrCodeMapper
;
import
com.liquidnet.service.sweet.mapper.SweetYbActivityMapper
;
import
com.liquidnet.service.sweet.mapper.SweetYbActivityMapper
;
import
com.liquidnet.service.sweet.mapper.SweetYbEnrollMapper
;
import
com.liquidnet.service.sweet.mapper.SweetYbEnrollMapper
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.time.format.DateTimeFormatter
;
import
java.time.format.DateTimeFormatter
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
static
com
.
liquidnet
.
commons
.
lang
.
util
.
DateUtil
.
DTF_YMD_HMS
;
import
static
com
.
liquidnet
.
commons
.
lang
.
util
.
DateUtil
.
DTF_YMD_HMS
;
...
@@ -84,16 +73,15 @@ public class SweetYbActivityServiceImpl implements ISweetYbActivityService {
...
@@ -84,16 +73,15 @@ public class SweetYbActivityServiceImpl implements ISweetYbActivityService {
}
}
@Override
@Override
public
PageInfo
<
SweetYbActivityVo
>
aList
(
SweetYbActivityListParam
param
)
{
public
List
<
SweetYbActivity
>
aList
(
SweetYbActivityListParam
param
)
{
PageInfo
<
SweetYbActivityVo
>
pageInfo
;
List
<
SweetYbActivity
>
data
=
sweetYbActivityMapper
.
selectList
(
Wrappers
.
lambdaQuery
(
SweetYbActivity
.
class
).
like
(
SweetYbActivity:
:
getTitle
,
param
.
getTitle
()).
orderByDesc
(
SweetYbActivity:
:
getCreatedAt
));
List
<
SweetYbActivity
>
data
=
sweetYbActivityMapper
.
selectList
(
Wrappers
.
lambdaQuery
(
SweetYbActivity
.
class
).
like
(
SweetYbActivity:
:
getTitle
,
param
.
getTitle
()));
// List<SweetYbActivityVo> voList = new ArrayList<>();
List
<
SweetYbActivityVo
>
voList
=
new
ArrayList
<>();
// for (SweetYbActivity entity : data) {
for
(
SweetYbActivity
entity
:
data
)
{
// SweetYbActivityVo vo = initVo(entity);
SweetYbActivityVo
vo
=
initVo
(
entity
);
// voList.add(vo);
voList
.
add
(
vo
);
// }
}
// pageInfo = new PageInfo(voList);
pageInfo
=
new
PageInfo
(
voList
);
return
data
;
return
pageInfo
;
}
}
@Override
@Override
...
@@ -151,10 +139,11 @@ public class SweetYbActivityServiceImpl implements ISweetYbActivityService {
...
@@ -151,10 +139,11 @@ public class SweetYbActivityServiceImpl implements ISweetYbActivityService {
@Override
@Override
public
List
<
SweetYbActivityExportVo
>
aExport
(
String
activityId
)
{
public
List
<
SweetYbActivityExportVo
>
aExport
(
String
activityId
)
{
try
{
try
{
SweetYbActivity
activity
=
sweetYbActivityMapper
.
selectOne
(
Wrappers
.
lambdaQuery
(
SweetYbActivity
.
class
).
eq
(
SweetYbActivity:
:
getActivityId
,
activityId
));
List
<
SweetYbEnroll
>
list
=
sweetYbEnrollMapper
.
selectList
(
Wrappers
.
lambdaQuery
(
SweetYbEnroll
.
class
).
eq
(
SweetYbEnroll:
:
getActivityId
,
activityId
));
List
<
SweetYbEnroll
>
list
=
sweetYbEnrollMapper
.
selectList
(
Wrappers
.
lambdaQuery
(
SweetYbEnroll
.
class
).
eq
(
SweetYbEnroll:
:
getActivityId
,
activityId
));
List
<
SweetYbActivityExportVo
>
voList
=
new
ArrayList
();
List
<
SweetYbActivityExportVo
>
voList
=
new
ArrayList
();
for
(
SweetYbEnroll
item
:
list
)
{
for
(
SweetYbEnroll
item
:
list
)
{
voList
.
add
(
SweetYbActivityExportVo
.
getNew
().
copyOrderExportVo
(
item
));
voList
.
add
(
SweetYbActivityExportVo
.
getNew
().
copyOrderExportVo
(
item
,
activity
.
getTitle
()
));
}
}
return
voList
;
return
voList
;
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
...
liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetYbEnroll.java
View file @
fbeafb4c
...
@@ -70,6 +70,11 @@ public class SweetYbEnroll implements Serializable {
...
@@ -70,6 +70,11 @@ public class SweetYbEnroll implements Serializable {
*/
*/
private
String
cityName
;
private
String
cityName
;
/**
* 平均年龄
*/
private
int
age
;
/**
/**
* 活动id
* 活动id
*/
*/
...
...
liquidnet-bus-service/liquidnet-service-sweet/docu/db_sweetsugar_structure.sql
View file @
fbeafb4c
...
@@ -512,6 +512,8 @@ alter table sweet_yb_enroll
...
@@ -512,6 +512,8 @@ alter table sweet_yb_enroll
add
city_name
varchar
(
255
)
NOT
NULL
DEFAULT
''
COMMENT
'常驻城市名称'
after
universities
;
add
city_name
varchar
(
255
)
NOT
NULL
DEFAULT
''
COMMENT
'常驻城市名称'
after
universities
;
alter
table
sweet_yb_enroll
alter
table
sweet_yb_enroll
add
activity_id
varchar
(
255
)
DEFAULT
'0'
COMMENT
'活动id'
after
city_name
;
add
activity_id
varchar
(
255
)
DEFAULT
'0'
COMMENT
'活动id'
after
city_name
;
alter
table
sweet_yb_enroll
add
age
int
DEFAULT
0
COMMENT
'平均年龄'
after
city_name
;
-- YB活动
-- YB活动
drop
TABLE
if
exists
`sweet_yb_activity`
;
drop
TABLE
if
exists
`sweet_yb_activity`
;
...
...
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetYbEnrollServiceImpl.java
View file @
fbeafb4c
...
@@ -15,6 +15,7 @@ import com.liquidnet.service.sweet.service.ISweetYbEnrollService;
...
@@ -15,6 +15,7 @@ import com.liquidnet.service.sweet.service.ISweetYbEnrollService;
import
com.liquidnet.service.sweet.utils.ObjectUtil
;
import
com.liquidnet.service.sweet.utils.ObjectUtil
;
import
com.liquidnet.service.sweet.utils.QueueUtils
;
import
com.liquidnet.service.sweet.utils.QueueUtils
;
import
com.liquidnet.service.sweet.utils.RedisDataUtils
;
import
com.liquidnet.service.sweet.utils.RedisDataUtils
;
import
org.apache.logging.log4j.util.PropertySource
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -47,6 +48,9 @@ public class SweetYbEnrollServiceImpl implements ISweetYbEnrollService {
...
@@ -47,6 +48,9 @@ public class SweetYbEnrollServiceImpl implements ISweetYbEnrollService {
if
(
param
.
getActivityId
()
==
null
||
param
.
getActivityId
().
equals
(
""
))
{
if
(
param
.
getActivityId
()
==
null
||
param
.
getActivityId
().
equals
(
""
))
{
param
.
setActivityId
(
"0"
);
param
.
setActivityId
(
"0"
);
}
}
if
(
param
.
getAge
()
==
null
)
{
param
.
setAge
(
0
);
}
LinkedList
<
String
>
sqls
=
CollectionUtil
.
linkedListString
();
LinkedList
<
String
>
sqls
=
CollectionUtil
.
linkedListString
();
LinkedList
<
Object
[]>
sqlsDataA
=
CollectionUtil
.
linkedListObjectArr
();
LinkedList
<
Object
[]>
sqlsDataA
=
CollectionUtil
.
linkedListObjectArr
();
sqls
.
add
(
SqlMapping
.
get
(
"sweet_yb_enroll.insert"
));
sqls
.
add
(
SqlMapping
.
get
(
"sweet_yb_enroll.insert"
));
...
@@ -54,7 +58,7 @@ public class SweetYbEnrollServiceImpl implements ISweetYbEnrollService {
...
@@ -54,7 +58,7 @@ public class SweetYbEnrollServiceImpl implements ISweetYbEnrollService {
IDGenerator
.
nextSnowId
(),
StringUtil
.
isEmpty
(
param
.
getContactTell
())
?
""
:
param
.
getContactTell
(),
IDGenerator
.
nextSnowId
(),
StringUtil
.
isEmpty
(
param
.
getContactTell
())
?
""
:
param
.
getContactTell
(),
StringUtil
.
isEmpty
(
param
.
getContactWechat
())
?
""
:
param
.
getContactWechat
(),
param
.
getNickname
(),
param
.
getStyle
(),
StringUtil
.
isEmpty
(
param
.
getContactWechat
())
?
""
:
param
.
getContactWechat
(),
param
.
getNickname
(),
param
.
getStyle
(),
param
.
getImgUrl
(),
param
.
getAudioUrl
(),
StringUtil
.
isEmpty
(
param
.
getUniversities
())
?
""
:
param
.
getUniversities
(),
param
.
getImgUrl
(),
param
.
getAudioUrl
(),
StringUtil
.
isEmpty
(
param
.
getUniversities
())
?
""
:
param
.
getUniversities
(),
StringUtil
.
isEmpty
(
param
.
getCityName
())
?
""
:
param
.
getCityName
(),
param
.
getActivityId
()
StringUtil
.
isEmpty
(
param
.
getCityName
())
?
""
:
param
.
getCityName
(),
param
.
getActivityId
()
,
param
.
getAge
()
});
});
queueUtils
.
sendMsgByRedis
(
MQConst
.
SweetQueue
.
SWEET_ANSWER_INSERT
.
getKey
(),
queueUtils
.
sendMsgByRedis
(
MQConst
.
SweetQueue
.
SWEET_ANSWER_INSERT
.
getKey
(),
SqlMapping
.
gets
(
sqls
,
sqlsDataA
));
SqlMapping
.
gets
(
sqls
,
sqlsDataA
));
...
@@ -69,18 +73,18 @@ public class SweetYbEnrollServiceImpl implements ISweetYbEnrollService {
...
@@ -69,18 +73,18 @@ public class SweetYbEnrollServiceImpl implements ISweetYbEnrollService {
LocalDateTime
now
=
LocalDateTime
.
now
();
LocalDateTime
now
=
LocalDateTime
.
now
();
for
(
String
id
:
list
)
{
for
(
String
id
:
list
)
{
SweetYbActivityVo
vo
=
redisDataUtils
.
getSweetYbActivityVo
(
id
);
SweetYbActivityVo
vo
=
redisDataUtils
.
getSweetYbActivityVo
(
id
);
LocalDateTime
st
=
LocalDateTime
.
parse
(
vo
.
getStartTime
(),
DTF_YMD_HMS
);
LocalDateTime
st
=
LocalDateTime
.
parse
(
vo
.
getStartTime
(),
DTF_YMD_HMS
);
LocalDateTime
et
=
LocalDateTime
.
parse
(
vo
.
getEndTime
(),
DTF_YMD_HMS
);
LocalDateTime
et
=
LocalDateTime
.
parse
(
vo
.
getEndTime
(),
DTF_YMD_HMS
);
if
(
now
.
isAfter
(
et
))
{
if
(
now
.
isAfter
(
et
))
{
vo
.
setStatus
(
9
);
vo
.
setStatus
(
9
);
}
else
if
(
now
.
isBefore
(
st
))
{
}
else
if
(
now
.
isBefore
(
st
))
{
vo
.
setStatus
(
0
);
vo
.
setStatus
(
0
);
}
else
{
}
else
{
vo
.
setStatus
(
6
);
vo
.
setStatus
(
6
);
}
}
voList
.
add
(
vo
);
voList
.
add
(
vo
);
}
}
voList
=
voList
.
stream
().
sorted
(
Comparator
.
comparing
(
SweetYbActivityVo:
:
get
EndTime
,
Comparator
.
reverseOrder
()
)).
collect
(
Collectors
.
toList
());
voList
=
voList
.
stream
().
sorted
(
Comparator
.
comparing
(
SweetYbActivityVo:
:
get
Status
,
Comparator
.
naturalOrder
()).
thenComparing
(
SweetYbActivityVo:
:
getStartTime
)).
collect
(
Collectors
.
toList
());
return
ResponseDto
.
success
(
voList
);
return
ResponseDto
.
success
(
voList
);
}
}
...
...
liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/sqlmap.properties
View file @
fbeafb4c
This diff is collapsed.
Click to expand it.
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