记得上下班打卡 | 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
55299cb4
Commit
55299cb4
authored
Mar 22, 2022
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
platform和sweet setDrawAllList的limit和排序 其他都是定时任务的返回值改变影响job的执行结果
parent
f83e68a8
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
19 deletions
+20
-19
FeignPlatformCandyTaskClient.java
...ice/feign/platform/task/FeignPlatformCandyTaskClient.java
+1
-1
KylinCameraController.java
...vice/platform/controller/kylin/KylinCameraController.java
+5
-5
OrderRefundCallbackController.java
...form/controller/refund/OrderRefundCallbackController.java
+5
-6
TaskController.java
...net/service/platform/controller/sweet/TaskController.java
+2
-2
OrderRefundsCallbackServiceImpl.java
...tform/service/refund/OrderRefundsCallbackServiceImpl.java
+5
-4
SweetIntegralActivityServiceImpl.java
.../sweet/service/impl/SweetIntegralActivityServiceImpl.java
+2
-1
No files found.
liquidnet-bus-feign/liquidnet-api-feign-platform/src/main/java/com/liquidnet/service/feign/platform/task/FeignPlatformCandyTaskClient.java
View file @
55299cb4
...
...
@@ -30,5 +30,5 @@ public interface FeignPlatformCandyTaskClient {
ResponseDto
<
String
>
dueProcessForUser
();
@GetMapping
(
"followDoTask/doTask"
)
ResponseDto
doTask
();
ResponseDto
<
String
>
doTask
();
}
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/kylin/KylinCameraController.java
View file @
55299cb4
...
...
@@ -109,7 +109,7 @@ public class KylinCameraController {
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"Integer"
,
name
=
"pageNum"
,
value
=
"页码"
),
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"Integer"
,
name
=
"pageSize"
,
value
=
"数量"
)
})
public
ResponseDto
describeDevices
(
public
ResponseDto
<
String
>
describeDevices
(
@RequestParam
(
value
=
"pageNum"
,
defaultValue
=
"1"
)
Integer
pageNum
,
@RequestParam
(
value
=
"pageSize"
,
defaultValue
=
"20"
)
Integer
pageSize
)
{
...
...
@@ -182,16 +182,16 @@ public class KylinCameraController {
dataUtils
.
setCameraDevices
(
fieldId
,
kylinApiCameraDevicesVoArrayList
);
}
return
ResponseDto
.
success
();
return
ResponseDto
.
success
(
"success"
);
}
catch
(
ClientException
|
JsonProcessingException
e
)
{
log
.
error
(
"获取设备列表Exception:[msg={}, e={}]"
,
e
.
getMessage
(),
e
);
return
ResponseDto
.
failure
();
return
ResponseDto
.
failure
(
"获取设备列表Exception"
);
}
}
@GetMapping
(
value
=
"detectPedestrian"
)
@ApiOperation
(
"人体识别"
)
public
ResponseDto
detectPedestrian
()
{
public
ResponseDto
<
String
>
detectPedestrian
()
{
long
startTime1
=
System
.
currentTimeMillis
();
List
<
KylinCamera
>
cameraList
=
dataUtils
.
getCameraDevicesList
();
if
(
null
==
cameraList
)
{
...
...
@@ -208,7 +208,7 @@ public class KylinCameraController {
this
.
getPersonNum
(
kylinCamera
);
}
}
return
ResponseDto
.
success
();
return
ResponseDto
.
success
(
"success"
);
}
private
void
getPersonNum
(
KylinCamera
kylinCamera
)
{
...
...
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/refund/OrderRefundCallbackController.java
View file @
55299cb4
package
com
.
liquidnet
.
service
.
platform
.
controller
.
refund
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.kylin.dto.param.RefundCallbackParam
;
import
com.liquidnet.service.platform.service.refund.OrderRefundsCallbackServiceImpl
;
import
io.swagger.annotations.Api
;
...
...
@@ -35,15 +36,13 @@ public class OrderRefundCallbackController {
@GetMapping
(
"alipayActiveCallback"
)
@ApiOperation
(
"支付宝主动查询退款结果"
)
public
String
alipayActiveCallback
()
{
String
result
=
orderRefundsCallbackServiceImpl
.
alipayActiveCallback
();
return
result
;
public
ResponseDto
<
String
>
alipayActiveCallback
()
{
return
orderRefundsCallbackServiceImpl
.
alipayActiveCallback
();
}
@GetMapping
(
"overtimeRefund"
)
@ApiOperation
(
"超时支付自动退款"
)
public
String
overtimeRefund
()
{
String
result
=
orderRefundsCallbackServiceImpl
.
overtimeRefund
();
return
result
;
public
ResponseDto
<
String
>
overtimeRefund
()
{
return
orderRefundsCallbackServiceImpl
.
overtimeRefund
();
}
}
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/sweet/TaskController.java
View file @
55299cb4
...
...
@@ -37,7 +37,7 @@ public class TaskController {
@GetMapping
(
"doTask"
)
@ApiOperation
(
"关注任务加积分"
)
public
ResponseDto
doTask
()
{
public
ResponseDto
<
String
>
doTask
()
{
int
size
=
1000
;
int
doCount
=
usersMapper
.
selectListDoCount
();
...
...
@@ -58,7 +58,7 @@ public class TaskController {
}
}
}
return
ResponseDto
.
success
();
return
ResponseDto
.
success
(
"success"
);
}
}
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/refund/OrderRefundsCallbackServiceImpl.java
View file @
55299cb4
...
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.liquidnet.commons.lang.util.HttpUtil
;
import
com.liquidnet.commons.lang.util.JsonUtils
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.kylin.constant.KylinTableStatusConst
;
import
com.liquidnet.service.kylin.dto.param.RefundCallbackParam
;
import
com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo
;
...
...
@@ -138,7 +139,7 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
return
null
;
}
public
String
alipayActiveCallback
()
{
public
ResponseDto
<
String
>
alipayActiveCallback
()
{
LocalDateTime
startTime
=
LocalDateTime
.
now
();
LocalDateTime
newTime
=
startTime
.
minusHours
(
2
);
List
<
KylinOrderRefunds
>
kylinOrderRefunds
=
kylinOrderRefundsMapper
.
selectList
(
...
...
@@ -170,10 +171,10 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
}
}
return
"success"
;
return
ResponseDto
.
success
(
"success"
)
;
}
public
String
overtimeRefund
()
{
public
ResponseDto
<
String
>
overtimeRefund
()
{
List
<
KylinOrderRefunds
>
refundList
=
kylinOrderRefundsMapper
.
selectList
(
Wrappers
.
lambdaQuery
(
KylinOrderRefunds
.
class
)
.
eq
(
KylinOrderRefunds:
:
getType
,
KylinTableStatusConst
.
ORDER_REFUND_TYPE_AUTO
)
...
...
@@ -285,6 +286,6 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
continue
;
}
}
return
"success"
;
return
ResponseDto
.
success
(
"success"
)
;
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetIntegralActivityServiceImpl.java
View file @
55299cb4
...
...
@@ -83,7 +83,8 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
public
ResponseDto
setDrawAllList
(
String
integralActivityId
)
{
List
<
SweetIntegralActivityDraw
>
sweetIntegralActivityDraws
=
drawMapper
.
selectList
(
Wrappers
.
lambdaQuery
(
SweetIntegralActivityDraw
.
class
).
eq
(
SweetIntegralActivityDraw:
:
getIntegralActivityId
,
integralActivityId
)
.
last
(
"limit 0,35"
)
.
orderByDesc
(
SweetIntegralActivityDraw:
:
getMid
)
.
last
(
"limit 35"
)
);
List
<
String
>
asList
=
Arrays
.
asList
(
...
...
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