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 d0451631
authored
Dec 04, 2023
by
Ren Ping
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:派工结果cutoff后一次性同步给bean
1 parent
78b37697
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
2 deletions
project-dispatch/src/main/java/com/dituhui/pea/dispatch/DispatchServiceApplication.java
project-dispatch/src/main/java/com/dituhui/pea/dispatch/service/impl/ExtractServiceImpl.java
project-dispatch/src/main/resources/application-dev.yaml
project-order/src/test/java/com/dituhui/pea/order/common/BeanRemoteServiceTest.java
project-dispatch/src/main/java/com/dituhui/pea/dispatch/DispatchServiceApplication.java
View file @
d045163
...
...
@@ -27,7 +27,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
*/
@SpringBootApplication
@EnableScheduling
@EnableFeignClients
(
basePackages
=
{
"com.dituhui.pea.user"
,
"com.dituhui.pea.msg"
})
@EnableFeignClients
(
basePackages
=
{
"com.dituhui.pea.user"
,
"com.dituhui.pea.msg"
,
"com.dituhui.pea.bean"
})
@Import
(
cn
.
hutool
.
extra
.
spring
.
SpringUtil
.
class
)
public
class
DispatchServiceApplication
{
...
...
project-dispatch/src/main/java/com/dituhui/pea/dispatch/service/impl/ExtractServiceImpl.java
View file @
d045163
...
...
@@ -3,8 +3,12 @@ package com.dituhui.pea.dispatch.service.impl;
import
cn.hutool.core.date.DateTime
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.date.LocalDateTimeUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.nacos.common.utils.CollectionUtils
;
import
com.dituhui.pea.bean.AllotResultParam
;
import
com.dituhui.pea.bean.RemoteBeanApi
;
import
com.dituhui.pea.dispatch.dao.*
;
import
com.dituhui.pea.dispatch.entity.*
;
import
com.dituhui.pea.dispatch.pojo.Customer
;
...
...
@@ -25,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
import
javax.persistence.EntityManager
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
import
java.time.ZoneId
;
import
java.time.format.DateTimeFormatter
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -68,6 +73,9 @@ public class ExtractServiceImpl implements ExtractService {
@Autowired
private
JdbcTemplate
jdbcTemplate
;
@Autowired
private
RemoteBeanApi
remoteBeanApi
;
/**
* 将dispath_order 中的计算结果,回写到 order_info
...
...
@@ -276,6 +284,18 @@ public class ExtractServiceImpl implements ExtractService {
orderInfoRepo
.
save
(
orderInfo
);
if
(
cutOff
)
{
AllotResultParam
allotResultParam
=
new
AllotResultParam
();
allotResultParam
.
setRisId
(
orderInfo
.
getOrderId
());
allotResultParam
.
setExecutorWorkNo
(
orderInfo
.
getEngineerCode
());
allotResultParam
.
setAssistantWorkNo
(
null
);
allotResultParam
.
setReason
(
"自动派单"
);
String
format
=
"yyyy-MM-dd HH:mm:ss"
;
allotResultParam
.
setAppointmentStartTime
(
orderInfo
.
getPlanStartTime
().
atZone
(
ZoneId
.
systemDefault
()).
toInstant
().
toEpochMilli
());
allotResultParam
.
setAppointmentEndTime
(
orderInfo
.
getPlanEndTime
().
atZone
(
ZoneId
.
systemDefault
()).
toInstant
().
toEpochMilli
());
boolean
result
=
remoteBeanApi
.
allotResultUpdate
(
allotResultParam
);
log
.
info
(
">>> 【服务工单派单结果更新】请求参数:{}, 响应结果:{}"
,
JSONObject
.
toJSON
(
allotResultParam
),
result
);
OrderEvent
orderEvent
=
new
OrderEvent
().
setOrderId
(
orderId
).
setSuborderId
(
orderInfo
.
getSubId
()).
setHappen
(
LocalDateTime
.
now
())
.
setEvent
(
"批量自动指派"
).
setOperator
(
"DISPATCH"
).
setOperatorName
(
"算法批量指派"
).
setSource
(
"PEA-DISPATCH"
)
.
setDescription
(
String
.
format
(
"批量自动指派:<%s,%s>"
,
engCode
,
engName
)).
setMemo
(
""
)
...
...
@@ -309,6 +329,7 @@ public class ExtractServiceImpl implements ExtractService {
orderInfo
.
setUpdateTime
(
LocalDateTime
.
now
());
orderInfoRepo
.
save
(
orderInfo
);
OrderLog
orderLog
=
new
OrderLog
().
setOrderId
(
orderId
).
setSuborderId
(
orderInfo
.
getSubId
()).
setSource
(
"PEA-DISPATCH"
).
setOperator
(
"DISPATCH"
)
.
setContent
(
String
.
format
(
"批量自动指派:<%s,%s>"
,
""
,
"抹掉技术员"
)).
setContentOld
(
""
)
.
setMemo
(
"批量自动指派"
).
setCreateTime
(
LocalDateTime
.
now
()).
setUpdateTime
(
LocalDateTime
.
now
());
...
...
project-dispatch/src/main/resources/application-dev.yaml
View file @
d045163
...
...
@@ -3,7 +3,7 @@ server:
dispatch
:
cron
:
expr
:
0
3
8-23 * * ?
expr
:
0
57
8-23 * * ?
next-day-limit
:
2
scheduler
:
...
...
project-order/src/test/java/com/dituhui/pea/order/common/BeanRemoteServiceTest.java
View file @
d045163
package
com
.
dituhui
.
pea
.
order
.
common
;
import
cn.hutool.core.date.LocalDateTimeUtil
;
import
com.dituhui.pea.bean.AllotResultParam
;
import
com.dituhui.pea.common.BusinessException
;
import
com.dituhui.pea.order.OrderServiceApplication
;
import
com.dituhui.pea.order.common.jackson.JsonUtil
;
...
...
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