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
5b66aa10
Commit
5b66aa10
authored
Mar 10, 2023
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改扫描bug
parent
517cb0b8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
62 additions
and
122 deletions
+62
-122
IndexLogsRequest.java
...ejoin/equipmanage/common/entity/dto/IndexLogsRequest.java
+8
-3
IEquipmentSpecificAlarmLogService.java
...quipmanage/service/IEquipmentSpecificAlarmLogService.java
+1
-1
EquipmentSpecificAlarmLogServiceImpl.java
...ge/service/impl/EquipmentSpecificAlarmLogServiceImpl.java
+12
-44
NoServiceImpl.java
.../amos/boot/module/jcs/biz/service/impl/NoServiceImpl.java
+1
-1
OrganizationImpl.java
...os/boot/module/jcs/biz/service/impl/OrganizationImpl.java
+18
-57
OrganizationUserImpl.java
...oot/module/jcs/biz/service/impl/OrganizationUserImpl.java
+0
-1
PowerTransferCompanyResourcesServiceImpl.java
...ervice/impl/PowerTransferCompanyResourcesServiceImpl.java
+12
-7
PowerTransferServiceImpl.java
...module/jcs/biz/service/impl/PowerTransferServiceImpl.java
+0
-0
PowerrTransferLogServiceImpl.java
...le/jcs/biz/service/impl/PowerrTransferLogServiceImpl.java
+4
-4
RuleAlertCalledService.java
...t/module/jcs/biz/service/impl/RuleAlertCalledService.java
+5
-3
FireFightingSystemMapper.xml
...ip/src/main/resources/mapper/FireFightingSystemMapper.xml
+1
-1
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/dto/IndexLogsRequest.java
View file @
5b66aa10
...
...
@@ -15,12 +15,17 @@ public class IndexLogsRequest {
private
String
timeStart
;
private
String
timeEnd
;
private
String
fieldKey
;
private
String
equipmentIndex
;
private
Long
page
;
private
Long
total
;
private
Long
size
;
public
IndexLogsRequest
(
String
iotCode
,
String
timeStart
,
String
timeEnd
,
String
fieldKey
)
{
this
.
iotCode
=
iotCode
;
public
IndexLogsRequest
(
String
timeStart
,
String
timeEnd
,
String
equipmentIndex
,
Long
page
,
Long
size
)
{
this
.
timeStart
=
timeStart
;
this
.
timeEnd
=
timeEnd
;
this
.
fieldKey
=
fieldKey
;
this
.
equipmentIndex
=
equipmentIndex
;
this
.
page
=
page
;
this
.
size
=
size
;
}
public
IndexLogsRequest
()
{
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentSpecificAlarmLogService.java
View file @
5b66aa10
...
...
@@ -61,5 +61,5 @@ public interface IEquipmentSpecificAlarmLogService extends IService<EquipmentSpe
* endTime:结束时间
* @return
*/
Page
<
EquipmentAlarmLogDto
>
getEquipAlarmLog
(
String
id
,
String
startTime
,
String
endTime
,
int
pageSize
,
int
current
);
Page
<
EquipmentAlarmLogDto
>
getEquipAlarmLog
(
String
id
,
String
startTime
,
String
endTime
,
long
pageSize
,
long
current
);
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmLogServiceImpl.java
View file @
5b66aa10
package
com
.
yeejoin
.
equipmanage
.
service
.
impl
;
import
com.alibaba.fastjson.JSON
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
...
...
@@ -9,7 +8,6 @@ import com.google.common.collect.Lists;
import
com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarm
;
import
com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog
;
import
com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity
;
import
com.yeejoin.equipmanage.common.entity.OrgUsr
;
import
com.yeejoin.equipmanage.common.entity.dto.EquipmentAlarmLogDto
;
import
com.yeejoin.equipmanage.common.entity.dto.IndexLogsRequest
;
import
com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO
;
...
...
@@ -94,7 +92,7 @@ public class EquipmentSpecificAlarmLogServiceImpl extends ServiceImpl<EquipmentS
}
@Override
public
Page
<
EquipmentAlarmLogDto
>
getEquipAlarmLog
(
String
code
,
String
startTime
,
String
endTime
,
int
pageSize
,
int
current
)
{
public
Page
<
EquipmentAlarmLogDto
>
getEquipAlarmLog
(
String
code
,
String
startTime
,
String
endTime
,
long
pageSize
,
long
current
)
{
Page
<
EquipmentAlarmLogDto
>
pageBean
=
new
Page
<
EquipmentAlarmLogDto
>(
current
,
pageSize
);
QueryWrapper
<
FireFightingSystemEntity
>
wrapper
=
new
QueryWrapper
<>();
wrapper
.
eq
(
"code"
,
code
);
...
...
@@ -105,16 +103,14 @@ public class EquipmentSpecificAlarmLogServiceImpl extends ServiceImpl<EquipmentS
String
id
=
sys
.
getId
().
toString
();
//iotcode集合
List
<
String
>
iotCodes
=
new
ArrayList
<>();
//装备名称集合
Map
<
String
,
String
>
mapcode
=
new
HashMap
<>();
//物联参数判断集合
Map
<
String
,
EquiplistSpecificBySystemVO
>
mapkey
=
new
HashMap
<>();
//存储整理后的数据
List
<
EquipmentAlarmLogDto
>
listDate
=
new
ArrayList
<>();
//获取系统下所有装备组装数据
this
.
getEquiplistBySystemId
(
id
,
iotCodes
,
mapcode
);
//获取系统下所有装备物联指标
this
.
getEquiplistBySystemIdList
(
id
,
mapkey
);
this
.
getEquiplistBySystemIdList
(
id
,
mapkey
,
iotCodes
);
//装备为空返回空
if
(
iotCodes
.
isEmpty
()||
mapkey
.
isEmpty
()){
return
pageBean
;
...
...
@@ -123,7 +119,7 @@ public class EquipmentSpecificAlarmLogServiceImpl extends ServiceImpl<EquipmentS
endTime
=
endTime
.
replace
(
"00:00:00"
,
"23:59:59"
);
IndexLogsRequest
indexLogsRequest
=
new
IndexLogsRequest
(
iotCode
,
startTime
,
endTime
,
null
);
IndexLogsRequest
indexLogsRequest
=
new
IndexLogsRequest
(
startTime
,
endTime
,
iotCode
,
current
,
pageSize
);
//调用iot 获取数据
ResponseModel
<
List
<
Map
<
String
,
Object
>>>
date
=
iotFeign
.
getEquipAlarmLog
(
indexLogsRequest
);
...
...
@@ -140,63 +136,35 @@ public class EquipmentSpecificAlarmLogServiceImpl extends ServiceImpl<EquipmentS
if
(
mapkey
.
containsKey
(
key
)){
EquipmentAlarmLogDto
da
=
new
EquipmentAlarmLogDto
();
da
.
setId
(
UUID
.
randomUUID
().
toString
());
da
.
setName
(
map
code
.
get
(
map
.
get
(
"iotCode"
).
toString
()
));
da
.
setName
(
map
key
.
get
(
key
).
getEquipmentName
(
));
da
.
setTime
(
map
.
get
(
"createdTime"
).
toString
());
String
value
=
map
.
get
(
"indexValue"
).
toString
();
value
=
getReadableStatus
(
value
);
da
.
setContent
(
mapkey
.
get
(
key
).
getIndexName
()+
":"
+
value
);
listDate
.
add
(
da
);
}
}
}
pageBean
.
setTotal
(
listDate
.
size
());
pageBean
.
setRecords
(
listDate
);
return
pageBean
;
}
public
String
getReadableStatus
(
String
value
)
{
if
(
"true"
.
equals
(
value
)){
return
"是"
;
}
return
"false"
.
equals
(
value
)?
"否"
:
value
;
}
/**
* 获取系统下装备,并组装数据
*
* @param id:系统id iotCodes:装备iot集合
*
* map:key:iotcode,value:装备名称
* @param
* @return
*/
public
void
getEquiplistBySystemId
(
String
id
,
List
<
String
>
iotCodes
,
Map
<
String
,
String
>
map
)
{
//获取系统下所有装备
List
<
EquiplistSpecificBySystemVO
>
list
=
fireFightingSystemMapper
.
getEquiplistBySystemId
(
Long
.
valueOf
(
id
));
if
(!
list
.
isEmpty
())
{
for
(
EquiplistSpecificBySystemVO
equiplistSpecificBySystemVO
:
list
)
{
if
(
equiplistSpecificBySystemVO
.
getIotCode
()
!=
null
)
{
iotCodes
.
add
(
equiplistSpecificBySystemVO
.
getIotCode
());
map
.
put
(
equiplistSpecificBySystemVO
.
getIotCode
(),
equiplistSpecificBySystemVO
.
getEquipmentName
());
}
}
public
String
getReadableStatus
(
String
value
)
{
if
(
"true"
.
equals
(
value
)){
return
"是"
;
}
return
"false"
.
equals
(
value
)?
"否"
:
value
;
}
public
void
getEquiplistBySystemIdList
(
String
id
,
Map
<
String
,
EquiplistSpecificBySystemVO
>
map
)
{
public
void
getEquiplistBySystemIdList
(
String
id
,
Map
<
String
,
EquiplistSpecificBySystemVO
>
map
,
List
<
String
>
iotCodes
)
{
//获取系统下所有装备
List
<
EquiplistSpecificBySystemVO
>
list
=
fireFightingSystemMapper
.
getEquiplistBySystemIdList
(
Long
.
valueOf
(
id
));
if
(!
list
.
isEmpty
())
{
for
(
EquiplistSpecificBySystemVO
equiplistSpecificBySystemVO
:
list
)
{
map
.
put
(
equiplistSpecificBySystemVO
.
getIotCode
()+
equiplistSpecificBySystemVO
.
getIndexKey
(),
equiplistSpecificBySystemVO
);
iotCodes
.
add
(
equiplistSpecificBySystemVO
.
getIotCode
()+
equiplistSpecificBySystemVO
.
getIndexKey
());
}
}
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/NoServiceImpl.java
View file @
5b66aa10
...
...
@@ -19,7 +19,7 @@ public class NoServiceImpl implements IHomePageService {
@Autowired
EquipFeignClient
quipFeignClient
;
private
static
EquipFeignClient
quipFeignClient1
;
private
EquipFeignClient
quipFeignClient1
;
@PostConstruct
public
void
init
(){
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/OrganizationImpl.java
View file @
5b66aa10
...
...
@@ -35,6 +35,8 @@ public class OrganizationImpl extends BaseService<Organization,Organization, Org
@Autowired
private
OrganizationUserMapper
organizationUserMapper
;
private
static
String
NAME
=
"组员信息表第"
;
@Override
public
Page
<
Map
<
String
,
Object
>>
getOrganizationInfo
(
Page
<
Map
<
String
,
Object
>>
page
,
String
bizOrgCode
)
{
return
organizationMapper
.
getOrganizationInfo
(
page
,
bizOrgCode
);
...
...
@@ -42,20 +44,7 @@ public class OrganizationImpl extends BaseService<Organization,Organization, Org
@Override
public
Page
<
Map
<
String
,
Object
>>
getOrganizationList
(
Page
<
Map
<
String
,
Object
>>
page
,
String
bizOrgCode
)
{
// Page<Map<String, Object>> groupPage = new Page<>();
// Page<Map<String, Object>> group = organizationMapper.getOrganizationGroup(groupPage, bizOrgCode);
// Page<Map<String, Object>> mapPage = organizationMapper.getOrganizationList(page, bizOrgCode);
// List<Map<String, Object>> records = group.getRecords();
// ArrayList<Map<String, Object>> result = new ArrayList<>();
// for (Map<String, Object> record : records) {
//
// List<Map<String, Object>> collect = mapPage.getRecords().stream().filter(item -> String.valueOf(record.get("id")).equals(String.valueOf(item.get("groupId")))).collect(Collectors.toList());
// record.put("persons", collect);
// result.add(record);
//
// }
// mapPage.setRecords(result);
// return mapPage;
return
organizationMapper
.
getOrganizationList
(
page
,
bizOrgCode
);
}
...
...
@@ -74,12 +63,12 @@ public class OrganizationImpl extends BaseService<Organization,Organization, Org
public
void
saveOrganization
(
List
<
OrganizationExportDto
>
data
,
List
<
OrganizationUserExportDto
>
userData
,
String
bizOrgCode
)
{
//由于可以单独导入组,或者单独导入人,只做都为空效验
if
(
data
==
null
&&
userData
==
null
){
if
(
data
==
null
&&
userData
==
null
&&
data
.
size
()>
0
&&
userData
.
size
()>
0
){
throw
new
BadRequest
(
"请填入数据导入!"
);
}
//对分组数据入库
if
(
data
.
size
()>
0
){
int
sort
=
organizationMapper
.
selectMaxSort
();
int
sort
1
=
organizationMapper
.
selectMaxSort
();
checkOrganizationData
(
data
);
for
(
OrganizationExportDto
dto
:
data
)
{
LambdaQueryWrapper
<
Organization
>
lambda
=
new
QueryWrapper
<
Organization
>().
lambda
();
...
...
@@ -89,18 +78,16 @@ public class OrganizationImpl extends BaseService<Organization,Organization, Org
Organization
organization
=
new
Organization
();
if
(
CollectionUtils
.
isEmpty
(
organizations
)){
BeanUtils
.
copyProperties
(
dto
,
organization
);
sort
=
sort
+
1
;
organization
.
setSort
(
sort
);
sort
1
=
sort1
+
1
;
organization
.
setSort
(
sort
1
);
organization
.
setBizOrgCode
(
bizOrgCode
);
organizationMapper
.
insert
(
organization
);
}
// else{
// throw new BadRequest("用户组"+dto.getEmergencyTeamName()+"已存不能重复导入!");
// }
}
}
//对人员数据入库
if
(
userData
.
size
()>
0
){
checkOrganizationUserData
(
userData
);
int
sort
=
organizationMapper
.
selectOrganizationUserMaxSort
();
for
(
OrganizationUserExportDto
userExportDto
:
userData
)
{
...
...
@@ -120,35 +107,9 @@ public class OrganizationImpl extends BaseService<Organization,Organization, Org
organizationUserMapper
.
insert
(
organizationUser
);
}
}
}
// int sort = organizationMapper.selectMaxSort();
// checkOrganizationData(data);
// checkOrganizationUserData(userData);
// for (OrganizationExportDto dto : data) {
// LambdaQueryWrapper<Organization> lambda = new QueryWrapper<Organization>().lambda();
// lambda.eq(Organization::getIsDelete, false);
// lambda.eq(Organization::getEmergencyTeamName, dto.getEmergencyTeamName());
// List<Organization> organizations = organizationMapper.selectList(lambda);
// Organization organization = new Organization();
// if (CollectionUtils.isEmpty(organizations)){
// BeanUtils.copyProperties(dto, organization);
// sort = sort + 1;
// organization.setSort(sort);
// organization.setBizOrgCode(bizOrgCode);
// organizationMapper.insert(organization);
// }else {
// Organization organization1 = organizations.get(0);
// BeanUtils.copyProperties(organization1, organization);
// }
// List<OrganizationUserExportDto> collect = userData.stream().filter(item -> item.getEmergencyTeamName().equals(dto.getEmergencyTeamName())).collect(Collectors.toList());
// for (OrganizationUserExportDto userExportDto : collect) {
// OrganizationUser organizationUser = new OrganizationUser();
// BeanUtils.copyProperties(userExportDto, organizationUser);
// organizationUser.setEmergencyTeamId(String.valueOf(organization.getSequenceNbr()));
// organizationUserMapper.insert(organizationUser);
// }
// }
}
private
void
checkOrganizationData
(
List
<
OrganizationExportDto
>
data
)
{
...
...
@@ -167,13 +128,13 @@ public class OrganizationImpl extends BaseService<Organization,Organization, Org
for
(
int
i
=
0
;
i
<
data
.
size
();
i
++)
{
OrganizationUserExportDto
dto
=
data
.
get
(
i
);
if
(
ObjectUtils
.
isEmpty
(
dto
.
getEmergencyTeamName
()))
{
throw
new
BadRequest
(
"组员信息表第"
+
(
i
+
1
)
+
"行, 应急救援小组名称为必填信息!"
);
throw
new
BadRequest
(
NAME
+
(
i
+
1
)
+
"行, 应急救援小组名称为必填信息!"
);
}
if
(
ObjectUtils
.
isEmpty
(
dto
.
getMemberName
()))
{
throw
new
BadRequest
(
"组员信息表第"
+
(
i
+
1
)
+
"行, 组员姓名为必填信息!"
);
throw
new
BadRequest
(
NAME
+
(
i
+
1
)
+
"行, 组员姓名为必填信息!"
);
}
if
(
ObjectUtils
.
isEmpty
(
dto
.
getTelephone
()))
{
throw
new
BadRequest
(
"组员信息表第"
+
(
i
+
1
)+
"行, 组员电话为必填信息!"
);
throw
new
BadRequest
(
NAME
+
(
i
+
1
)+
"行, 组员电话为必填信息!"
);
}
}
}
...
...
@@ -222,7 +183,6 @@ public class OrganizationImpl extends BaseService<Organization,Organization, Org
this
.
updateById
(
organization
);
upOrganization
.
setSort
(
sort
);
this
.
updateById
(
upOrganization
);
return
true
;
}
else
{
// 下移,查询下一条数据
LambdaQueryWrapper
<
Organization
>
wrapper
=
new
LambdaQueryWrapper
<>();
...
...
@@ -238,8 +198,9 @@ public class OrganizationImpl extends BaseService<Organization,Organization, Org
this
.
updateById
(
organization
);
downOrganization
.
setSort
(
sort
);
this
.
updateById
(
downOrganization
);
return
true
;
}
return
true
;
}
@Override
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/OrganizationUserImpl.java
View file @
5b66aa10
...
...
@@ -38,7 +38,6 @@ public class OrganizationUserImpl extends BaseService<OrganizationUser,Organizat
if
(!
ObjectUtils
.
isEmpty
(
id
)
&&
id
!=
0
)
{
wrapper
.
eq
(
OrganizationUser:
:
getEmergencyTeamId
,
id
);
}
// wrapper.orderByDesc(BaseEntity::getRecDate);
wrapper
.
eq
(
OrganizationUser:
:
getIsDelete
,
false
);
wrapper
.
orderByDesc
(
OrganizationUser:
:
getSort
);
return
this
.
baseMapper
.
selectPage
(
page
,
wrapper
);
...
...
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 @
5b66aa10
...
...
@@ -27,6 +27,7 @@ import org.springframework.stereotype.Service;
import
org.springframework.transaction.annotation.Transactional
;
import
org.typroject.tyboot.component.emq.EmqKeeper
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
org.typroject.tyboot.core.restful.exception.instance.BadRequest
;
import
javax.annotation.Resource
;
import
java.text.SimpleDateFormat
;
...
...
@@ -60,13 +61,17 @@ public class PowerTransferCompanyResourcesServiceImpl extends BaseService<PowerT
@Value
(
"${mqtt.topic.command.power.deployment}"
)
private
String
topic
;
private
static
String
RESOURCES_ID
=
"resources_id"
;
private
static
String
PHOTOS
=
"/photos:"
;
@Override
public
AlertCalled
getByPowerTransferCompanyResourId
(
Long
id
)
{
QueryWrapper
<
PowerTransferCompanyResources
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
eq
(
"status"
,
FireCarStatusEnum
.
执行中
.
getCode
());
queryWrapper
.
eq
(
"resources_id"
,
id
.
toString
());
queryWrapper
.
eq
(
RESOURCES_ID
,
id
.
toString
());
PowerTransferCompanyResources
alertFormValue
=
this
.
getOne
(
queryWrapper
);
if
(
alertFormValue
!=
null
)
{
return
powerTransferCompanyResourcesMapper
.
getByPowerTransferCompanyResourId
(
alertFormValue
.
getPowerTransferCompanyId
());
...
...
@@ -126,7 +131,7 @@ public class PowerTransferCompanyResourcesServiceImpl extends BaseService<PowerT
jcSituationDetail
.
setInfo
(
info
);
if
(
CollectionUtils
.
isNotEmpty
(
photos
)){
jcSituationDetail
.
setInfo
(
info
+
"/photos:"
+
Joiner
.
on
(
","
).
join
(
photos
));
jcSituationDetail
.
setInfo
(
info
+
PHOTOS
+
Joiner
.
on
(
","
).
join
(
photos
));
}
jcSituationDetail
.
setPowerTransferCompanyResourcesId
(
powerTransferCompanyResources
.
getSequenceNbr
());
...
...
@@ -137,7 +142,7 @@ public class PowerTransferCompanyResourcesServiceImpl extends BaseService<PowerT
// 定义指令信息消息推送 页面发送mqtt 默认发送 String 类型 0, 新警情 1 警情状态变化
emqKeeper
.
getMqttClient
().
publish
(
topic
,
"0"
.
getBytes
(),
RuleConfig
.
DEFAULT_QOS
,
false
);
}
catch
(
Exception
e
)
{
throw
new
RuntimeException
(
"修改失败!"
);
throw
new
BadRequest
(
"修改失败!"
);
}
}
...
...
@@ -154,8 +159,8 @@ public class PowerTransferCompanyResourcesServiceImpl extends BaseService<PowerT
wrapper
.
orderByDesc
(
BaseEntity:
:
getRecDate
);
List
<
JcSituationDetail
>
list
=
jcSituationDetailMapper
.
selectList
(
wrapper
);
list
.
stream
().
forEach
(
e
->{
if
(
e
.
getInfo
().
contains
(
"/photos:"
)){
String
[]
content
=
e
.
getInfo
().
split
(
"/photos:"
);
if
(
e
.
getInfo
().
contains
(
PHOTOS
)){
String
[]
content
=
e
.
getInfo
().
split
(
PHOTOS
);
String
info
=
content
[
0
];
String
photoUrls
=
content
[
1
];
List
<
String
>
photos
=
Arrays
.
asList
(
photoUrls
);
...
...
@@ -170,14 +175,14 @@ public class PowerTransferCompanyResourcesServiceImpl extends BaseService<PowerT
@Override
public
PowerTransferCompanyResources
getResourceById
(
String
resourceId
)
{
QueryWrapper
<
PowerTransferCompanyResources
>
powerTransferCompanyResourcesQueryWrapper
=
new
QueryWrapper
<>();
powerTransferCompanyResourcesQueryWrapper
.
eq
(
"resources_id"
,
resourceId
);
powerTransferCompanyResourcesQueryWrapper
.
eq
(
RESOURCES_ID
,
resourceId
);
return
powerTransferCompanyResourcesMapper
.
selectOne
(
powerTransferCompanyResourcesQueryWrapper
);
}
@Override
public
int
getCarExecutingCountById
(
String
resourceId
,
String
status
)
{
QueryWrapper
<
PowerTransferCompanyResources
>
powerTransferCompanyResourcesQueryWrapper
=
new
QueryWrapper
<>();
powerTransferCompanyResourcesQueryWrapper
.
eq
(
"resources_id"
,
resourceId
);
powerTransferCompanyResourcesQueryWrapper
.
eq
(
RESOURCES_ID
,
resourceId
);
powerTransferCompanyResourcesQueryWrapper
.
eq
(
"status"
,
status
);
powerTransferCompanyResourcesQueryWrapper
.
eq
(
"is_delete"
,
0
);
return
powerTransferCompanyResourcesMapper
.
selectCount
(
powerTransferCompanyResourcesQueryWrapper
);
...
...
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 @
5b66aa10
This diff is collapsed.
Click to expand it.
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerrTransferLogServiceImpl.java
View file @
5b66aa10
...
...
@@ -115,9 +115,9 @@ public class PowerrTransferLogServiceImpl extends BaseService<PowerrTransferLogD
final
String
receiveName
=
personName
;
List
<
PowerrTransferLog
>
list
=
new
ArrayList
<>();
if
(
FireBrigadeTypeEnum
.
专职消防队
.
getKey
().
equals
(
powerTransType
))
{
List
<
Object
>
companyDetail
=
JSON
Array
.
parseArray
(
JSON
.
toJSON
(
alertCallePowerTransferRo
.
getCompany
()).
toString
(),
Object
.
class
);
List
<
Object
>
companyDetail
=
JSON
.
parseArray
(
JSON
.
toJSON
(
alertCallePowerTransferRo
.
getCompany
()).
toString
(),
Object
.
class
);
for
(
Object
powerTransferCompanyDto
:
companyDetail
)
{
PowerTransferCompanyDto
powerDto
=
JSON
Object
.
parseObject
(
JSON
.
toJSON
(
powerTransferCompanyDto
).
toString
(),
PowerTransferCompanyDto
.
class
);
PowerTransferCompanyDto
powerDto
=
JSON
.
parseObject
(
JSON
.
toJSON
(
powerTransferCompanyDto
).
toString
(),
PowerTransferCompanyDto
.
class
);
List
<
PowerTransferCompanyResourcesDto
>
powerTransferCompanyResourcesDtoList
=
powerDto
.
getPowerTransferCompanyResourcesDtoList
();
powerTransferCompanyResourcesDtoList
.
stream
().
forEach
(
f
->
{
PowerrTransferLog
pw
=
new
PowerrTransferLog
();
...
...
@@ -135,9 +135,9 @@ public class PowerrTransferLogServiceImpl extends BaseService<PowerrTransferLogD
});
}
}
else
if
(
FireBrigadeTypeEnum
.
医疗救援队
.
getKey
().
equals
(
powerTransType
)
||
FireBrigadeTypeEnum
.
监控大队
.
getKey
().
equals
(
powerTransType
))
{
List
<
Object
>
companyDetail
=
JSON
Array
.
parseArray
(
JSON
.
toJSON
(
alertCallePowerTransferRo
.
getCompany
()).
toString
(),
Object
.
class
);
List
<
Object
>
companyDetail
=
JSON
.
parseArray
(
JSON
.
toJSON
(
alertCallePowerTransferRo
.
getCompany
()).
toString
(),
Object
.
class
);
for
(
Object
powerTransferCompanyDto
:
companyDetail
)
{
PowerTransferCompanyDto
powerDto
=
JSON
Object
.
parseObject
(
JSON
.
toJSON
(
powerTransferCompanyDto
).
toString
(),
PowerTransferCompanyDto
.
class
);
PowerTransferCompanyDto
powerDto
=
JSON
.
parseObject
(
JSON
.
toJSON
(
powerTransferCompanyDto
).
toString
(),
PowerTransferCompanyDto
.
class
);
PowerrTransferLog
pw
=
new
PowerrTransferLog
();
pw
.
setTeamId
(
powerDto
.
getSequenceNbr
());
pw
.
setReceiveName
(
receiveName
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/RuleAlertCalledService.java
View file @
5b66aa10
...
...
@@ -54,6 +54,8 @@ public class RuleAlertCalledService {
AlertCalledServiceImpl
alertCalledServiceImpl
;
private
static
final
String
DANGEROUSEXPLOSIVES
=
"dangerousExplosives"
;
/**
*
* <pre>
...
...
@@ -134,7 +136,7 @@ public class RuleAlertCalledService {
{
alertCalledRo
.
setFireSituation
(
alertFormValue
.
getFieldValue
());
}
if
(
alertFormValue
.
getFieldCode
().
equals
(
"dangerousExplosives"
))
if
(
alertFormValue
.
getFieldCode
().
equals
(
DANGEROUSEXPLOSIVES
))
{
alertCalledRo
.
setDangerousExplosives
(
alertFormValue
.
getFieldValue
());
}
...
...
@@ -297,7 +299,7 @@ public class RuleAlertCalledService {
if
(
alertFormValue
.
getKey
().
equals
(
"fireSituation"
))
{
alertCallePowerTransferRo
.
setFireSituation
(
alertFormValue
.
getValue
());
}
if
(
alertFormValue
.
getKey
().
equals
(
"dangerousExplosives"
))
{
if
(
alertFormValue
.
getKey
().
equals
(
DANGEROUSEXPLOSIVES
))
{
alertCallePowerTransferRo
.
setDangerousExplosives
(
alertFormValue
.
getValue
());
}
if
(
alertFormValue
.
getKey
().
equals
(
"fireTime"
))
{
...
...
@@ -312,7 +314,7 @@ public class RuleAlertCalledService {
if
(
alertFormValue
.
getKey
().
equals
(
"ageGroup"
))
{
ageGroup
=
alertFormValue
.
getValue
();
}
if
(
alertFormValue
.
getKey
().
equals
(
"dangerousExplosives"
))
{
if
(
alertFormValue
.
getKey
().
equals
(
DANGEROUSEXPLOSIVES
))
{
dangerousExplosives
=
alertFormValue
.
getValue
();
}
}
...
...
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @
5b66aa10
...
...
@@ -58,7 +58,7 @@
<select
id=
"getEquiplistBySystemIdList"
resultMap=
"EquiplistBySystemId"
>
SELECT
det.`name` equipmentName,
spe.`iot_code` iotCode,
ein.equipment_index_name indexName,
ein.equipment_index_key indexKey,
...
...
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