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
d2f1c42b
Commit
d2f1c42b
authored
Oct 19, 2021
by
chenhao
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'developer' of
http://172.16.10.76/moa/amos-boot-biz
into developer
parents
aeca182c
49704280
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
215 additions
and
22 deletions
+215
-22
PowerTransferCompanyResourcesMapper.java
...e/jcs/api/mapper/PowerTransferCompanyResourcesMapper.java
+4
-0
IPowerTransferCompanyResourcesService.java
...cs/api/service/IPowerTransferCompanyResourcesService.java
+12
-0
PowerTransferCompanyResourcesMapper.xml
.../resources/mapper/PowerTransferCompanyResourcesMapper.xml
+28
-0
CommandController.java
...boot/module/command/biz/controller/CommandController.java
+45
-9
FireExpertsController.java
...t/module/common/biz/controller/FireExpertsController.java
+22
-6
DynamicFormInstanceServiceImpl.java
...mmon/biz/service/impl/DynamicFormInstanceServiceImpl.java
+10
-5
FirefightersController.java
...oot/module/jcs/biz/controller/FirefightersController.java
+16
-0
PowerTransferCompanyResourcesServiceImpl.java
...ervice/impl/PowerTransferCompanyResourcesServiceImpl.java
+60
-0
PowerTransferServiceImpl.java
...module/jcs/biz/service/impl/PowerTransferServiceImpl.java
+2
-1
jcs-1.0.0.0.xml
...ystem-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
+16
-1
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/PowerTransferCompanyResourcesMapper.java
View file @
d2f1c42b
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jcs
.
api
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled
;
import
com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources
;
/**
...
...
@@ -11,4 +12,7 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources
*/
public
interface
PowerTransferCompanyResourcesMapper
extends
BaseMapper
<
PowerTransferCompanyResources
>
{
AlertCalled
getByPowerTransferCompanyResourId
(
Long
id
);
PowerTransferCompanyResources
getByAlertCalledIdCarId
(
Long
alertCalledId
,
Long
carId
);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IPowerTransferCompanyResourcesService.java
View file @
d2f1c42b
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jcs
.
api
.
service
;
import
com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled
;
import
com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources
;
import
java.util.List
;
/**
* 调派单位资源 服务类
*
...
...
@@ -8,4 +13,11 @@ package com.yeejoin.amos.boot.module.jcs.api.service;
*/
public
interface
IPowerTransferCompanyResourcesService
{
AlertCalled
getByPowerTransferCompanyResourId
(
Long
id
);
PowerTransferCompanyResources
getByAlertCalledIdCarId
(
Long
alertCalledId
,
Long
carId
);
void
updatePowerTransferCompanyResourcesService
(
Long
alertCalledId
,
Long
carId
,
String
code
,
int
type
);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/PowerTransferCompanyResourcesMapper.xml
View file @
d2f1c42b
...
...
@@ -2,4 +2,32 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferCompanyResourcesMapper"
>
<select
id=
"selectAllPage"
resultType=
"com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled"
>
SELECT
*
FROM
jc_alert_called a LEFT JOIN jc_power_transfer b on a.sequence_nbr=b.alert_called_id
LEFT JOIN jc_power_transfer_company c on c.power_transfer_id=b.sequence_nbr
LEFT JOIN jc_power_transfer_company_resources d on d.power_transfer_company_id=c.sequence_nbr where d.sequence_nbr= #{id}
</select>
<select
id=
"getByAlertCalledIdCarId"
resultType=
"com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources"
>
SELECT
d.*
FROM
jc_alert_called a LEFT JOIN jc_power_transfer b on a.sequence_nbr=b.alert_called_id
LEFT JOIN jc_power_transfer_company c on c.power_transfer_id=b.sequence_nbr
LEFT JOIN jc_power_transfer_company_resources d on d.power_transfer_company_id=c.sequence_nbr where a.sequence_nbr= #{alertCalledId}
and d.resources_id=#{carId}
</select>
</mapper>
amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java
View file @
d2f1c42b
...
...
@@ -34,16 +34,13 @@ import com.yeejoin.amos.boot.module.common.api.service.ILinkageUnitService;
import
com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService
;
import
com.yeejoin.amos.boot.module.common.api.service.ISourceFileService
;
import
com.yeejoin.amos.boot.module.common.api.service.IWaterResourceService
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledZhDto
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.CarStatusInfoDto
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.InstructionsZHDto
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.KeyValueLabel
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.StateDot
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.*
;
import
com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled
;
import
com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue
;
import
com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources
;
import
com.yeejoin.amos.boot.module.jcs.api.entity.UserCar
;
import
com.yeejoin.amos.boot.module.jcs.api.enums.AlertStageEnums
;
import
com.yeejoin.amos.boot.module.jcs.api.enums.FireCarStatusEnum
;
import
com.yeejoin.amos.boot.module.jcs.api.service.*
;
import
com.yeejoin.amos.feign.privilege.model.AgencyUserModel
;
import
com.yeejoin.amos.feign.privilege.model.PermissionModel
;
...
...
@@ -129,6 +126,10 @@ public class CommandController extends BaseController {
IKeySiteService
keySiteService
;
@Autowired
IPowerTransferCompanyService
powerTransferCompanyService
;
@Autowired
IPowerTransferCompanyResourcesService
powerTransferCompanyResourcesService
;
@Autowired
ISourceFileService
sourceFileService
;
...
...
@@ -1234,15 +1235,49 @@ public class CommandController extends BaseController {
@TycloudOperation
(
needAuth
=
true
,
ApiLevel
=
UserType
.
AGENCY
)
@RequestMapping
(
value
=
"getAlertCalledId"
,
produces
=
"application/json;charset=UTF-8"
,
method
=
RequestMethod
.
GET
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"
增加绑定"
,
notes
=
"增加绑定
"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"
获取绑定车辆装"
,
notes
=
"获取绑定车辆装
"
)
public
ResponseModel
<
Object
>
getAlertCalledId
()
{
AgencyUserModel
agencyUserModel
=
getUserInfo
();
Long
id
=
null
;
//获取用户已绑定车辆id、
UserCar
userCar
=
userCarService
.
selectByAmosUserId
(
Long
.
valueOf
(
agencyUserModel
.
getUserId
()));
id
=
userCar
!=
null
?
userCar
.
getCarId
():
null
;
return
ResponseHelper
.
buildResponse
(
userCar
);
}
return
ResponseHelper
.
buildResponse
(
id
);
@TycloudOperation
(
needAuth
=
true
,
ApiLevel
=
UserType
.
AGENCY
)
@RequestMapping
(
value
=
"getAlertCalled"
,
produces
=
"application/json;charset=UTF-8"
,
method
=
RequestMethod
.
GET
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"获取当前执行灾情"
,
notes
=
"获取当前执行灾情"
)
public
ResponseModel
<
Object
>
getAlertCalled
()
{
AgencyUserModel
agencyUserModel
=
getUserInfo
();
Long
id
=
null
;
//获取用户已绑定车辆id、
UserCar
userCar
=
userCarService
.
selectByAmosUserId
(
Long
.
valueOf
(
agencyUserModel
.
getUserId
()));
//获取正在进行的灾情
AlertCalled
alertCalled
=
powerTransferCompanyResourcesService
.
getByPowerTransferCompanyResourId
(
userCar
.
getCarId
());
return
ResponseHelper
.
buildResponse
(
alertCalled
);
}
@TycloudOperation
(
needAuth
=
true
,
ApiLevel
=
UserType
.
AGENCY
)
@RequestMapping
(
value
=
"getPowerTransferCompanyResourcesService/{carid}/{alertCalledId}"
,
produces
=
"application/json;charset=UTF-8"
,
method
=
RequestMethod
.
GET
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"获取当前任务,车辆状态"
,
notes
=
"获取当前任务,车辆状态"
)
public
ResponseModel
<
Object
>
getPowerTransferCompanyResourcesService
(
@PathVariable
Long
carid
,
@PathVariable
Long
alertCalledId
)
{
//获取正在进行的灾情
PowerTransferCompanyResources
powerTransferCompanyResources
=
powerTransferCompanyResourcesService
.
getByAlertCalledIdCarId
(
alertCalledId
,
carid
);
return
ResponseHelper
.
buildResponse
(
powerTransferCompanyResources
);
}
@TycloudOperation
(
needAuth
=
true
,
ApiLevel
=
UserType
.
AGENCY
)
@RequestMapping
(
value
=
"updatePowerTransferCompanyResourcesService/{carid}/{alertCalledId}/{code}/{type}"
,
produces
=
"application/json;charset=UTF-8"
,
method
=
RequestMethod
.
GET
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"修改任务,车辆状态"
,
notes
=
"修改任务,车辆状态"
)
public
ResponseModel
<
Object
>
updatePowerTransferCompanyResourcesService
(
@PathVariable
Long
carid
,
@PathVariable
Long
alertCalledId
,
@PathVariable
String
code
,
@PathVariable
int
type
)
{
//获取正在进行的灾情
powerTransferCompanyResourcesService
.
updatePowerTransferCompanyResourcesService
(
alertCalledId
,
carid
,
code
,
type
);
return
ResponseHelper
.
buildResponse
(
null
);
}
}
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FireExpertsController.java
View file @
d2f1c42b
...
...
@@ -67,9 +67,17 @@ public class FireExpertsController extends BaseController {
@PostMapping
(
value
=
"/save"
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"新增"
,
notes
=
"新增"
)
public
ResponseModel
<
FireExpertsDto
>
save
(
@RequestBody
FireExpertsDto
model
)
{
String
expertCode
=
model
.
getExpertCode
();
DataDictionary
zjly
=
dataDictionaryService
.
getByCode
(
expertCode
,
"ZJLY"
);
model
.
setExpert
(
zjly
.
getName
());
if
(
model
.
getExpertCode
()
!=
null
){
String
expertCode
=
model
.
getExpertCode
();
DataDictionary
zjly
=
dataDictionaryService
.
getByCode
(
expertCode
,
"ZJLY"
);
model
.
setExpert
(
zjly
.
getName
());
}
/*3183 联动专家,岗位选择字节点保存后概要中数据缺失 chenzhao 2021-10-19 */
if
(
model
.
getJobsCode
()
!=
null
){
DataDictionary
gwmc
=
dataDictionaryService
.
getByCode
(
model
.
getJobsCode
()
,
"GWMC"
);
model
.
setJobs
(
gwmc
.
getName
());
}
/*3183 联动专家,岗位选择字节点保存后概要中数据缺失 chenzhao 2021-10-19 */
model
=
fireExpertsServiceImpl
.
createWithModel
(
model
);
return
ResponseHelper
.
buildResponse
(
model
);
}
...
...
@@ -87,9 +95,17 @@ public class FireExpertsController extends BaseController {
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
)
{
/*bug 3098 联动专家,编辑时领域选择子分类保存,领域数据未修改 chenzhao 2021-10-14 */
model
.
setSequenceNbr
(
sequenceNbr
);
String
expertCode
=
model
.
getExpertCode
();
DataDictionary
zjly
=
dataDictionaryService
.
getByCode
(
expertCode
,
"ZJLY"
);
model
.
setExpert
(
zjly
.
getName
());
if
(
model
.
getExpertCode
()
!=
null
){
String
expertCode
=
model
.
getExpertCode
();
DataDictionary
zjly
=
dataDictionaryService
.
getByCode
(
expertCode
,
"ZJLY"
);
model
.
setExpert
(
zjly
.
getName
());
}
/*3183 联动专家,岗位选择字节点保存后概要中数据缺失 chenzhao 2021-10-19 */
if
(
model
.
getJobsCode
()
!=
null
){
DataDictionary
gwmc
=
dataDictionaryService
.
getByCode
(
model
.
getJobsCode
()
,
"GWMC"
);
model
.
setJobs
(
gwmc
.
getName
());
}
/*3183 联动专家,岗位选择字节点保存后概要中数据缺失 chenzhao 2021-10-19 */
/*bug 3098 联动专家,编辑时领域选择子分类保存,领域数据未修改 chenzhao 2021-10-14 */
return
ResponseHelper
.
buildResponse
(
fireExpertsServiceImpl
.
updateWithModel
(
model
));
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DynamicFormInstanceServiceImpl.java
View file @
d2f1c42b
...
...
@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.toolkit.ObjectUtils
;
import
com.baomidou.mybatisplus.core.toolkit.Sequence
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.google.common.collect.Lists
;
...
...
@@ -22,6 +23,7 @@ import javax.servlet.http.HttpServletRequest;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Optional
;
import
java.util.stream.Collectors
;
/**
...
...
@@ -104,11 +106,14 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
List
<
DynamicFormColumn
>
columns
=
dynamicFormColumnService
.
list
(
new
LambdaQueryWrapper
<
DynamicFormColumn
>().
eq
(
DynamicFormColumn:
:
getGroupCode
,
groupCode
));
Map
<
String
,
Object
>
instanceMap
=
Bean
.
listToMap
(
list
,
"fieldCode"
,
"fieldValue"
,
DynamicFormInstance
.
class
);
for
(
DynamicFormColumn
optionModel
:
columns
)
{
DynamicFormInstance
dyFormInstance
=
list
.
stream
().
filter
(
i
->
i
.
getFieldCode
().
equals
(
optionModel
.
getFieldCode
())).
findFirst
().
get
();
instanceMap
.
put
(
optionModel
.
getFieldCode
(),
instanceMap
.
get
(
optionModel
.
getFieldCode
()));
if
(
"radio,select,treeSelect"
.
contains
(
optionModel
.
getFieldType
()))
{
instanceMap
.
put
(
optionModel
.
getFieldCode
()
+
"Label"
,
dyFormInstance
.
getFieldValueLabel
());
Optional
<
DynamicFormInstance
>
first
=
list
.
stream
().
filter
(
i
->
i
.
getFieldCode
().
equals
(
optionModel
.
getFieldCode
())).
findFirst
();
if
(
first
.
isPresent
()){
DynamicFormInstance
dyFormInstance
=
first
.
get
();
instanceMap
.
put
(
optionModel
.
getFieldCode
(),
instanceMap
.
get
(
optionModel
.
getFieldCode
()));
if
(
"radio,select,treeSelect"
.
contains
(
optionModel
.
getFieldType
()))
{
instanceMap
.
put
(
optionModel
.
getFieldCode
()
+
"Label"
,
dyFormInstance
.
getFieldValueLabel
());
}
}
}
optionListMap
.
putAll
(
instanceMap
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java
View file @
d2f1c42b
...
...
@@ -6,6 +6,8 @@ import java.util.Map;
import
javax.servlet.http.HttpServletRequest
;
import
com.yeejoin.amos.boot.biz.common.entity.DataDictionary
;
import
com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl
;
import
com.yeejoin.amos.boot.module.common.api.entity.FireTeam
;
import
com.yeejoin.amos.boot.module.jcs.biz.service.impl.FireTeamServiceImpl
;
import
com.yeejoin.amos.component.feign.model.FeignClientResult
;
...
...
@@ -87,6 +89,8 @@ public class FirefightersController extends BaseController {
FireTeamServiceImpl
iFireTeamService
;
@Autowired
RedisUtils
redisUtils
;
@Autowired
DataDictionaryServiceImpl
dataDictionaryService
;
@Value
(
"${redis.cache.failure.time}"
)
private
long
time
;
...
...
@@ -101,6 +105,12 @@ public class FirefightersController extends BaseController {
@Transactional
public
ResponseModel
<
FirefightersInfoDto
>
saveFirefighters
(
@RequestBody
FirefightersInfoDto
firefighters
)
{
try
{
/*3184 消防人员,编辑页面岗位选择子分类保存成功后,概要中岗位未修改 chenzhao start 2021-10-19*/
if
(
firefighters
.
getFirefighters
().
getJobTitleCode
()
!=
null
){
DataDictionary
gwmc
=
dataDictionaryService
.
getByCode
(
firefighters
.
getFirefighters
().
getJobTitleCode
(),
"GWMC"
);
firefighters
.
getFirefighters
().
setJobTitle
(
gwmc
.
getName
());
}
/*3184 消防人员,编辑页面岗位选择子分类保存成功后,概要中岗位未修改 chenzhao end 2021-10-19*/
iFirefightersService
.
saveFirefighters
(
firefighters
);
return
ResponseHelper
.
buildResponse
(
firefighters
);
}
catch
(
Exception
e
)
{
...
...
@@ -175,6 +185,12 @@ public class FirefightersController extends BaseController {
FeignClientResult
<
RegionModel
>
region
=
Systemctl
.
regionClient
.
getRegion
(
Long
.
parseLong
(
firefighter
.
getResidenceDetails
()));
firefighter
.
setResidence
(
region
.
getResult
().
getRegionName
());
}
/*3184 消防人员,编辑页面岗位选择子分类保存成功后,概要中岗位未修改 chenzhao start 2021-10-19*/
if
(
firefighter
.
getJobTitleCode
()
!=
null
){
DataDictionary
gwmc
=
dataDictionaryService
.
getByCode
(
firefighter
.
getJobTitleCode
(),
"GWMC"
);
firefighter
.
setJobTitle
(
gwmc
.
getName
());
}
/*3184 消防人员,编辑页面岗位选择子分类保存成功后,概要中岗位未修改 chenzhao end 2021-10-19*/
if
(
firefighter
.
getNativePlace
()
!=
null
)
{
FeignClientResult
<
RegionModel
>
nativePlace
=
Systemctl
.
regionClient
.
getRegion
(
Long
.
parseLong
(
firefighter
.
getNativePlace
()));
firefighter
.
setNativePlaceValue
(
nativePlace
.
getResult
().
getRegionName
());
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferCompanyResourcesServiceImpl.java
View file @
d2f1c42b
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jcs
.
biz
.
service
.
impl
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient
;
import
com.yeejoin.amos.boot.module.common.api.mapper.FireTeamMapper
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.CarStatusInfoDto
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto
;
import
com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled
;
import
com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources
;
import
com.yeejoin.amos.boot.module.jcs.api.enums.FireCarStatusEnum
;
import
com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferCompanyResourcesMapper
;
import
com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyResourcesService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
javax.annotation.Resource
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
* 调派单位资源 服务实现类
*
...
...
@@ -16,5 +28,53 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
*/
@Service
public
class
PowerTransferCompanyResourcesServiceImpl
extends
BaseService
<
PowerTransferCompanyResourcesDto
,
PowerTransferCompanyResources
,
PowerTransferCompanyResourcesMapper
>
implements
IPowerTransferCompanyResourcesService
{
@Resource
PowerTransferCompanyResourcesMapper
powerTransferCompanyResourcesMapper
;
@Autowired
EquipFeignClient
equipFeignClient
;
@Override
public
AlertCalled
getByPowerTransferCompanyResourId
(
Long
id
)
{
QueryWrapper
<
PowerTransferCompanyResources
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
eq
(
"status"
,
FireCarStatusEnum
.
执行中
.
getCode
()
);
queryWrapper
.
eq
(
"resources_id"
,
id
);
PowerTransferCompanyResources
alertFormValue
=
this
.
getOne
(
queryWrapper
);
return
powerTransferCompanyResourcesMapper
.
getByPowerTransferCompanyResourId
(
alertFormValue
.
getPowerTransferCompanyId
());
}
@Override
public
PowerTransferCompanyResources
getByAlertCalledIdCarId
(
Long
alertCalledId
,
Long
carId
)
{
return
powerTransferCompanyResourcesMapper
.
getByAlertCalledIdCarId
(
alertCalledId
,
carId
);
}
@Override
@Transactional
public
void
updatePowerTransferCompanyResourcesService
(
Long
alertCalledId
,
Long
carId
,
String
code
,
int
type
)
{
PowerTransferCompanyResources
powerTransferCompanyResources
=
powerTransferCompanyResourcesMapper
.
getByAlertCalledIdCarId
(
alertCalledId
,
carId
);
try
{
if
(
1
==
type
){
powerTransferCompanyResources
.
setCarStatus
(
code
);
powerTransferCompanyResourcesMapper
.
updateById
(
powerTransferCompanyResources
);
}
else
{
powerTransferCompanyResources
.
setStatus
(
code
);
powerTransferCompanyResourcesMapper
.
updateById
(
powerTransferCompanyResources
);
List
<
Object
>
carStatusInfoDtoList
=
new
ArrayList
();
//修改装备信息
CarStatusInfoDto
carStatusInfo
=
new
CarStatusInfoDto
();
carStatusInfo
.
setSequenceNbr
(
carId
.
toString
());
carStatusInfo
.
setStatus
(
FireCarStatusEnum
.
执勤
.
getCode
());
carStatusInfoDtoList
.
add
(
carStatusInfo
);
// 更新所有车辆状态为执勤
equipFeignClient
.
updateCarStatus
(
carStatusInfoDtoList
);
}
}
catch
(
Exception
e
)
{
throw
new
RuntimeException
(
"修改失败!"
);
}
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java
View file @
d2f1c42b
...
...
@@ -188,7 +188,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
//查询车辆当前任务状态
QueryWrapper
<
PowerTransferCompanyResources
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
notIn
(
"car_status"
,
FireCarStatusEnum
.
返队
.
getCode
(),
FireCarStatusEnum
.
加油
.
getCode
(),
FireCarStatusEnum
.
演练
.
getCode
(),
FireCarStatusEnum
.
训练
.
getCode
(),
FireCarStatusEnum
.
试车
.
getCode
());
// queryWrapper.notIn("car_status", FireCarStatusEnum.返队.getCode(),FireCarStatusEnum.加油.getCode(),FireCarStatusEnum.演练.getCode(),FireCarStatusEnum.训练.getCode(),FireCarStatusEnum.试车.getCode());
queryWrapper
.
eq
(
"status"
,
FireCarStatusEnum
.
执行中
.
getCode
()
);
List
<
PowerTransferCompanyResources
>
alertFormValue
=
powerTransferCompanyResourcesService
.
list
(
queryWrapper
);
Map
<
String
,
String
>
appleMap
=
alertFormValue
!=
null
&&
alertFormValue
.
size
()>
0
?
alertFormValue
.
stream
().
collect
(
Collectors
.
toMap
(
PowerTransferCompanyResources:
:
getResourcesId
,
PowerTransferCompanyResources:
:
getCarStatus
)):
null
;
...
...
amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
View file @
d2f1c42b
...
...
@@ -1848,7 +1848,7 @@
</preConditions>
<comment>
增加车辆状态
</comment>
<sql>
ALTER TABLE
jc_power_transfer_company_resources MODIFY COLUMN
car_status varchar(255) DEFAULT NULL COMMENT '车辆任务状态'
ALTER TABLE
`jc_power_transfer_company_resources` add
car_status varchar(255) DEFAULT NULL COMMENT '车辆任务状态'
</sql>
</changeSet>
...
...
@@ -1867,6 +1867,21 @@
</sql>
</changeSet>
<changeSet
author=
"chenzhao"
id=
"2021-10-19-1"
>
<preConditions
onFail=
"MARK_RAN"
>
<tableExists
tableName=
"jc_template"
/>
<primaryKeyExists
primaryKeyName=
"sequence_nbr"
tableName=
"jc_template"
/>
</preConditions>
<comment>
add data jc_template
</comment>
<sql>
INSERT INTO `amos-jcs-biz`.`jc_template`(`sequence_nbr`, `trpe_code`, `type`, `content`, `format`) VALUES (23, 'JJQK-1214', '接警情况', '【120救援】时间:callTime;地址:address;保障类别:securityCategory;事件概述:eventOverview;备注:remarks;警情阶段:alertStage');
INSERT INTO `amos-jcs-biz`.`jc_template`(`sequence_nbr`, `trpe_code`, `type`, `content`, `format`) VALUES (24, '1214', '120救援', '【力量调派】调派你部车辆type 车牌号resourcesNum 赶往rescueGrid 位置。
相关警情:【120救援】时间:callTime 地址:address;单位名称:unit_involved;被困人数:trapped_num;伤亡人数:casualties_num;性别:gender;年龄段(岁):ageGroup;患者现状:patientStatus;情况说明:situation;备注:remarks。
发送单位:companyName');
<![CDATA[ INSERT INTO `amos-jcs-biz`.`jc_template`(`sequence_nbr`, `trpe_code`, `type`, `content`, `format`) VALUES (25, '1214 ', '120救援', '<p>【120救援】时间:<span contenteditable="true" data-name="callTimeStr" data-type="input"></span> 地址:<span contenteditable="true" data-name="address" data-type="input"></span>;单位名称:<span contenteditable="true" data-name="unitInvolved" data-type="input"></span>;被困人数:<span contenteditable="true" data-name="trappedNum" data-type="input"></span>trapped_num;伤亡人数:<span contenteditable="true" data-name="casualtiesNum" data-type="input"></span>casualties_num;性别:<span contenteditable="true" data-name="gender" data-type="input"></span>gender;年龄段(岁):<span contenteditable="true" data-name="ageGroup" data-type="input"></span>ageGroup;。 </p><p>发送单位:<span contenteditable="true" data-name="companyName" data-type="input"></span></p>');]]>
</sql>
</changeSet>
</databaseChangeLog>
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