Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
60781dca
提交
60781dca
authored
11月 20, 2023
作者:
huyufan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
数据大屏空车接口
上级
962fdd4c
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
111 行增加
和
0 行删除
+111
-0
LargeScreenController.java
...ormance/controller/largescreen/LargeScreenController.java
+49
-0
OrderChildDao.java
.../src/main/java/com/clx/performance/dao/OrderChildDao.java
+2
-0
OrderChildDaoImpl.java
.../java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
+8
-0
OrderChildService.java
...n/java/com/clx/performance/service/OrderChildService.java
+5
-0
OrderChildServiceImpl.java
...m/clx/performance/service/impl/OrderChildServiceImpl.java
+47
-0
没有找到文件。
performance-web/src/main/java/com/clx/performance/controller/largescreen/LargeScreenController.java
0 → 100644
浏览文件 @
60781dca
package
com
.
clx
.
performance
.
controller
.
largescreen
;
import
cn.hutool.json.JSONObject
;
import
com.clx.performance.service.OrderChildService
;
import
com.clx.user.feign.DriverFeign
;
import
com.clx.user.feign.UserClxFeign
;
import
com.clx.user.vo.pc.driver.truck.DriverTruckVo
;
import
com.msl.common.result.Result
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.AllArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.List
;
/**
* @ClassName GoodsOrderController
* @Description
* @Author kavin
* @Date 2023/9/17 17:16
* @Version 1.0
*/
@Slf4j
@RestController
@RequestMapping
(
"/pc/largescreen"
)
@Validated
@AllArgsConstructor
@Api
(
tags
=
"PC-大屏"
)
public
class
LargeScreenController
{
private
final
DriverFeign
driverFeign
;
private
final
OrderChildService
orderChildService
;
@ApiOperation
(
value
=
"空车列表"
,
notes
=
"<br>By:胡宇帆"
)
@GetMapping
(
"/emptyCarList"
)
public
List
<
JSONObject
>
emptyCarList
()
{
List
<
String
>
data
=
driverFeign
.
driverTruckList
().
getData
();
return
orderChildService
.
emptyCarList
(
data
);
}
}
performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
浏览文件 @
60781dca
...
...
@@ -155,4 +155,6 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
OrderChild
getOrderCompleteLastTruck
(
String
orderNo
);
Long
haveArriveReceiveChild
(
String
orderNo
);
List
<
OrderChild
>
selectListWithEmptyCarList
();
}
performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
浏览文件 @
60781dca
...
...
@@ -486,4 +486,12 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
query
.
lt
(
OrderChild
::
getStatus
,
OrderChildEnum
.
Status
.
ARRIVE_RECEIVE
.
getCode
());
return
baseMapper
.
selectCount
(
query
);
}
@Override
public
List
<
OrderChild
>
selectListWithEmptyCarList
()
{
return
baseMapper
.
selectList
(
lQrWrapper
()
.
le
(
OrderChild
::
getStatus
,
OrderChildEnum
.
Status
.
UNSETTLE
.
getCode
())
.
ge
(
OrderChild
::
getStatus
,
OrderChildEnum
.
Status
.
CREATED
.
getCode
())
);
}
}
performance-web/src/main/java/com/clx/performance/service/OrderChildService.java
浏览文件 @
60781dca
package
com
.
clx
.
performance
.
service
;
import
cn.hutool.json.JSONObject
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.clx.performance.model.OrderChild
;
import
com.clx.performance.param.app.*
;
...
...
@@ -9,8 +10,10 @@ import com.clx.performance.param.pc.PageMonitorOrderChildQCParam;
import
com.clx.performance.param.pc.PagePoundAuditParam
;
import
com.clx.performance.vo.app.*
;
import
com.clx.performance.vo.pc.*
;
import
com.clx.user.vo.pc.driver.truck.DriverTruckVo
;
import
java.util.List
;
import
java.util.Objects
;
/**
...
...
@@ -79,4 +82,6 @@ public interface OrderChildService {
List
<
OrderChild
>
selectInTransitOrderChild
(
String
orderNo
);
DriverCancelOrderChildInfo
driverCancelOrderChildInfo
(
String
orderChildNo
);
List
<
JSONObject
>
emptyCarList
(
List
<
String
>
data
);
}
performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
浏览文件 @
60781dca
package
com
.
clx
.
performance
.
service
.
impl
;
import
cn.hutool.json.JSONObject
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.clx.order.enums.OrderEnum
;
import
com.clx.order.enums.ResultEnum
;
import
com.clx.order.feign.OrderFeign
;
import
com.clx.order.vo.feign.FeignAddressVO
;
import
com.clx.order.vo.feign.FeignOrderInfoVO
;
...
...
@@ -38,11 +40,13 @@ import com.clx.performance.service.settle.SettlementOwnerDetailService;
import
com.clx.performance.struct.*
;
import
com.clx.performance.utils.gd.GdService
;
import
com.clx.performance.utils.spring.ApplicationContextUtils
;
import
com.clx.performance.utils.zjxl.ZjxlGpsService
;
import
com.clx.performance.vo.app.*
;
import
com.clx.performance.vo.pc.*
;
import
com.clx.user.enums.driver.DriverInfoEnum
;
import
com.clx.user.vo.feign.DriverTruckInfoFeignVo
;
import
com.clx.user.vo.feign.OwnerInfoFeignVO
;
import
com.clx.user.vo.pc.driver.truck.DriverTruckVo
;
import
com.msl.common.base.Optional
;
import
com.msl.common.enums.ResultCodeEnum
;
import
com.msl.common.exception.ServiceSystemException
;
...
...
@@ -66,6 +70,7 @@ import org.springframework.transaction.annotation.Transactional;
import
java.math.BigDecimal
;
import
java.math.RoundingMode
;
import
java.time.Duration
;
import
java.time.LocalDateTime
;
import
java.util.*
;
import
java.util.concurrent.TimeUnit
;
...
...
@@ -154,6 +159,12 @@ public class OrderChildServiceImpl implements OrderChildService {
@Autowired
private
FeignPaymentService
feignPaymentService
;
@Autowired
private
TruckService
truckService
;
@Autowired
private
ZjxlGpsService
zjxlGpsService
;
@Override
public
SaveOrderChildVO
saveOrderChild
(
OrderChildSaveParam
param
)
{
...
...
@@ -1245,6 +1256,42 @@ public class OrderChildServiceImpl implements OrderChildService {
return
result
;
}
@Override
public
List
<
JSONObject
>
emptyCarList
(
List
<
String
>
data
)
{
String
now
=
DateUtils
.
formatDateTime
(
LocalDateTime
.
now
(),
"yyyy-MM-dd HH:mm:ss"
).
get
();
List
<
OrderChild
>
orderChildList
=
orderChildDao
.
selectListWithEmptyCarList
();
if
(
CollectionUtils
.
isEmpty
(
orderChildList
))
{
return
null
;
}
List
<
String
>
list
=
orderChildList
.
stream
().
map
(
OrderChild:
:
getTruckNo
).
collect
(
Collectors
.
toList
());
List
<
JSONObject
>
result
=
new
LinkedList
<>();
int
index
=
0
;
for
(
String
truckNo
:
data
)
{
if
(
list
.
contains
(
truckNo
))
{
continue
;
}
List
<
TruckTraceDTO
>
truckTrace
=
zjxlGpsService
.
getTruckTrace
(
truckNo
,
now
,
now
);
if
(
CollectionUtils
.
isNotEmpty
(
truckTrace
)){
JSONObject
jsonObject
=
new
JSONObject
();
BigDecimal
[]
location
=
truckTrace
.
get
(
truckTrace
.
size
()
-
1
).
getLocation
();
BigDecimal
longitude
=
location
[
0
].
setScale
(
4
,
BigDecimal
.
ROUND_DOWN
);
BigDecimal
latitude
=
location
[
1
].
setScale
(
4
,
BigDecimal
.
ROUND_DOWN
);
jsonObject
.
set
(
"id"
,
++
index
);
jsonObject
.
set
(
"lng"
,
longitude
);
jsonObject
.
set
(
"lat"
,
latitude
);
jsonObject
.
set
(
"info"
,
""
);
jsonObject
.
set
(
"value"
,
""
);
jsonObject
.
set
(
"iconField"
,
"ok"
);
result
.
add
(
jsonObject
);
}
}
return
result
;
}
/**
* 生成计费单
*/
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论