Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YeeAmosFireAutoSysRoot
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
station
YeeAmosFireAutoSysRoot
Commits
bc36d2dd
Commit
bc36d2dd
authored
Dec 18, 2020
by
maoying
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改预案查询
parent
b8b7a750
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
3 deletions
+19
-3
ImpAndFireEquipMapper.java
...n/amos/fas/business/dao/mapper/ImpAndFireEquipMapper.java
+3
-0
RiskSourceServiceImpl.java
...amos/fas/business/service/impl/RiskSourceServiceImpl.java
+4
-3
dbTemplate_impAndfire_equip.xml
.../main/resources/db/mapper/dbTemplate_impAndfire_equip.xml
+12
-0
No files found.
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/ImpAndFireEquipMapper.java
View file @
bc36d2dd
package
com
.
yeejoin
.
amos
.
fas
.
business
.
dao
.
mapper
;
import
com.yeejoin.amos.fas.business.vo.EquipmentSpecificIndexVo
;
import
com.yeejoin.amos.fas.dao.entity.Equipment
;
import
com.yeejoin.amos.fas.dao.entity.EquipmentFireEquipment
;
import
com.yeejoin.amos.fas.dao.entity.FireEquipment
;
...
...
@@ -36,4 +37,6 @@ public interface ImpAndFireEquipMapper extends BaseMapper {
public
Boolean
existsAlarmPointByEqpPointIdAndEquipId
(
@Param
(
"pointId"
)
long
pointId
,
@Param
(
"equipmentId"
)
long
equipmentId
);
// Boolean containGroupedPoint(long id);
EquipmentSpecificIndexVo
findFireEqupmentByCode
(
String
code
);
}
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java
View file @
bc36d2dd
...
...
@@ -1024,9 +1024,10 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
@javax
.
transaction
.
Transactional
public
String
processFireEqumtData
(
AlarmParam
deviceData
)
throws
Exception
{
EquipmentSpecificIndexVo
equipmentSpecificIndexVo
=
new
EquipmentSpecificIndexVo
();
equipmentSpecificIndexVo
.
setEquipmentSpecificId
(
Long
.
valueOf
(
deviceData
.
getPointCode
()));
equipmentSpecificIndexVo
.
setType
(
"FIREALARM"
);
EquipmentSpecificIndexVo
equipmentSpecificIndexVo
=
impAndFireEquipMapper
.
findFireEqupmentByCode
(
deviceData
.
getPointCode
());
// new EquipmentSpecificIndexVo();
// equipmentSpecificIndexVo.setEquipmentSpecificId(Long.valueOf(deviceData.getPointCode()));
// equipmentSpecificIndexVo.setType("FIREALARM");
TopicEntityVo
topicEntity
=
new
TopicEntityVo
();
topicEntity
.
setMessage
(
JSON
.
toJSONString
(
equipmentSpecificIndexVo
));
...
...
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_impAndfire_equip.xml
View file @
bc36d2dd
...
...
@@ -158,4 +158,15 @@
and ep.id = #{pointId}
</select>
<select
id=
"findFireEqupmentByCode"
resultType=
"com.yeejoin.amos.fas.business.vo.EquipmentSpecificIndexVo"
>
SELECT
id as equipmentSpecificId,
'FIREALARM' as type
FROM
wl_equipment_specific
WHERE
`code` = #{code}
LIMIT 1
</select>
</mapper>
\ 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