Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
84736271
提交
84736271
authored
12月 15, 2023
作者:
liuhaiquan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
提交判断选择车辆列表的车辆状态判断接口
上级
657cf9f1
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
53 行增加
和
15 行删除
+53
-15
JudgeTruckStatusParam.java
...a/com/clx/performance/param/pc/JudgeTruckStatusParam.java
+25
-0
TruckController.java
...va/com/clx/performance/controller/pc/TruckController.java
+9
-4
TruckService.java
...c/main/java/com/clx/performance/service/TruckService.java
+3
-4
TruckServiceImpl.java
...va/com/clx/performance/service/impl/TruckServiceImpl.java
+16
-7
没有找到文件。
performance-api/src/main/java/com/clx/performance/param/pc/JudgeTruckStatusParam.java
0 → 100644
浏览文件 @
84736271
package
com
.
clx
.
performance
.
param
.
pc
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Getter
;
import
lombok.Setter
;
import
javax.validation.constraints.NotNull
;
import
java.util.List
;
/**
* @ClassName JudgeTruckStatusParam
* @Description
* @Author kavin
* @Date 2023/12/15 14:11
* @Version 1.0
*/
@Getter
@Setter
public
class
JudgeTruckStatusParam
{
@NotNull
(
message
=
"车牌号集合不能为空"
)
@ApiModelProperty
(
"车牌号集合"
)
List
<
String
>
truckNoList
;
}
performance-web/src/main/java/com/clx/performance/controller/pc/TruckController.java
浏览文件 @
84736271
package
com
.
clx
.
performance
.
controller
.
pc
;
import
com.clx.performance.dto.zjxl.TruckTraceDTO
;
import
com.clx.performance.param.pc.OrderGoodsTruckListParam
;
import
com.clx.performance.param.pc.PageTruckListParam
;
import
com.clx.performance.param.pc.PageVicinityTruckListParam
;
import
com.clx.performance.param.pc.TruckTraceParam
;
import
com.clx.performance.param.pc.*
;
import
com.clx.performance.service.TruckService
;
import
com.clx.performance.vo.pc.OrderGoodsTruckListVO
;
import
com.clx.performance.vo.pc.PageTruckListVO
;
...
...
@@ -84,4 +81,12 @@ public class TruckController {
List
<
TruckTraceVO
>
list
=
truckService
.
getTruckTrace
(
param
);
return
Result
.
ok
(
list
);
}
@ApiOperation
(
value
=
"判断车辆状态"
,
notes
=
"<br>By:刘海泉"
)
@PostMapping
(
"/judgeTruckStatus"
)
public
Result
<
List
<
String
>>
judgeTruckStatus
(
@RequestBody
@Validated
JudgeTruckStatusParam
param
)
{
List
<
String
>
list
=
truckService
.
judgeTruckStatus
(
param
);
return
Result
.
ok
(
list
);
}
}
performance-web/src/main/java/com/clx/performance/service/TruckService.java
浏览文件 @
84736271
...
...
@@ -2,10 +2,7 @@ package com.clx.performance.service;
import
com.clx.performance.dto.zjxl.TruckCoordinateDTO
;
import
com.clx.performance.dto.zjxl.TruckTraceDTO
;
import
com.clx.performance.param.pc.OrderGoodsTruckListParam
;
import
com.clx.performance.param.pc.PageTruckListParam
;
import
com.clx.performance.param.pc.PageVicinityTruckListParam
;
import
com.clx.performance.param.pc.TruckTraceParam
;
import
com.clx.performance.param.pc.*
;
import
com.clx.performance.vo.pc.OrderGoodsTruckListVO
;
import
com.clx.performance.vo.pc.PageTruckListVO
;
import
com.clx.performance.vo.pc.TruckTraceVO
;
...
...
@@ -37,4 +34,6 @@ public interface TruckService {
List
<
OrderGoodsTruckListVO
>
getOrderGoodsTruckList
(
OrderGoodsTruckListParam
param
);
List
<
TruckTraceVO
>
getTruckTrace
(
TruckTraceParam
param
);
List
<
String
>
judgeTruckStatus
(
JudgeTruckStatusParam
param
);
}
performance-web/src/main/java/com/clx/performance/service/impl/TruckServiceImpl.java
浏览文件 @
84736271
...
...
@@ -11,10 +11,7 @@ import com.clx.performance.enums.DriverTruckEnum;
import
com.clx.performance.enums.OrderGoodsTruckBindEnum
;
import
com.clx.performance.job.TruckTraceJob
;
import
com.clx.performance.model.OrderGoodsTruckBind
;
import
com.clx.performance.param.pc.OrderGoodsTruckListParam
;
import
com.clx.performance.param.pc.PageTruckListParam
;
import
com.clx.performance.param.pc.PageVicinityTruckListParam
;
import
com.clx.performance.param.pc.TruckTraceParam
;
import
com.clx.performance.param.pc.*
;
import
com.clx.performance.service.TruckService
;
import
com.clx.performance.utils.RedisGeoUntil
;
import
com.clx.performance.utils.zjxl.ZjxlGpsService
;
...
...
@@ -268,9 +265,7 @@ public class TruckServiceImpl implements TruckService {
}
Map
<
String
,
Integer
>
truckStatusMap
=
new
HashMap
<>();
result
.
getData
().
stream
().
forEach
(
item
->{
truckStatusMap
.
put
(
item
.
getTruckNo
(),
item
.
getTruckOrderStatus
());
});
result
.
getData
().
forEach
(
item
->
truckStatusMap
.
put
(
item
.
getTruckNo
(),
item
.
getTruckOrderStatus
()));
return
truckStatusMap
;
}
...
...
@@ -399,4 +394,18 @@ public class TruckServiceImpl implements TruckService {
}
return
result
;
}
@Override
public
List
<
String
>
judgeTruckStatus
(
JudgeTruckStatusParam
param
)
{
Map
<
String
,
Integer
>
truckStatusMap
=
this
.
getTruckStatusMap
();
Set
<
String
>
set
=
new
HashSet
<>(
param
.
getTruckNoList
());
List
<
OrderGoodsTruckBind
>
binds
=
orderGoodsTruckBindDao
.
judgeTruckIsBindDxOrder
(
set
);
List
<
String
>
occupyTruckList
=
binds
.
stream
().
map
(
OrderGoodsTruckBind:
:
getTruckNo
).
collect
(
Collectors
.
toList
());
param
.
getTruckNoList
().
forEach
(
truckNo
->{
if
(!
occupyTruckList
.
contains
(
truckNo
)
&&
Objects
.
equals
(
DriverTruckEnum
.
TruckOrderStatus
.
ORDER_HEAVY
.
getCode
(),
truckStatusMap
.
get
(
truckNo
)))
{
occupyTruckList
.
add
(
truckNo
);
}
});
return
occupyTruckList
;
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论