Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
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
项目统一框架
amos-boot-biz
Commits
ade97329
Commit
ade97329
authored
Aug 11, 2021
by
kongfm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
接口测试修正
parent
61d65968
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
210 additions
and
155 deletions
+210
-155
RescueProcessDto.java
...eejoin/amos/boot/module/tzs/api/dto/RescueProcessDto.java
+6
-0
Elevator.java
...com/yeejoin/amos/boot/module/tzs/api/entity/Elevator.java
+0
-3
DispatchPaperEnums.java
...in/amos/boot/module/tzs/api/enums/DispatchPaperEnums.java
+53
-33
IDispatchPaperService.java
...os/boot/module/tzs/api/service/IDispatchPaperService.java
+3
-3
IRepairConsultService.java
...os/boot/module/tzs/api/service/IRepairConsultService.java
+3
-1
AlertCalledController.java
...boot/module/tzs/biz/controller/AlertCalledController.java
+5
-10
DispatchPaperController.java
...ot/module/tzs/biz/controller/DispatchPaperController.java
+3
-3
DispatchTaskController.java
...oot/module/tzs/biz/controller/DispatchTaskController.java
+5
-1
RescueProcessController.java
...ot/module/tzs/biz/controller/RescueProcessController.java
+6
-2
AlertCalledServiceImpl.java
...t/module/tzs/biz/service/impl/AlertCalledServiceImpl.java
+10
-33
DispatchPaperServiceImpl.java
...module/tzs/biz/service/impl/DispatchPaperServiceImpl.java
+35
-12
DispatchTaskServiceImpl.java
.../module/tzs/biz/service/impl/DispatchTaskServiceImpl.java
+19
-6
RepairConsultServiceImpl.java
...module/tzs/biz/service/impl/RepairConsultServiceImpl.java
+18
-43
RescueProcessServiceImpl.java
...module/tzs/biz/service/impl/RescueProcessServiceImpl.java
+41
-5
application-dev.properties
...-system-tzs/src/main/resources/application-dev.properties
+3
-0
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/RescueProcessDto.java
View file @
ade97329
...
...
@@ -30,6 +30,12 @@ public class RescueProcessDto extends BaseDto {
@ApiModelProperty
(
value
=
"是否手动派遣"
)
private
Boolean
dispatchByUser
=
false
;
@ApiModelProperty
(
value
=
"是否手动到达"
)
private
Boolean
arriveByUser
=
false
;
@ApiModelProperty
(
value
=
"是否手动救援"
)
private
Boolean
saveByUser
=
false
;
@ApiModelProperty
(
value
=
"派遣时间"
)
private
Date
dispatchTime
;
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/Elevator.java
View file @
ade97329
...
...
@@ -189,9 +189,6 @@ public class Elevator extends BaseEntity {
@ApiModelProperty
(
value
=
"功率"
)
private
String
power
;
@ApiModelProperty
(
value
=
"设备图片"
)
private
String
photos
;
@ApiModelProperty
(
value
=
"原始表id(来自历史数据库)"
)
private
String
originalId
;
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/DispatchPaperEnums.java
View file @
ade97329
...
...
@@ -9,63 +9,65 @@ public enum DispatchPaperEnums {
//完成状态 WCZT
notFinish
(
"notFinish"
,
"未完成"
),
hasFinished
(
"hasFinished"
,
"已完成"
),
notFinish
(
"
858"
,
"
notFinish"
,
"未完成"
),
hasFinished
(
"
859"
,
"
hasFinished"
,
"已完成"
),
//处置环节 CZHJ
receivedAlert
(
"receivedAlert"
,
"已接警"
),
dispatched
(
"dispatched"
,
"已派遣"
),
rescueArrived
(
"rescueArrived"
,
"救援已到达"
),
repaireArrived
(
"repaireArrived"
,
"维保已到达"
),
rescued
(
"rescued"
,
"救援完成"
),
rescueBack
(
"rescueBack"
,
"救援回访"
),
repaired
(
"repaired"
,
"维修完成"
),
reportorBack
(
"reportorBack"
,
"报修人已反馈"
),
disposed
(
"disposed"
,
"维保已处置"
),
complainantBack
(
"complainantBack"
,
"投诉人已回访"
),
receivedAlert
(
"
860"
,
"
receivedAlert"
,
"已接警"
),
dispatched
(
"
861"
,
"
dispatched"
,
"已派遣"
),
rescueArrived
(
"
862"
,
"
rescueArrived"
,
"救援已到达"
),
repaireArrived
(
"
863"
,
"
repaireArrived"
,
"维保已到达"
),
rescued
(
"
864"
,
"
rescued"
,
"救援完成"
),
rescueBack
(
"
865"
,
"
rescueBack"
,
"救援回访"
),
repaired
(
"
866"
,
"
repaired"
,
"维修完成"
),
reportorBack
(
"
867"
,
"
reportorBack"
,
"报修人已反馈"
),
disposed
(
"
868"
,
"
disposed"
,
"维保已处置"
),
complainantBack
(
"
869"
,
"
complainantBack"
,
"投诉人已回访"
),
// 警情类型 JJLX
KRJY
(
"KRJY"
,
"困人救援"
,
"250"
),
GZWX
(
"GZWX"
,
"故障维修"
,
"251"
),
TSZX
(
"TSZX"
,
"投诉咨询"
,
"252"
),
KRJY
(
"
960"
,
"
KRJY"
,
"困人救援"
,
"250"
),
GZWX
(
"
961"
,
"
GZWX"
,
"故障维修"
,
"251"
),
TSZX
(
"
962"
,
"
TSZX"
,
"投诉咨询"
,
"252"
),
// 反馈方式 FKFS
mainBack
(
"mainBack"
,
"主动反馈"
),
phoneBack
(
"phoneBack"
,
"电话回访"
),
mainBack
(
"
856"
,
"
mainBack"
,
"主动反馈"
),
phoneBack
(
"
857"
,
"
phoneBack"
,
"电话回访"
),
// 维修结果 WXJG
hasRepaired
(
"hasRepaired"
,
"维修成功"
),
other
(
"other"
,
"其他"
),
hasRepaired
(
"
940"
,
"
hasRepaired"
,
"维修成功"
),
other
(
"
941"
,
"
other"
,
"其他"
),
// 处置结果 CZJG
hasDisposed
(
"hasDisposed"
,
"已处置"
),
notDispose
(
"notDispose"
,
"未处置"
),
hasDisposed
(
"
944"
,
"
hasDisposed"
,
"已处置"
),
notDispose
(
"
945"
,
"
notDispose"
,
"未处置"
),
// 反馈结果 FKJG
satisfactory
(
"satisfactory"
,
"满意"
),
unsatisfactory
(
"unsatisfactory"
,
"不满意"
),
satisfactory
(
"
942"
,
"
satisfactory"
,
"满意"
),
unsatisfactory
(
"
943"
,
"
unsatisfactory"
,
"不满意"
),
// 派遣单位 PQDW
useUnit
(
"useUnit"
,
"使用单位"
),
repairUnit
(
"repairUnit"
,
"维保单位"
),
levelOneUnit
(
"levelOneUnit"
,
"一级响应"
),
levelTwoUnit
(
"levelTwoUnit"
,
"二级响应"
),
levelThreeUnit
(
"levelThreeUnit"
,
"三级响应"
);
useUnit
(
"949"
,
"useUnit"
,
"使用单位"
),
repairUnit
(
"950"
,
"repairUnit"
,
"维保单位"
),
levelOneUnit
(
"951"
,
"levelOneUnit"
,
"一级响应"
),
levelTwoUnit
(
"952"
,
"levelTwoUnit"
,
"二级响应"
),
levelThreeUnit
(
"953"
,
"levelThreeUnit"
,
"三级响应"
);
private
String
id
;
private
String
code
;
private
String
value
;
private
String
dynamicCode
;
DispatchPaperEnums
(
String
code
,
String
value
)
{
DispatchPaperEnums
(
String
id
,
String
code
,
String
value
)
{
this
.
id
=
id
;
this
.
code
=
code
;
this
.
value
=
value
;
}
DispatchPaperEnums
(
String
code
,
String
value
,
String
dynamicCode
)
{
DispatchPaperEnums
(
String
id
,
String
code
,
String
value
,
String
dynamicCode
)
{
this
.
id
=
id
;
this
.
code
=
code
;
this
.
value
=
value
;
this
.
dynamicCode
=
dynamicCode
;
...
...
@@ -83,6 +85,14 @@ public enum DispatchPaperEnums {
this
.
value
=
value
;
}
public
String
getId
()
{
return
id
;
}
public
void
setId
(
String
id
)
{
this
.
id
=
id
;
}
public
String
getDynamicCode
()
{
return
dynamicCode
;
}
...
...
@@ -91,7 +101,7 @@ public enum DispatchPaperEnums {
this
.
dynamicCode
=
dynamicCode
;
}
public
static
DispatchPaperEnums
getEnum
(
String
code
)
public
static
DispatchPaperEnums
getEnum
ByCode
(
String
code
)
{
for
(
DispatchPaperEnums
status
:
DispatchPaperEnums
.
values
())
{
...
...
@@ -102,6 +112,16 @@ public enum DispatchPaperEnums {
}
return
null
;
}
public
static
DispatchPaperEnums
getEnumById
(
String
code
)
{
for
(
DispatchPaperEnums
status
:
DispatchPaperEnums
.
values
())
{
if
(
status
.
getId
().
equals
(
code
))
{
return
status
;
}
}
return
null
;
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IDispatchPaperService.java
View file @
ade97329
...
...
@@ -41,7 +41,7 @@ public interface IDispatchPaperService {
* @param dispatchSaveFeedbackDto
* @return
*/
Boolean
saveDispatchSaveFeedback
(
DispatchSaveFeedbackDto
dispatchSaveFeedbackDto
);
Boolean
saveDispatchSaveFeedback
(
DispatchSaveFeedbackDto
dispatchSaveFeedbackDto
,
AgencyUserModel
user
);
/**
* 根据警情id 返回 维修回访相关信息
...
...
@@ -56,7 +56,7 @@ public interface IDispatchPaperService {
* @param dispatchRepairFeedbackDto
* @return
*/
Boolean
saveDispatchRepairFeedback
(
DispatchRepairFeedbackDto
dispatchRepairFeedbackDto
);
Boolean
saveDispatchRepairFeedback
(
DispatchRepairFeedbackDto
dispatchRepairFeedbackDto
,
AgencyUserModel
user
);
/**
* 根据警情id 返回 投诉回访相关信息
...
...
@@ -71,7 +71,7 @@ public interface IDispatchPaperService {
* @param dispatchConsultFeedbackDto
* @return
*/
Boolean
saveDispatchConsultFeedback
(
DispatchConsultFeedbackDto
dispatchConsultFeedbackDto
);
Boolean
saveDispatchConsultFeedback
(
DispatchConsultFeedbackDto
dispatchConsultFeedbackDto
,
AgencyUserModel
user
);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IRepairConsultService.java
View file @
ade97329
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tzs
.
api
.
service
;
import
com.yeejoin.amos.feign.privilege.model.AgencyUserModel
;
/**
* 警情填报业务数据项接口类
*
...
...
@@ -16,6 +18,6 @@ public interface IRepairConsultService {
* @param taskId
* @return
*/
Boolean
saveRepairConsultByAlertIdType
(
Long
alertId
,
String
type
,
Long
taskId
);
Boolean
saveRepairConsultByAlertIdType
(
Long
alertId
,
String
type
,
Long
taskId
,
AgencyUserModel
user
);
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/AlertCalledController.java
View file @
ade97329
...
...
@@ -26,6 +26,7 @@ import com.yeejoin.amos.boot.module.tzs.biz.service.impl.DispatchPaperServiceImp
import
com.yeejoin.amos.boot.module.tzs.biz.service.impl.ESAlertCalledService
;
import
com.yeejoin.amos.boot.module.tzs.biz.utils.AlertBeanDtoVoUtils
;
import
com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils
;
import
com.yeejoin.amos.feign.privilege.model.AgencyUserModel
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.apache.commons.lang3.StringUtils
;
...
...
@@ -87,16 +88,10 @@ public class AlertCalledController extends BaseController {
||
ValidationUtil
.
isEmpty
(
alertCalledObjsDto
.
getAlertCalledDto
())){
throw
new
BadRequest
(
"参数校验失败."
);
}
ReginParams
reginParams
=
JSONObject
.
parseObject
(
null
!=
redisUtils
.
get
(
buildKey
(
getToken
()))
?
redisUtils
.
get
(
buildKey
(
getToken
())).
toString
()
:
null
,
ReginParams
.
class
);
//获取当前登录人公司
// Integer code= reginParams.getCompany().getCompanyOrgCode();
// AlertCalled alertCalled = alertCalledObjsDto.getAlertCalled();
// alertCalled.setOrgCode(String.valueOf(code));
// alertCalledObjsDto.setAlertCalled(alertCalled);
alertCalledObjsDto
=
iAlertCalledService
.
createAlertCalled
(
alertCalledObjsDto
);
AgencyUserModel
user
=
new
AgencyUserModel
();
user
.
setUserName
(
"陈浩"
);
user
.
setUserId
(
"jcs_ch"
);
alertCalledObjsDto
=
iAlertCalledService
.
createAlertCalled
(
alertCalledObjsDto
,
user
);
return
ResponseHelper
.
buildResponse
(
alertCalledObjsDto
.
getAlertCalledDto
());
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/DispatchPaperController.java
View file @
ade97329
...
...
@@ -71,7 +71,7 @@ public class DispatchPaperController extends BaseController {
if
(
ValidationUtil
.
isEmpty
(
dispatchSaveFeedbackDto
)
||
ValidationUtil
.
isEmpty
(
dispatchSaveFeedbackDto
.
getAlertId
()))
throw
new
BadRequest
(
"参数校验失败."
);
return
ResponseHelper
.
buildResponse
(
dispatchPaperServiceImpl
.
saveDispatchSaveFeedback
(
dispatchSaveFeedbackDto
));
return
ResponseHelper
.
buildResponse
(
dispatchPaperServiceImpl
.
saveDispatchSaveFeedback
(
dispatchSaveFeedbackDto
,
getSelectedOrgInfo
().
getUserModel
()
));
}
/**
...
...
@@ -100,7 +100,7 @@ public class DispatchPaperController extends BaseController {
if
(
ValidationUtil
.
isEmpty
(
dispatchRepairFeedbackDto
)
||
ValidationUtil
.
isEmpty
(
dispatchRepairFeedbackDto
.
getAlertId
()))
throw
new
BadRequest
(
"参数校验失败."
);
return
ResponseHelper
.
buildResponse
(
dispatchPaperServiceImpl
.
saveDispatchRepairFeedback
(
dispatchRepairFeedbackDto
));
return
ResponseHelper
.
buildResponse
(
dispatchPaperServiceImpl
.
saveDispatchRepairFeedback
(
dispatchRepairFeedbackDto
,
getSelectedOrgInfo
().
getUserModel
()
));
}
/**
...
...
@@ -128,7 +128,7 @@ public class DispatchPaperController extends BaseController {
if
(
ValidationUtil
.
isEmpty
(
dispatchConsultFeedbackDto
)
||
ValidationUtil
.
isEmpty
(
dispatchConsultFeedbackDto
.
getAlertId
()))
throw
new
BadRequest
(
"参数校验失败."
);
return
ResponseHelper
.
buildResponse
(
dispatchPaperServiceImpl
.
saveDispatchConsultFeedback
(
dispatchConsultFeedbackDto
));
return
ResponseHelper
.
buildResponse
(
dispatchPaperServiceImpl
.
saveDispatchConsultFeedback
(
dispatchConsultFeedbackDto
,
getSelectedOrgInfo
().
getUserModel
()
));
}
/**
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/DispatchTaskController.java
View file @
ade97329
...
...
@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import
com.yeejoin.amos.boot.biz.common.utils.RedisUtils
;
import
com.yeejoin.amos.boot.module.tzs.api.entity.AlertFormValue
;
import
com.yeejoin.amos.boot.module.tzs.api.entity.DispatchTask
;
import
com.yeejoin.amos.feign.privilege.model.AgencyUserModel
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.Api
;
...
...
@@ -67,7 +68,10 @@ public class DispatchTaskController extends BaseController {
ReginParams
reginParams
=
JSONObject
.
parseObject
(
null
!=
redisUtils
.
get
(
buildKey
(
getToken
()))
?
redisUtils
.
get
(
buildKey
(
getToken
())).
toString
()
:
null
,
ReginParams
.
class
);
Boolean
flag
=
dispatchTaskServiceImpl
.
createDispatchTask
(
model
,
reginParams
.
getUserModel
());
AgencyUserModel
user
=
new
AgencyUserModel
();
user
.
setUserName
(
"陈浩"
);
user
.
setUserId
(
"jcs_ch"
);
Boolean
flag
=
dispatchTaskServiceImpl
.
createDispatchTask
(
model
,
user
);
return
ResponseHelper
.
buildResponse
(
flag
);
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/RescueProcessController.java
View file @
ade97329
...
...
@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import
com.yeejoin.amos.boot.biz.common.utils.RedisUtils
;
import
com.yeejoin.amos.boot.module.tzs.api.entity.RescueStation
;
import
com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils
;
import
com.yeejoin.amos.feign.privilege.model.AgencyUserModel
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.Api
;
...
...
@@ -50,12 +51,15 @@ public class RescueProcessController extends BaseController {
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PostMapping
(
value
=
"/updateByAlertId"
)
@ApiOperation
(
httpMethod
=
"P
U
T"
,
value
=
"根据警情id 更新救援信息表"
,
notes
=
"根据警情id 更新救援信息表"
)
@ApiOperation
(
httpMethod
=
"P
OS
T"
,
value
=
"根据警情id 更新救援信息表"
,
notes
=
"根据警情id 更新救援信息表"
)
public
ResponseModel
<
Boolean
>
save
(
@RequestBody
RescueProcessDto
model
)
{
ReginParams
reginParams
=
JSONObject
.
parseObject
(
null
!=
redisUtils
.
get
(
buildKey
(
getToken
()))
?
redisUtils
.
get
(
buildKey
(
getToken
())).
toString
()
:
null
,
ReginParams
.
class
);
boolean
update
=
rescueProcessServiceImpl
.
updateByAlertId
(
model
,
reginParams
.
getUserModel
());
AgencyUserModel
user
=
new
AgencyUserModel
();
user
.
setUserName
(
"陈浩"
);
user
.
setUserId
(
"jcs_ch"
);
boolean
update
=
rescueProcessServiceImpl
.
updateByAlertId
(
model
,
user
);
return
ResponseHelper
.
buildResponse
(
update
);
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/AlertCalledServiceImpl.java
View file @
ade97329
...
...
@@ -20,6 +20,7 @@ import com.yeejoin.amos.boot.module.tzs.api.mapper.AlertCalledMapper;
import
com.yeejoin.amos.boot.module.tzs.api.service.IAlertCalledService
;
import
com.yeejoin.amos.boot.module.tzs.biz.utils.AlertBeanDtoVoUtils
;
import
com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils
;
import
com.yeejoin.amos.feign.privilege.model.AgencyUserModel
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -69,6 +70,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
@Autowired
RescueProcessServiceImpl
rescueProcessServiceImpl
;
@Autowired
RepairConsultServiceImpl
repairConsultServiceImpl
;
private
final
Logger
logger
=
LogManager
.
getLogger
(
AlertCalledServiceImpl
.
class
);
...
...
@@ -159,7 +162,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
* @return
*/
@Transactional
(
rollbackFor
=
RuntimeException
.
class
)
public
AlertCalledObjsDto
createAlertCalled
(
AlertCalledObjsDto
alertCalledObjsDto
)
{
public
AlertCalledObjsDto
createAlertCalled
(
AlertCalledObjsDto
alertCalledObjsDto
,
AgencyUserModel
user
)
{
try
{
// 警情基本信息
...
...
@@ -172,9 +175,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
// 警情归并,设置当前警情状态为结束。
alertCalled
.
setAlertStatus
(
true
);
alertCalled
.
setAlertStage
(
AlertStageEnums
.
JJ
.
getValue
());
alertCalled
.
setAlertStageCode
(
AlertStageEnums
.
JJ
.
get
Code
());
alertCalled
.
setAlertStageCode
(
AlertStageEnums
.
JJ
.
get
Id
());
alertCalled
.
setType
(
AlertStageEnums
.
JQGB
.
getValue
());
alertCalled
.
setTypeCode
(
AlertStageEnums
.
JQGB
.
get
Code
());
alertCalled
.
setTypeCode
(
AlertStageEnums
.
JQGB
.
get
Id
());
this
.
save
(
alertCalled
);
// 动态表单
List
<
AlertFormValue
>
alertFormValuelist
=
alertCalledObjsDto
.
getAlertFormValue
();
...
...
@@ -195,9 +198,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
alertCalled
.
setAlertStatus
(
false
);
alertCalled
.
setIsDelete
(
false
);
alertCalled
.
setAlertStage
(
AlertStageEnums
.
JJ
.
getValue
());
alertCalled
.
setAlertStageCode
(
AlertStageEnums
.
JJ
.
get
Code
());
alertCalled
.
setAlertStageCode
(
AlertStageEnums
.
JJ
.
get
Id
());
alertCalled
.
setType
(
AlertStageEnums
.
JQCB
.
getValue
());
alertCalled
.
setTypeCode
(
AlertStageEnums
.
JQCB
.
get
Code
());
alertCalled
.
setTypeCode
(
AlertStageEnums
.
JQCB
.
get
Id
());
this
.
save
(
alertCalled
);
// 动态表单
...
...
@@ -207,7 +210,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
alertFormValue
.
setAlertCalledId
(
alertCalled
.
getSequenceNbr
());
alertFormValue
.
setAlertTypeCode
(
alertCalled
.
getAlarmTypeCode
());
});
if
(
AlertStageEnums
.
KRJY
.
get
Code
().
equals
(
alertCalled
.
getAlarmTypeCode
())
)
{
if
(
AlertStageEnums
.
KRJY
.
get
Id
().
equals
(
alertCalled
.
getAlarmTypeCode
())
)
{
//困人救援创建警情时创建救援过程信息
rescueProcessServiceImpl
.
getProcessByAlertId
(
alertCalled
.
getSequenceNbr
());
}
...
...
@@ -216,15 +219,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
iAlertFormValueService
.
saveBatch
(
alertFormValuelist
);
alertCalledObjsDto
.
setAlertCalledDto
(
BeanDtoVoUtils
.
convert
(
alertCalled
,
AlertCalledDto
.
class
));
alertCalledObjsDto
.
setAlertFormValue
(
alertFormValuelist
);
//保存处置记录-接警
if
(
AlertStageEnums
.
KRJY
.
getCode
().
equals
(
alertCalled
.
getAlarmTypeCode
()))
{
saveRapairConsylt
(
AlertStageEnums
.
JJ
.
getCode
(),
alertCalled
);
}
else
if
(
AlertStageEnums
.
GZWX
.
getCode
().
equals
(
alertCalled
.
getAlarmTypeCode
()))
{
saveRapairConsylt
(
AlertStageEnums
.
JJ
.
getCode
(),
alertCalled
);
}
else
{
saveRapairConsylt
(
AlertStageEnums
.
JJ
.
getCode
(),
alertCalled
);
}
repairConsultServiceImpl
.
saveRepairConsultByAlertIdType
(
alertCalled
.
getSequenceNbr
(),
"JJ"
,
null
,
user
);
//保存接警日志
}
/**
...
...
@@ -239,25 +235,6 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
}
}
private
void
saveRapairConsylt
(
String
typeCode
,
AlertCalled
alertCalled
)
throws
ParseException
{
// 获取警情接警处置记录模板
Template
template
=
templateService
.
getOne
(
new
QueryWrapper
<
Template
>().
eq
(
"type_code"
,
typeCode
).
eq
(
"format"
,
false
));
String
templateContent
=
template
.
getContent
();
String
transferDetails
=
templateContent
.
replace
(
"callTime"
,
DateUtils
.
dateTimeToDateString
(
alertCalled
.
getCallTime
()))
.
replace
(
"user"
,
alertCalled
.
getRecUserName
()).
replace
(
"emergencyCall"
,
alertCalled
.
getEmergencyCall
());
RepairConsult
repairConsult
=
new
RepairConsult
();
repairConsult
.
setParentId
(
alertCalled
.
getSequenceNbr
());
repairConsult
.
setType
(
alertCalled
.
getAlarmTypeCode
());
repairConsult
.
setAlertStageCode
(
alertCalled
.
getAlertStageCode
());
repairConsult
.
setAlertStatus
(
alertCalled
.
getAlertStage
());
repairConsult
.
setContactUser
(
alertCalled
.
getEmergencyPerson
());
repairConsult
.
setContactPhone
(
alertCalled
.
getContactPhone
());
repairConsult
.
setDescription
(
transferDetails
);
repairConsultService
.
save
(
repairConsult
);
}
public
Map
<
String
,
Object
>
getAlertInfoList
(
String
beginDate
,
String
endDate
,
String
orgCode
,
String
recUserId
)
{
Map
<
String
,
Object
>
result
=
Maps
.
newHashMap
();
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/DispatchPaperServiceImpl.java
View file @
ade97329
...
...
@@ -18,6 +18,7 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchPaper;
import
com.yeejoin.amos.boot.module.tzs.api.entity.DispatchTask
;
import
com.yeejoin.amos.boot.module.tzs.api.entity.Elevator
;
import
com.yeejoin.amos.boot.module.tzs.api.entity.MaintenanceUnit
;
import
com.yeejoin.amos.boot.module.tzs.api.enums.AlertStageEnums
;
import
com.yeejoin.amos.boot.module.tzs.api.enums.DispatchPaperEnums
;
import
com.yeejoin.amos.boot.module.tzs.api.mapper.DispatchPaperMapper
;
import
com.yeejoin.amos.boot.module.tzs.api.service.IDispatchPaperService
;
...
...
@@ -69,6 +70,8 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
@Autowired
private
RescueProcessServiceImpl
rescueProcessServiceImpl
;
@Autowired
RepairConsultServiceImpl
repairConsultServiceImpl
;
/**
* 分页查询
...
...
@@ -108,7 +111,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
// 填充警情主键
paperFormValuelist
.
stream
().
forEach
(
paperFormValue
->
{
paperFormValue
.
setAlertCalledId
(
dispatchPaper
.
getSequenceNbr
());
paperFormValue
.
setAlertTypeCode
(
DispatchPaperEnums
.
getEnum
(
dispatchPaper
.
getAlertCode
()).
getDynamicCode
());
paperFormValue
.
setAlertTypeCode
(
DispatchPaperEnums
.
getEnum
ById
(
dispatchPaper
.
getAlertCode
()).
getDynamicCode
());
});
// 保存动态表单数据
iAlertFormValueService
.
saveBatch
(
paperFormValuelist
);
...
...
@@ -134,7 +137,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
dispatchPaperFormDto
.
setDispatchPaper
(
dispatchPaper
);
QueryWrapper
<
AlertFormValue
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
eq
(
"alert_called_id"
,
dispatchPaper
.
getSequenceNbr
()).
eq
(
"alert_type_code"
,
DispatchPaperEnums
.
getEnum
(
dispatchPaper
.
getAlertCode
()).
getDynamicCode
());
queryWrapper
.
eq
(
"alert_called_id"
,
dispatchPaper
.
getSequenceNbr
()).
eq
(
"alert_type_code"
,
DispatchPaperEnums
.
getEnum
ById
(
dispatchPaper
.
getAlertCode
()).
getDynamicCode
());
// 派遣单动态表单数据
List
<
AlertFormValue
>
list
=
iAlertFormValueService
.
list
(
queryWrapper
);
dispatchPaperFormDto
.
setDynamicFormAlert
(
list
);
...
...
@@ -154,13 +157,13 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
dispatchPaper
.
setDispatchTime
(
new
Date
());
dispatchPaper
.
setIsDelete
(
false
);
// 完成状态 派遣状态 派遣人
DispatchPaperEnums
finishStatus
=
DispatchPaperEnums
.
getEnum
(
"notFinish"
);
DispatchPaperEnums
finishStatus
=
DispatchPaperEnums
.
getEnum
ByCode
(
"notFinish"
);
dispatchPaper
.
setPaperStatus
(
finishStatus
.
getValue
());
dispatchPaper
.
setPaperStatusCode
(
finishStatus
.
get
Code
());
dispatchPaper
.
setPaperStatusCode
(
finishStatus
.
get
Id
());
DispatchPaperEnums
dispatchStatus
=
DispatchPaperEnums
.
getEnum
(
"receivedAlert"
);
DispatchPaperEnums
dispatchStatus
=
DispatchPaperEnums
.
getEnum
ByCode
(
"receivedAlert"
);
dispatchPaper
.
setProcessStatus
(
dispatchStatus
.
getValue
());
dispatchPaper
.
setProcessStatusCode
(
dispatchStatus
.
get
Code
());
dispatchPaper
.
setProcessStatusCode
(
dispatchStatus
.
get
Id
());
dispatchPaper
.
setSendUserId
(
sendUser
.
getUserId
());
dispatchPaper
.
setSendUserName
(
sendUser
.
getUserName
());
...
...
@@ -173,13 +176,13 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
this
.
save
(
dispatchPaper
);
// 根据类型创建动态表单信息
String
dynamicCode
=
DispatchPaperEnums
.
getEnum
(
alertCode
).
getDynamicCode
();
String
dynamicCode
=
DispatchPaperEnums
.
getEnum
ById
(
alertCode
).
getDynamicCode
();
List
<
AlertFormInitDto
>
alertFormInitDtoList
=
alertFormServiceImpl
.
getFormlist
(
dynamicCode
);
List
<
AlertFormValue
>
paperFormValuelist
=
new
ArrayList
<
AlertFormValue
>(
alertFormInitDtoList
.
size
());
// 填充警情主键
alertFormInitDtoList
.
stream
().
forEach
(
initDto
->
{
initDto
.
getFormItemDescr
().
setAlertCalledId
(
dispatchPaper
.
getSequenceNbr
());
initDto
.
getFormItemDescr
().
setAlertTypeCode
(
DispatchPaperEnums
.
getEnum
(
dispatchPaper
.
getAlertCode
()).
getDynamicCode
()
);
initDto
.
getFormItemDescr
().
setAlertTypeCode
(
dynamicCode
);
initDto
.
getFormItemDescr
().
setFieldValue
(
null
);
paperFormValuelist
.
add
(
initDto
.
getFormItemDescr
());
});
...
...
@@ -188,7 +191,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
dispatchPaperFormDto
.
setDispatchPaper
(
dispatchPaper
);
dispatchPaperFormDto
.
setDynamicFormAlert
(
paperFormValuelist
);
if
(
"KRJY"
.
equals
(
alertCode
))
{
if
(
"KRJY"
.
equals
(
AlertStageEnums
.
getEnumById
(
alertCode
).
getCode
()
))
{
RescueProcessDto
rescueProcessDto
=
new
RescueProcessDto
();
rescueProcessDto
.
setAlertId
(
alertId
);
rescueProcessDto
.
setDispatchStatus
(
true
);
...
...
@@ -299,7 +302,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
}
@Override
public
Boolean
saveDispatchSaveFeedback
(
DispatchSaveFeedbackDto
dispatchSaveFeedbackDto
)
{
public
Boolean
saveDispatchSaveFeedback
(
DispatchSaveFeedbackDto
dispatchSaveFeedbackDto
,
AgencyUserModel
user
)
{
Boolean
flag
=
false
;
// 保存救援回访信息
DispatchPaperFormDto
dispatchPaperFormDto
=
this
.
selectDispatchPaperDtoByAlertId
(
dispatchSaveFeedbackDto
.
getAlertId
());
...
...
@@ -356,6 +359,14 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
iAlertFormValueService
.
updateBatchById
(
dynamicFormAlert
);
// 保存派遣表
flag
=
this
.
updateById
(
dispatchPaper
);
// 坐席回访
repairConsultServiceImpl
.
saveRepairConsultByAlertIdType
(
dispatchSaveFeedbackDto
.
getAlertId
(),
"JYHF"
,
null
,
user
);
Long
taskId
=
dispatchPaper
.
getRepairOrgTaskId
()
!=
null
?
dispatchPaper
.
getRepairOrgTaskId
()
:
dispatchPaper
.
getUseOrgTaskId
();
if
(
taskId
==
null
)
{
throw
new
BadRequest
(
"未找到反馈任务单"
);
}
// 维修反馈
repairConsultServiceImpl
.
saveRepairConsultByAlertIdType
(
dispatchSaveFeedbackDto
.
getAlertId
(),
"WXFK"
,
taskId
,
user
);
return
flag
;
}
...
...
@@ -471,7 +482,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
}
@Override
public
Boolean
saveDispatchRepairFeedback
(
DispatchRepairFeedbackDto
dispatchRepairFeedbackDto
)
{
public
Boolean
saveDispatchRepairFeedback
(
DispatchRepairFeedbackDto
dispatchRepairFeedbackDto
,
AgencyUserModel
user
)
{
Boolean
flag
=
false
;
// 保存救援回访信息
DispatchPaperFormDto
dispatchPaperFormDto
=
this
.
selectDispatchPaperDtoByAlertId
(
dispatchRepairFeedbackDto
.
getAlertId
());
...
...
@@ -546,6 +557,12 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
iAlertFormValueService
.
updateBatchById
(
dynamicFormAlert
);
// 保存派遣表
flag
=
this
.
updateById
(
dispatchPaper
);
// 报修反馈
Long
taskId
=
dispatchPaper
.
getRepairOrgTaskId
()
!=
null
?
dispatchPaper
.
getRepairOrgTaskId
()
:
dispatchPaper
.
getUseOrgTaskId
();
if
(
taskId
==
null
)
{
throw
new
BadRequest
(
"未找到反馈任务单"
);
}
repairConsultServiceImpl
.
saveRepairConsultByAlertIdType
(
dispatchRepairFeedbackDto
.
getAlertId
(),
"BXFK"
,
taskId
,
user
);
return
flag
;
}
...
...
@@ -657,7 +674,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
}
@Override
public
Boolean
saveDispatchConsultFeedback
(
DispatchConsultFeedbackDto
dispatchConsultFeedbackDto
)
{
public
Boolean
saveDispatchConsultFeedback
(
DispatchConsultFeedbackDto
dispatchConsultFeedbackDto
,
AgencyUserModel
user
)
{
Boolean
flag
=
false
;
// 保存救援回访信息
DispatchPaperFormDto
dispatchPaperFormDto
=
this
.
selectDispatchPaperDtoByAlertId
(
dispatchConsultFeedbackDto
.
getAlertId
());
...
...
@@ -723,6 +740,12 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
iAlertFormValueService
.
updateBatchById
(
dynamicFormAlert
);
// 保存派遣表
flag
=
this
.
updateById
(
dispatchPaper
);
// 投诉人反馈
Long
taskId
=
dispatchPaper
.
getRepairOrgTaskId
()
!=
null
?
dispatchPaper
.
getRepairOrgTaskId
()
:
dispatchPaper
.
getUseOrgTaskId
();
if
(
taskId
==
null
)
{
throw
new
BadRequest
(
"未找到反馈任务单"
);
}
repairConsultServiceImpl
.
saveRepairConsultByAlertIdType
(
dispatchConsultFeedbackDto
.
getAlertId
(),
"TSRFK"
,
taskId
,
user
);
return
flag
;
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/DispatchTaskServiceImpl.java
View file @
ade97329
...
...
@@ -15,6 +15,7 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.RescueStation;
import
com.yeejoin.amos.boot.module.tzs.api.entity.Template
;
import
com.yeejoin.amos.boot.module.tzs.api.entity.UseUnit
;
import
com.yeejoin.amos.boot.module.tzs.api.enums.AlertStageEnums
;
import
com.yeejoin.amos.boot.module.tzs.api.enums.DispatchPaperEnums
;
import
com.yeejoin.amos.boot.module.tzs.api.mapper.DispatchTaskMapper
;
import
com.yeejoin.amos.boot.module.tzs.api.service.IDispatchTaskService
;
import
com.yeejoin.amos.boot.module.tzs.api.service.IMaintenanceUnitService
;
...
...
@@ -67,6 +68,9 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
@Autowired
IRescueStationService
iRescueStationService
;
@Autowired
RepairConsultServiceImpl
repairConsultServiceImpl
;
/**
* 分页查询
*/
...
...
@@ -83,6 +87,9 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
@Override
public
Boolean
createDispatchTask
(
DispatchTaskDto
dispatchTaskDto
,
AgencyUserModel
sendUser
)
{
if
(
sendUser
==
null
)
{
throw
new
BadRequest
(
"派遣任务创建人不能为空"
);
}
boolean
flag
=
false
;
// 判断派遣单是否存在 如果不存在先创建派遣单
DispatchPaperFormDto
dispatchPaperDto
=
dispatchPaperServiceImpl
.
selectDispatchPaperDtoByAlertId
(
dispatchTaskDto
.
getAlertId
());
...
...
@@ -114,7 +121,7 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
UseUnit
useUnit
=
iUseUnitService
.
getById
(
dispatchTask
.
getResponseOrgId
());
dispatchPaper
.
setUseOrgId
(
useUnit
.
getSequenceNbr
());
dispatchPaper
.
setUseOrgTaskId
(
dispatchTask
.
getSequenceNbr
());
if
(
dispatchPaper
.
getAler
tCode
().
equals
(
"KRJY"
))
{
if
(
AlertStageEnums
.
getEnumById
(
dispatchPaper
.
getAlertCode
()).
ge
tCode
().
equals
(
"KRJY"
))
{
dynamicFormAlert
.
stream
().
forEach
(
alertFormValue
->
{
if
(
alertFormValue
.
getFieldCode
().
equals
(
"dispatch_status"
))
{
alertFormValue
.
setFieldValue
(
"已派遣"
);
...
...
@@ -166,6 +173,8 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
dispatchPaperServiceImpl
.
updateById
(
dispatchPaper
);
// 保存动态表单数据
iAlertFormValueService
.
updateBatchById
(
dynamicFormAlert
);
// 记录日志
repairConsultServiceImpl
.
saveRepairConsultByAlertIdType
(
dispatchTask
.
getAlertId
(),
"PQ"
,
dispatchTask
.
getSequenceNbr
(),
sendUser
);
}
return
flag
;
}
...
...
@@ -175,12 +184,13 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
DispatchTaskDto
dispatchTaskDto
=
new
DispatchTaskDto
();
// 获取警情信息 填充模板返回
AlertCalledDto
alertCalledDto
=
alertCalledServiceImpl
.
queryBySeq
(
alertId
);
dispatchTaskDto
.
setOrgTypeCode
(
orgTypeCode
);
dispatchTaskDto
.
setOrgType
(
DispatchPaperEnums
.
getEnumByCode
(
orgTypeCode
).
getValue
());
dispatchTaskDto
.
setOrgTypeCode
(
DispatchPaperEnums
.
getEnumByCode
(
orgTypeCode
).
getId
());
dispatchTaskDto
.
setAlertId
(
alertId
);
dispatchTaskDto
.
setAlertCode
(
alertCalledDto
.
getAlarmTypeCode
());
// 获取模板 拼接json
QueryWrapper
<
Template
>
templateQueryWrapper
=
new
QueryWrapper
<>();
String
alertTypeCode
=
alertCalledDto
.
getAlarmTypeCode
()
;
String
alertTypeCode
=
AlertStageEnums
.
getEnumById
(
alertCalledDto
.
getAlarmTypeCode
()).
getCode
()
;
templateQueryWrapper
.
eq
(
"type_code"
,
"TASK-"
+
alertTypeCode
);
Template
template
=
templateServiceImpl
.
getOne
(
templateQueryWrapper
);
String
content
=
template
.
getContent
();
...
...
@@ -200,11 +210,11 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
content
=
content
.
replace
(
"$call_time"
,
createTime
).
replace
(
"$address"
,
address
).
replace
(
"$rescue_code"
,
rescueCode
).
replace
(
"$use_site_category"
,
useSiteCategory
);
String
typeCode
=
""
;
if
(
AlertStageEnums
.
KRJY
.
toString
().
equals
(
alertTypeCode
))
{
typeCode
=
AlertStageEnums
.
KRJY
.
get
Code
();
typeCode
=
AlertStageEnums
.
KRJY
.
get
Id
();
}
else
if
(
AlertStageEnums
.
GZWX
.
toString
().
equals
(
alertTypeCode
))
{
typeCode
=
AlertStageEnums
.
GZWX
.
get
Code
();
typeCode
=
AlertStageEnums
.
GZWX
.
get
Id
();
}
else
if
(
AlertStageEnums
.
TSZX
.
toString
().
equals
(
alertTypeCode
))
{
typeCode
=
AlertStageEnums
.
TSZX
.
get
Code
();
typeCode
=
AlertStageEnums
.
TSZX
.
get
Id
();
}
// 警情信息动态数据
QueryWrapper
<
AlertFormValue
>
queryWrapper
=
new
QueryWrapper
<>();
...
...
@@ -219,6 +229,7 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
String
desc
=
""
;
switch
(
alertTypeCode
)
{
case
"KRJY"
:
// 困人救援
dispatchTaskDto
.
setIsSaveTask
(
true
);
String
trappedNum
=
dynamicParms
.
get
(
"trapped_num"
);
String
trappedFloorNum
=
dynamicParms
.
get
(
"trapped_floor_num"
);
String
isLight
=
dynamicParms
.
get
(
"is_light"
);
...
...
@@ -228,10 +239,12 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
content
=
content
.
replace
(
"$is_light"
,
isLight
).
replace
(
"$trapped_time"
,
trappedTime
);
break
;
case
"GZWX"
:
// 故障维修
dispatchTaskDto
.
setIsSaveTask
(
false
);
desc
=
dynamicParms
.
get
(
"desc"
);
content
=
content
.
replace
(
"$use_unit"
,
useUnit
).
replace
(
"$desc"
,
desc
);
break
;
case
"TSZX"
:
// 投诉咨询
dispatchTaskDto
.
setIsSaveTask
(
false
);
desc
=
dynamicParms
.
get
(
"desc"
);
content
=
content
.
replace
(
"$emergency_call"
,
emergencyCall
).
replace
(
"$contact_phone"
,
contactPhone
);
content
=
content
.
replace
(
"$use_unit"
,
useUnit
).
replace
(
"$desc"
,
desc
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/RepairConsultServiceImpl.java
View file @
ade97329
...
...
@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
import
com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto
;
import
com.yeejoin.amos.boot.module.tzs.api.dto.DispatchPaperFormDto
;
import
com.yeejoin.amos.boot.module.tzs.api.dto.RepairConsultDto
;
import
com.yeejoin.amos.boot.module.tzs.api.dto.RescueProcessDto
;
import
com.yeejoin.amos.boot.module.tzs.api.entity.AlertFormValue
;
import
com.yeejoin.amos.boot.module.tzs.api.entity.DispatchTask
;
import
com.yeejoin.amos.boot.module.tzs.api.entity.RepairConsult
;
...
...
@@ -59,6 +60,9 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
@Autowired
DispatchTaskServiceImpl
dispatchTaskServiceImpl
;
@Autowired
RescueProcessServiceImpl
rescueProcessServiceImpl
;
/**
* 列表查询 示例
*/
...
...
@@ -67,7 +71,7 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
}
@Override
public
Boolean
saveRepairConsultByAlertIdType
(
Long
alertId
,
String
type
,
Long
taskId
)
{
public
Boolean
saveRepairConsultByAlertIdType
(
Long
alertId
,
String
type
,
Long
taskId
,
AgencyUserModel
user
)
{
Boolean
flag
=
false
;
RepairConsult
repairConsult
=
new
RepairConsult
();
repairConsult
.
setParentId
(
alertId
);
...
...
@@ -84,19 +88,23 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
String
createTime
=
sdf
.
format
(
new
Date
());
if
(
"JJ"
.
equals
(
type
))
{
String
createUser
=
getUser
()
.
getUserName
();
String
createUser
=
user
.
getUserName
();
String
emergency_call
=
alertCalledVo
.
getEmergencyCall
();
String
area
=
alertCalledVo
.
getAddress
();
String
alertType
=
alertCalledVo
.
getAlarmType
();
content
=
content
.
replace
(
"$createTime"
,
createTime
).
replace
(
"$createUser"
,
createUser
).
replace
(
"$call"
,
emergency_call
);
content
=
content
.
replace
(
"$area"
,
area
).
replace
(
"$alertType"
,
alertType
);
}
else
if
(
"PQ"
.
equals
(
type
))
{
String
createUser
=
getUser
()
.
getUserName
();
String
createUser
=
user
.
getUserName
();
DispatchTask
dispatchTask
=
dispatchTaskServiceImpl
.
getById
(
taskId
);
String
unit
=
dispatchTask
.
getResponseOrgName
();
String
person
=
dispatchTask
.
getResponseUserName
();
String
phone
=
dispatchTask
.
getResponseUserTel
();
if
(
"119"
.
equals
(
unit
))
{
person
=
""
;
phone
=
""
;
}
String
taskType
=
""
;
if
(
"960"
.
equals
(
alertCalledVo
.
getAlarmTypeCode
()))
{
taskType
=
"救援任务单"
;
...
...
@@ -110,31 +118,18 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
}
else
if
(
"DD"
.
equals
(
type
))
{
DispatchTask
dispatchTask
=
dispatchTaskServiceImpl
.
getById
(
taskId
);
String
person
=
dispatchTask
.
getResponseUserName
();
DispatchPaperFormDto
dispatchPaperFormDto
=
dispatchPaperServiceImpl
.
selectDispatchPaperDtoByAlertId
(
alertId
);
List
<
AlertFormValue
>
dynamicForm
=
dispatchPaperFormDto
.
getDynamicFormAlert
();
content
=
content
.
replace
(
"$createTime"
,
createTime
).
replace
(
"$person"
,
person
);
dynamicForm
.
stream
().
forEach
(
alertFormValue
->
{
if
(
"arrive_feedback_type"
.
equals
(
alertFormValue
.
getFieldCode
()))
{
String
FKFS
=
alertFormValue
.
getFieldValue
();
repairConsult
.
setDescription
(
FKFS
);
}
});
content
=
content
.
replace
(
"$FKFS"
,
repairConsult
.
getDescription
());
RescueProcessDto
rescueProcessDto
=
rescueProcessServiceImpl
.
getProcessByAlertId
(
alertId
);
String
FKFS
=
rescueProcessDto
.
getArriveFeedbackType
();
content
=
content
.
replace
(
"$FKFS"
,
FKFS
);
}
else
if
(
"JC"
.
equals
(
type
))
{
DispatchTask
dispatchTask
=
dispatchTaskServiceImpl
.
getById
(
taskId
);
String
person
=
dispatchTask
.
getResponseUserName
();
DispatchPaperFormDto
dispatchPaperFormDto
=
dispatchPaperServiceImpl
.
selectDispatchPaperDtoByAlertId
(
alertId
);
List
<
AlertFormValue
>
dynamicForm
=
dispatchPaperFormDto
.
getDynamicFormAlert
();
Map
<
String
,
String
>
tempMap
=
new
HashMap
<
String
,
String
>();
content
=
content
.
replace
(
"$createTime"
,
createTime
).
replace
(
"$person"
,
person
);
dynamicForm
.
stream
().
forEach
(
alertFormValue
->
{
if
(
"arrive_feedback_type"
.
equals
(
alertFormValue
.
getFieldCode
()))
{
tempMap
.
put
(
"FKFS"
,
alertFormValue
.
getFieldValue
());
}
});
content
=
content
.
replace
(
"$FKFS"
,
tempMap
.
get
(
"FKFS"
));
RescueProcessDto
rescueProcessDto
=
rescueProcessServiceImpl
.
getProcessByAlertId
(
alertId
);
String
FKFS
=
rescueProcessDto
.
getArriveFeedbackType
();
content
=
content
.
replace
(
"$FKFS"
,
FKFS
);
}
else
if
(
"JYHF"
.
equals
(
type
))
{
String
createUser
=
getUser
()
.
getUserName
();
String
createUser
=
user
.
getUserName
();
String
create
=
alertCalledVo
.
getEmergencyPerson
();
content
=
content
.
replace
(
"$createTime"
,
createTime
).
replace
(
"$createUser"
,
createUser
).
replace
(
"$create"
,
create
);
}
else
if
(
"WXFK"
.
equals
(
type
))
{
...
...
@@ -172,7 +167,6 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
}
else
if
(
"TSRFK"
.
equals
(
type
))
{
DispatchTask
dispatchTask
=
dispatchTaskServiceImpl
.
getById
(
taskId
);
String
person
=
dispatchTask
.
getResponseUserName
();
String
fix_result
=
content
=
content
.
replace
(
"$createTime"
,
createTime
).
replace
(
"$person"
,
person
);
DispatchPaperFormDto
dispatchPaperFormDto
=
dispatchPaperServiceImpl
.
selectDispatchPaperDtoByAlertId
(
alertId
);
List
<
AlertFormValue
>
dynamicForm
=
dispatchPaperFormDto
.
getDynamicFormAlert
();
...
...
@@ -194,25 +188,7 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
return
flag
;
}
private
AgencyUserModel
getUser
()
{
ReginParams
reginParams
=
JSONObject
.
parseObject
(
null
!=
redisUtils
.
get
(
buildKey
(
getToken
()))
?
redisUtils
.
get
(
buildKey
(
getToken
())).
toString
()
:
null
,
ReginParams
.
class
);
return
reginParams
.
getUserModel
();
}
protected
String
buildKey
(
String
token
)
{
// 由于用户id 不是接口携带参数,为了避免,公共字段填充时频繁访问平台,缓存用户信息时,
return
"region_"
+
token
;
}
/**
* 获取token
**/
protected
String
getToken
()
{
return
RequestContext
.
getToken
();
}
}
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/RescueProcessServiceImpl.java
View file @
ade97329
...
...
@@ -52,6 +52,9 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
@Autowired
private
AlertFormValueServiceImpl
iAlertFormValueService
;
@Autowired
RepairConsultServiceImpl
repairConsultServiceImpl
;
/**
* 分页查询
*/
...
...
@@ -105,12 +108,13 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
// 创建派遣单
DispatchTaskDto
dispatchTaskDto
=
new
DispatchTaskDto
();
dispatchTaskDto
.
setDispatchTime
(
rescueProcessDto
.
getDispatchTime
());
dispatchTaskDto
.
setOrgTypeCode
(
DispatchPaperEnums
.
getEnum
(
"levelThreeUnit"
).
getCode
());
dispatchTaskDto
.
setOrgTypeCode
(
DispatchPaperEnums
.
getEnumByCode
(
"levelThreeUnit"
).
getId
());
dispatchTaskDto
.
setOrgType
(
DispatchPaperEnums
.
getEnumByCode
(
"levelThreeUnit"
).
getValue
());
dispatchTaskDto
.
setAlertId
(
rescueProcessDto
.
getAlertId
());
dispatchTaskDto
.
setResponseOrgName
(
"119"
);
dispatchTaskDto
.
setResponseUserName
(
"119"
);
DispatchTask
dispatchTask
=
BeanDtoVoUtils
.
convert
(
dispatchTaskDto
,
DispatchTask
.
class
);
dispatchTask
.
setPaperId
(
dispatchPaper
Dto
.
getSequenceNbr
());
dispatchTask
.
setPaperId
(
dispatchPaper
.
getSequenceNbr
());
Boolean
flag
=
dispatchTaskServiceImpl
.
save
(
dispatchTask
);
if
(
flag
)
{
// 创建好派遣任务单以后根据任务单类型修改派遣单信息
if
(
dispatchPaper
.
getRepairOrgId
()
!=
null
)
{
// 已经派遣过调派
...
...
@@ -130,11 +134,43 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
}
});
}
//
保存
派遣单
dispatchPaperServiceImpl
.
save
(
dispatchPaper
);
//
更新
派遣单
dispatchPaperServiceImpl
.
updateById
(
dispatchPaper
);
// 保存动态表单数据
iAlertFormValueService
.
saveBatch
(
dynamicFormAlert
);
iAlertFormValueService
.
updateBatchById
(
dynamicFormAlert
);
// 记录日志
repairConsultServiceImpl
.
saveRepairConsultByAlertIdType
(
dispatchTask
.
getAlertId
(),
"PQ"
,
dispatchTask
.
getSequenceNbr
(),
sendUser
);
}
}
if
(
rescueProcessDto
.
getArriveByUser
())
{
// 手动到达
DispatchPaperFormDto
dispatchPaperDto
=
dispatchPaperServiceImpl
.
selectDispatchPaperDtoByAlertId
(
rescueProcessDto
.
getAlertId
());
if
(
dispatchPaperDto
==
null
||
dispatchPaperDto
.
getDispatchPaper
()
==
null
)
{
throw
new
BadRequest
(
"派遣单信息未找到"
);
}
// 如果存在三级响应id 则默认三级响应 否则为使用单位
Long
taskId
=
dispatchPaperDto
.
getDispatchPaper
().
getRepairOrgTaskId
();
if
(
taskId
==
null
)
{
taskId
=
dispatchPaperDto
.
getDispatchPaper
().
getUseOrgTaskId
();
}
if
(
taskId
==
null
)
{
throw
new
BadRequest
(
"派遣任务单信息未找到"
);
}
repairConsultServiceImpl
.
saveRepairConsultByAlertIdType
(
rescueProcessDto
.
getAlertId
(),
"DD"
,
taskId
,
sendUser
);
//保存接警日志
}
if
(
rescueProcessDto
.
getSaveByUser
())
{
// 手动救援
DispatchPaperFormDto
dispatchPaperDto
=
dispatchPaperServiceImpl
.
selectDispatchPaperDtoByAlertId
(
rescueProcessDto
.
getAlertId
());
if
(
dispatchPaperDto
==
null
||
dispatchPaperDto
.
getDispatchPaper
()
==
null
)
{
throw
new
BadRequest
(
"派遣单信息未找到"
);
}
// 如果存在三级响应id 则默认三级响应 否则为使用单位
Long
taskId
=
dispatchPaperDto
.
getDispatchPaper
().
getRepairOrgTaskId
();
if
(
taskId
==
null
)
{
taskId
=
dispatchPaperDto
.
getDispatchPaper
().
getUseOrgTaskId
();
}
if
(
taskId
==
null
)
{
throw
new
BadRequest
(
"派遣任务单信息未找到"
);
}
repairConsultServiceImpl
.
saveRepairConsultByAlertIdType
(
rescueProcessDto
.
getAlertId
(),
"JC"
,
taskId
,
sendUser
);
//保存接警日志
}
rescueProcessDto
.
setSequenceNbr
(
rescueProcess
.
getSequenceNbr
());
rescueProcessDto
.
setRecDate
(
rescueProcess
.
getRecDate
());
...
...
amos-boot-system-tzs/src/main/resources/application-dev.properties
View file @
ade97329
...
...
@@ -39,3 +39,5 @@ emqx.password=a123456
## redisʱʱ
redis.cache.failure.time
=
10800
failure.work.flow.processDefinitionKey
=
malfunction_repair
\ No newline at end of file
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