Skip to content

Y
YeeAmosFireAutoSysRoot
Commit ce086d02 authored by maoying's avatar maoying
Browse files
Options

修改三维接口

parent 4fe26238
Show whitespace changes
Inline Side-by-side
Showing with 104 additions and 47 deletions
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/View3dMapper.java
View file @ ce086d02
......@@ -164,9 +164,11 @@ public interface View3dMapper extends BaseMapper {
List<HashMap<String, Object>> retrieveAll(String type, Long riskSourceId, String inputText, long start, int length, String orgCode, String dataLevel, String protectObjName);
Long retrieve3AllCount(String type, Long riskSourceId, Long areaId, Long equipmentId, String inputText, String orgCode, String dataLevel);
Long retrieve3AllCount(@Param("type")String type, @Param("riskSourceId")Long riskSourceId, @Param("areaId")Long areaId
, @Param("equipmentId")Long equipmentId, @Param("inputText")String inputText, @Param("orgCode")String orgCode, @Param("dataLevel")String dataLevel);
List<HashMap<String, Object>> retrieve3All(String type, Long riskSourceId, Long areaId, Long equipmentId, String inputText, long start, int length, String orgCode, String dataLevel);
List<HashMap<String, Object>> retrieve3All(@Param("type")String type, @Param("riskSourceId")Long riskSourceId, @Param("areaId")Long areaId, @Param("equipmentId")Long equipmentId, @Param("inputText")String inputText, @Param("start")long start
, @Param("length")int length, @Param("orgCode")String orgCode, @Param("dataLevel")String dataLevel);
/**
* 查询区域下点
......
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_view3d.xml
View file @ ce086d02
......@@ -1304,7 +1304,7 @@
(
SELECT
a.instance_id AS instanceId,
A.group_code AS groupCode,
a.group_code AS groupCode,
MAX(
CASE
WHEN a.field_name = 'name' THEN
......@@ -1641,7 +1641,7 @@
s.address as room
from (SELECT
a.instance_id AS instanceId,
A.group_code AS groupCode,
a.group_code AS groupCode,
MAX(
CASE
WHEN a.field_name = 'name' THEN
......@@ -1760,7 +1760,7 @@
s.address as room
from (SELECT
a.instance_id AS instanceId,
A.group_code AS groupCode,
a.group_code AS groupCode,
MAX(
CASE
WHEN a.field_name = 'name' THEN
......@@ -1807,7 +1807,7 @@
s.address as room
from (SELECT
a.instance_id AS instanceId,
A.group_code AS groupCode,
a.group_code AS groupCode,
MAX(
CASE
WHEN a.field_name = 'name' THEN
......@@ -1864,16 +1864,16 @@
SELECT
concat( 'riskSource-', r.id ) AS id,
concat( r.id ) AS originId,
r.NAME,
r.CODE,
r.name,
r.code,
'riskSource' AS type,
r.org_code as orgCode,
rl.LEVEL AS LEVEL,
rl.NAME AS levelStr,
rl.name AS levelStr,
r.is_indoor AS isIndoor,
'风险点' AS typeName,
'riskSource' AS typeCode,
r.NAME AS label,
r.name AS label,
'' AS routeName,
'' AS person,
r.rpn AS title,
......@@ -1893,33 +1893,33 @@
SELECT
concat( 'patrol-', p.id ) AS id,
concat( p.id ) AS originId,
p.NAME,
p.name,
p.point_no AS CODE,
'patrol' AS type,
p.org_code as orgCode,
p.STATUS AS LEVEL,
CONCAT( 'level_', p.STATUS ) AS levelStr,
p.status AS level,
CONCAT( 'level_', p.status ) AS levelStr,
p.is_indoor AS isIndoor,
'巡检点' AS typeName,
'patrol' AS typeCode,
p.NAME AS label,
p.name AS label,
p.route_name AS routeName,
p.charge_person_id AS person,
CASE
WHEN p.STATUS = '0' THEN
WHEN p.status = '0' THEN
'未执行'
WHEN p.STATUS = '1' THEN
WHEN p.status = '1' THEN
'合格'
WHEN p.STATUS = '2' THEN
WHEN p.status = '2' THEN
'不合格'
WHEN p.STATUS = '3' THEN
WHEN p.status = '3' THEN
'漏检'
END AS title,
concat( 'patrol-', p.id ) AS `key`,
p.risk_source_id AS riskSourceId,
p.area_id AS areaId,
r.NAME AS room
r.name AS room
FROM
p_point p
LEFT JOIN f_risk_source r ON r.id = p.risk_source_id
......@@ -1931,9 +1931,37 @@
</where>
UNION ALL
SELECT
concat('video-', vi.id) AS id,
concat(vi.id) AS originId,
vi.name,
vi.code,
'video' AS type,
vi.org_code AS orgCode,
'' AS level,
concat('level_', '') AS levelStr,
'' AS isIndoor,
'摄像头' AS typeName,
'video' AS typeCode,
vi.`name` AS label,
'' AS routeName,
'' AS person,
vi.`name` AS title,
concat('video-', vi.id) AS `key`,
'' AS riskSourceId,
vi.belongAreaId as areaId,
vi.address AS room
FROM
wl_video AS vi
<where>
<if test="areaId != null">
vi.belongAreaId = #{areaId}
</if>
</where>
UNION ALL
SELECT
concat( 'fireEquipment-', m.id ) AS id,
concat( m.id ) AS originId,
det.NAME,
det.name,
m.CODE AS CODE,
'fireEquipment' AS type,
m.org_code as orgCode,
......@@ -1942,12 +1970,12 @@
NULL AS isIndoor,
'消防设备' AS typeName,
'fireEquipment' AS typeCode,
det.NAME AS label,
det.name AS label,
'' AS routeName,
'' AS person,
det.NAME AS title,
det.name AS title,
concat( 'fireEquipment-', m.id ) AS `key`,
risk.id AS riskSourceId,
'' AS riskSourceId,
m.area_id AS areaId,
str.full_name AS room
FROM
......@@ -1957,7 +1985,6 @@
LEFT JOIN wl_equipment_category AS cat ON equ.category_id = cat.id
LEFT JOIN wl_stock_detail AS sto ON sto.qr_code = m.qr_code
LEFT JOIN wl_warehouse_structure AS str ON sto.warehouse_structure_id = str.source_id
LEFT JOIN f_risk_source AS risk ON str.source_id = risk.source_id
<where>
<if test="areaId != null">
m.area_id = #{areaId}
......@@ -1967,7 +1994,7 @@
</if>
</where>
GROUP BY
m.CODE) as tmp
m.code) as tmp
<where>
<if test="inputText!=null and inputText != ''">
AND (
......@@ -1991,16 +2018,16 @@
SELECT
concat( 'riskSource-', r.id ) AS id,
concat( r.id ) AS originId,
r.NAME,
r.CODE,
r.name,
r.code,
'riskSource' AS type,
r.org_code as orgCode,
rl.LEVEL AS LEVEL,
rl.NAME AS levelStr,
rl.level AS level,
rl.name AS levelStr,
r.is_indoor AS isIndoor,
'风险点' AS typeName,
'riskSource' AS typeCode,
r.NAME AS label,
r.name AS label,
'' AS routeName,
'' AS person,
r.rpn AS title,
......@@ -2018,38 +2045,66 @@
</if>
UNION ALL
SELECT
concat('video-', vi.id) AS id,
concat(vi.id) AS originId,
vi.name,
vi.code,
'video' AS type,
vi.org_code AS orgCode,
'' AS level,
concat('level_', '') AS levelStr,
'' AS isIndoor,
'摄像头' AS typeName,
'video' AS typeCode,
vi.`name` AS label,
'' AS routeName,
'' AS person,
vi.`name` AS title,
concat('video-', vi.id) AS `key`,
'' AS riskSourceId,
vi.belongAreaId as areaId,
vi.address AS room
FROM
wl_video AS vi
<where>
<if test="areaId != null">
vi.belongAreaId = #{areaId}
</if>
</where>
UNION ALL
SELECT
concat( 'patrol-', p.id ) AS id,
concat( p.id ) AS originId,
p.NAME,
p.name,
p.point_no AS CODE,
'patrol' AS type,
p.org_code as orgCode,
p.STATUS AS LEVEL,
CONCAT( 'level_', p.STATUS ) AS levelStr,
p.status AS level,
CONCAT( 'level_', p.status ) AS levelStr,
p.is_indoor AS isIndoor,
'巡检点' AS typeName,
'patrol' AS typeCode,
p.NAME AS label,
p.name AS label,
p.route_name AS routeName,
p.charge_person_id AS person,
CASE
WHEN p.STATUS = '0' THEN
WHEN p.status = '0' THEN
'未执行'
WHEN p.STATUS = '1' THEN
WHEN p.status = '1' THEN
'合格'
WHEN p.STATUS = '2' THEN
WHEN p.status = '2' THEN
'不合格'
WHEN p.STATUS = '3' THEN
WHEN p.status = '3' THEN
'漏检'
END AS title,
concat( 'patrol-', p.id ) AS `key`,
p.risk_source_id AS riskSourceId,
p.area_id AS areaId,
r.NAME AS room
r.full_name AS room
FROM
p_point p
LEFT JOIN f_risk_source r ON r.id = p.risk_source_id
LEFT JOIN wl_warehouse_structure r ON r.id = p.risk_source_id
<where>
is_delete = FALSE
<if test="areaId != null">
......@@ -2060,19 +2115,19 @@
SELECT
concat( 'fireEquipment-', m.id ) AS id,
concat( m.id ) AS originId,
det.NAME,
m.CODE AS CODE,
det.name,
m.code AS code,
'fireEquipment' AS type,
m.org_code as orgCode,
NULL AS LEVEL,
concat( 'level_', NULL ) AS levelStr,
'' AS level,
concat( 'level_', '' ) AS levelStr,
NULL AS isIndoor,
'消防设备' AS typeName,
'fireEquipment' AS typeCode,
det.NAME AS label,
det.name AS label,
'' AS routeName,
'' AS person,
det.NAME AS title,
det.name AS title,
concat( 'fireEquipment-', m.id ) AS `key`,
risk.id AS riskSourceId,
m.area_id AS areaId,
......@@ -2094,7 +2149,7 @@
</if>
</where>
GROUP BY
m.CODE) as tmp
m.code) as tmp
<where>
<if test="inputText!=null and inputText != ''">
AND (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment