Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
yangxiujun
/
paidan_demo
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit ad2c4014
authored
Jul 03, 2023
by
chamberone
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
https://zhangguoping@gitlab.dituhui.com/bsh/project/pr…
…oject.git into develop
2 parents
e9575d03
b3e94725
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
6 deletions
project-order/pom.xml
project-order/src/main/java/com/dituhui/pea/order/controller/ScheduleController.java
project-order/src/main/java/com/dituhui/pea/order/service/CommonService.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderCreateServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/ScheduleServiceImpl.java
project-order/pom.xml
View file @
ad2c401
...
@@ -92,6 +92,11 @@
...
@@ -92,6 +92,11 @@
<artifactId>
spring-boot-starter-actuator
</artifactId>
<artifactId>
spring-boot-starter-actuator
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
cn.hutool
</groupId>
<artifactId>
hutool-all
</artifactId>
<version>
5.7.5
</version>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
project-order/src/main/java/com/dituhui/pea/order/controller/ScheduleController.java
View file @
ad2c401
...
@@ -22,7 +22,7 @@ public class ScheduleController {
...
@@ -22,7 +22,7 @@ public class ScheduleController {
public
Result
<?>
getScheduleOverview
(
@RequestParam
long
page
,
@RequestParam
long
size
,
@RequestParam
String
date
,
public
Result
<?>
getScheduleOverview
(
@RequestParam
long
page
,
@RequestParam
long
size
,
@RequestParam
String
date
,
@RequestParam
String
levelType
,
@RequestParam
(
"levelValue"
)
List
<
String
>
levelIds
)
{
@RequestParam
String
levelType
,
@RequestParam
(
"levelValue"
)
List
<
String
>
levelIds
)
{
Result
<?>
res
=
null
;
Result
<?>
res
=
null
;
try
{
try
{
res
=
scheduleService
.
getScheduleOverview
(
page
,
size
,
date
,
levelType
,
levelIds
);
res
=
scheduleService
.
getScheduleOverview
(
page
,
size
,
date
,
levelType
,
levelIds
);
}
catch
(
BusinessException
e
)
{
}
catch
(
BusinessException
e
)
{
return
Result
.
failed
(
e
.
getMessage
());
return
Result
.
failed
(
e
.
getMessage
());
...
...
project-order/src/main/java/com/dituhui/pea/order/service/CommonService.java
View file @
ad2c401
...
@@ -36,20 +36,24 @@ public class CommonService {
...
@@ -36,20 +36,24 @@ public class CommonService {
public
String
getTeamIdByInput
(
String
location
,
String
address
,
String
layer
)
{
public
String
getTeamIdByInput
(
String
location
,
String
address
,
String
layer
)
{
// todo 目前会随机兜底,后面将合理化
// todo 目前会随机兜底,后面将合理化
log
.
info
(
"====== getTeamIdByInput ==="
);
String
teamId
=
null
;
String
teamId
=
null
;
List
<
LayerAndArea
>
layerAndAreas
=
getLayerAndAreas
(
location
,
address
);
List
<
LayerAndArea
>
layerAndAreas
=
getLayerAndAreas
(
location
,
address
);
if
(
layerAndAreas
==
null
||
layerAndAreas
.
size
()
==
0
)
{
if
(
layerAndAreas
==
null
||
layerAndAreas
.
size
()
==
0
)
{
// 分单接口没有查到,本地随机处理一下
// 分单接口没有查到,本地随机处理一下
teamId
=
capacityTeamStatDao
.
getRandomTeamIdByLayer
(
layer
);
teamId
=
capacityTeamStatDao
.
getRandomTeamIdByLayer
(
layer
);
}
else
{
}
else
{
// 分单接口查到了areaId(blockId),查询map_block_info,从而限定groupId,然后再随机teamId,这样就相对真实一点
// 生成随机索引
// 生成随机索引
int
randomIndex
=
new
Random
().
nextInt
(
layerAndAreas
.
size
());
int
randomIndex
=
new
Random
().
nextInt
(
layerAndAreas
.
size
());
// 获取随机元素
// 获取随机元素
LayerAndArea
layerAndArea
=
layerAndAreas
.
get
(
randomIndex
);
LayerAndArea
layerAndArea
=
layerAndAreas
.
get
(
randomIndex
);
teamId
=
mapBlockInfoDao
.
getTeamIdByBlockIdAndLayer
(
layerAndArea
.
areaId
,
layer
);
teamId
=
mapBlockInfoDao
.
getTeamIdByBlockIdAndLayer
(
layerAndArea
.
areaId
,
layer
);
log
.
info
(
"layerAndArea=={}, teamId=={}"
,
layerAndArea
,
teamId
);
}
}
if
(
StringUtils
.
isEmpty
(
teamId
))
{
if
(
StringUtils
.
isEmpty
(
teamId
))
{
teamId
=
capacityTeamStatDao
.
getRandomTeamId
();
teamId
=
capacityTeamStatDao
.
getRandomTeamId
();
log
.
info
(
"查询没有teamId,需要随机生成teamId=={}"
,
teamId
);
}
}
log
.
info
(
"teamId ==> {}"
,
teamId
);
log
.
info
(
"teamId ==> {}"
,
teamId
);
assert
(
StringUtils
.
isNotEmpty
(
teamId
));
assert
(
StringUtils
.
isNotEmpty
(
teamId
));
...
@@ -80,8 +84,9 @@ public class CommonService {
...
@@ -80,8 +84,9 @@ public class CommonService {
MultiValueMap
<
String
,
Object
>
params
=
new
LinkedMultiValueMap
<>();
MultiValueMap
<
String
,
Object
>
params
=
new
LinkedMultiValueMap
<>();
params
.
add
(
"ak"
,
"284c57cbabad4755a9c657885a8df3e2"
);
params
.
add
(
"ak"
,
"284c57cbabad4755a9c657885a8df3e2"
);
if
(
StringUtils
.
isNotEmpty
(
location
))
{
if
(
StringUtils
.
isNotEmpty
(
location
))
{
url
=
"https://pea-test.bshg.com.cn/v2/xyfendan"
;
url
=
"https://pea-test.bshg.com.cn/v1/xyfendan"
;
params
.
add
(
"coordinate"
,
location
);
String
[]
coordinates
=
location
.
split
(
","
);
params
.
add
(
"coordinate"
,
String
.
format
(
"{\"x\":%s, \"y\":%s}"
,
coordinates
[
0
],
coordinates
[
1
]));
}
else
{
}
else
{
url
=
"https://pea-test.bshg.com.cn/v2/fendan"
;
url
=
"https://pea-test.bshg.com.cn/v2/fendan"
;
params
.
add
(
"addresses"
,
String
.
format
(
"[{\"address\":\"%s\"}]"
,
address
));
params
.
add
(
"addresses"
,
String
.
format
(
"[{\"address\":\"%s\"}]"
,
address
));
...
@@ -125,7 +130,7 @@ public class CommonService {
...
@@ -125,7 +130,7 @@ public class CommonService {
private
String
areaName
;
private
String
areaName
;
}
}
public
void
addOrderChange
(
String
orderId
,
String
subOrderId
,
String
source
,
String
operator
,
String
content
,
String
memo
){
public
void
addOrderChange
(
String
orderId
,
String
subOrderId
,
String
source
,
String
operator
,
String
content
,
String
memo
)
{
OrderChangeEntity
entity
=
new
OrderChangeEntity
();
OrderChangeEntity
entity
=
new
OrderChangeEntity
();
entity
.
setOrderId
(
orderId
).
setSuborderId
(
subOrderId
).
setSource
(
source
).
setOperator
(
operator
).
setContent
(
content
).
setMemo
(
memo
);
entity
.
setOrderId
(
orderId
).
setSuborderId
(
subOrderId
).
setSource
(
source
).
setOperator
(
operator
).
setContent
(
content
).
setMemo
(
memo
);
entity
.
setCreateTime
(
new
Date
()).
setUpdateTime
(
new
Date
());
entity
.
setCreateTime
(
new
Date
()).
setUpdateTime
(
new
Date
());
...
...
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderCreateServiceImpl.java
View file @
ad2c401
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
package
com
.
dituhui
.
pea
.
order
.
service
.
impl
;
package
com
.
dituhui
.
pea
.
order
.
service
.
impl
;
import
cn.hutool.core.util.IdUtil
;
import
com.dituhui.pea.common.Result
;
import
com.dituhui.pea.common.Result
;
import
com.dituhui.pea.order.dao.OrderRequestDao
;
import
com.dituhui.pea.order.dao.OrderRequestDao
;
import
com.dituhui.pea.order.dao.OrgTeamDao
;
import
com.dituhui.pea.order.dao.OrgTeamDao
;
...
@@ -85,7 +86,7 @@ public class OrderCreateServiceImpl implements OrderCreateService {
...
@@ -85,7 +86,7 @@ public class OrderCreateServiceImpl implements OrderCreateService {
public
Result
<?>
createOrder
(
OrderCreateReqDTO
req
)
{
public
Result
<?>
createOrder
(
OrderCreateReqDTO
req
)
{
log
.
info
(
"[createOrder] current XID: {}"
,
RootContext
.
getXID
());
log
.
info
(
"[createOrder] current XID: {}"
,
RootContext
.
getXID
());
OrderRequestEntity
entity
=
new
OrderRequestEntity
();
OrderRequestEntity
entity
=
new
OrderRequestEntity
();
entity
.
setId
(
UUID
.
randomUUID
().
toString
().
replace
(
"-"
,
""
));
entity
.
setId
(
IdUtil
.
getSnowflake
().
nextIdStr
(
));
String
orderId
=
req
.
getOrderId
();
String
orderId
=
req
.
getOrderId
();
if
(
StringUtils
.
isEmpty
(
orderId
))
{
if
(
StringUtils
.
isEmpty
(
orderId
))
{
orderId
=
UUID
.
randomUUID
().
toString
().
replace
(
"-"
,
""
);
orderId
=
UUID
.
randomUUID
().
toString
().
replace
(
"-"
,
""
);
...
...
project-order/src/main/java/com/dituhui/pea/order/service/impl/ScheduleServiceImpl.java
View file @
ad2c401
...
@@ -22,6 +22,7 @@ import java.util.List;
...
@@ -22,6 +22,7 @@ import java.util.List;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
@Service
@Service
public
class
ScheduleServiceImpl
implements
ScheduleService
{
public
class
ScheduleServiceImpl
implements
ScheduleService
{
...
@@ -162,7 +163,10 @@ public class ScheduleServiceImpl implements ScheduleService {
...
@@ -162,7 +163,10 @@ public class ScheduleServiceImpl implements ScheduleService {
dynamics
.
add
(
new
LabelValueDTO
(
"交通工具"
,
"电动车"
));
dynamics
.
add
(
new
LabelValueDTO
(
"交通工具"
,
"电动车"
));
List
<
String
>
orderIds
=
orderAppointments
.
stream
().
map
(
OrderAppointment:
:
getOrderId
).
collect
(
Collectors
.
toList
());
List
<
String
>
orderIds
=
orderAppointments
.
stream
().
map
(
OrderAppointment:
:
getOrderId
).
collect
(
Collectors
.
toList
());
List
<
OrderRequest
>
orderRequests
=
orderRequestMPDao
.
selectByOrderIds
(
orderIds
);
List
<
OrderRequest
>
orderRequests
=
new
ArrayList
<>();
if
(
orderIds
!=
null
&&
!
orderIds
.
isEmpty
())
{
orderRequests
=
orderRequestMPDao
.
selectByOrderIds
(
orderIds
);
}
List
<
ScheduleEngineerOverviewResp
.
Order
>
orders
=
new
ArrayList
<>();
List
<
ScheduleEngineerOverviewResp
.
Order
>
orders
=
new
ArrayList
<>();
for
(
OrderRequest
o
:
orderRequests
)
{
for
(
OrderRequest
o
:
orderRequests
)
{
ScheduleEngineerOverviewResp
.
Order
item
=
new
ScheduleEngineerOverviewResp
.
Order
();
ScheduleEngineerOverviewResp
.
Order
item
=
new
ScheduleEngineerOverviewResp
.
Order
();
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment