Skip to content

Y
YeeAmosFireAutoSysRoot
Commit 9b6fabf3 authored by 高建强's avatar 高建强
Browse files
Options

item:修改三维查询及日志级别

parent b6f2857e
Show whitespace changes
Inline Side-by-side
Showing with 87 additions and 82 deletions
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_view3d.xml
View file @ 9b6fabf3
......@@ -1860,7 +1860,7 @@
LIMIT ${start},${length}
</select>
<select id="retrieve3AllCount" resultType="long">
SELECT COUNT(1) FROM (
SELECT count(1) FROM (
SELECT
concat('fireCar-', car.id) AS id,
concat(car.id) AS originId,
......@@ -1874,6 +1874,7 @@
'消防车' AS typeName,
'fireEquipment' AS typeCode,
car.`name` AS label,
car.`name` AS protectObjName,
'' AS routeName,
'' AS areaId,
'' AS person,
......@@ -1887,24 +1888,25 @@
LEFT JOIN wl_equipment_category AS cat ON equ.category_id = cat.id
UNION ALL
SELECT
concat( 'riskSource-', r.id ) AS id,
concat( r.id ) AS originId,
r.name,
r.code,
concat('riskSource-', r.id) AS id,
concat(r.id) AS originId,
r.`name`,
r.`code`,
'riskSource' AS type,
r.org_code as orgCode,
rl.LEVEL AS LEVEL,
rl.name AS levelStr,
r.org_code AS orgCode,
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,
r.`name` AS protectObjName,
'' AS routeName,
'' AS areaId,
'' AS person,
r.rpn AS title,
CONCAT( 'riskSource-', r.id ) AS `key`,
CONCAT('riskSource-', r.id) AS `key`,
r.id AS riskSourceId,
null AS areaId,
'' AS room
FROM
f_risk_source r
......@@ -1916,92 +1918,94 @@
</if>
UNION ALL
SELECT
concat( 'patrol-', p.id ) AS id,
concat( p.id ) AS originId,
p.name,
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,
vi.`name` AS protectObjName,
'' AS routeName,
vi.belongAreaId AS areaId,
'' AS person,
vi.`name` AS title,
concat('video-', vi.id) AS `key`,
'' AS riskSourceId,
vi.address AS room
FROM
wl_video AS vi
<where>
<if test="areaId != null and areaId !=0">
vi.belongAreaId = #{areaId}
</if>
</where>
UNION ALL
SELECT
concat('patrol-', p.id) AS id,
concat(p.id) AS originId,
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.org_code AS orgCode,
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.`name` AS protectObjName,
p.route_name AS routeName,
p.area_id AS areaId,
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`,
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">
<if test="areaId != null and areaId !=0">
AND p.area_id = #{areaId}
</if>
</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,
concat('fireEquipment-', m.id) AS id,
concat(m.id) AS originId,
det.`name`,
m.`code` AS `code`,
'fireEquipment' AS type,
m.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,
m.CODE AS CODE,
'fireEquipment' AS type,
m.org_code as orgCode,
NULL AS LEVEL,
concat( 'level_', NULL ) AS levelStr,
NULL AS isIndoor,
'消防设备' AS typeName,
'fireEquipment' AS typeCode,
det.name AS label,
det.`name` AS label,
det.`name` AS protectObjName,
'' AS routeName,
'' AS person,
det.name AS title,
concat( 'fireEquipment-', m.id ) AS `key`,
'' AS riskSourceId,
m.area_id AS areaId,
'' AS person,
det.`name` AS title,
concat('fireEquipment-', m.id) AS `key`,
risk.id AS riskSourceId,
str.full_name AS room
FROM
wl_equipment_specific m
......@@ -2010,11 +2014,12 @@
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">
<if test="areaId != null and areaId !=0">
m.area_id = #{areaId}
</if>
<if test="equipmentId != null">
<if test="equipmentId != null and equipmentId != 0">
AND equ.id = #{equipmentId}
</if>
</where>
......@@ -2030,7 +2035,7 @@
<if test="type!=null and type!=''">
AND tmp.typeCode = #{type}
</if>
<if test="riskSourceId != null">
<if test="riskSourceId != null and riskSourceId != ''">
AND tmp.riskSourceId = #{riskSourceId}
</if>
<if test="orgCode!=null">
......@@ -2120,7 +2125,7 @@
FROM
wl_video AS vi
<where>
<if test="areaId != null">
<if test="areaId != null and areaId !=0">
vi.belongAreaId = #{areaId}
</if>
</where>
......@@ -2160,7 +2165,7 @@
LEFT JOIN wl_warehouse_structure r ON r.id = p.risk_source_id
<where>
is_delete = FALSE
<if test="areaId != null">
<if test="areaId != null and areaId !=0">
AND p.area_id = #{areaId}
</if>
</where>
......@@ -2195,10 +2200,10 @@
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">
<if test="areaId != null and areaId !=0">
m.area_id = #{areaId}
</if>
<if test="equipmentId != null">
<if test="equipmentId != null and equipmentId != 0">
AND equ.id = #{equipmentId}
</if>
</where>
......@@ -2214,7 +2219,7 @@
<if test="type!=null and type!=''">
AND tmp.typeCode = #{type}
</if>
<if test="riskSourceId != null">
<if test="riskSourceId != null and riskSourceId != ''">
AND tmp.riskSourceId = #{riskSourceId}
</if>
<if test="orgCode!=null">
......
YeeAmosFireAutoSysStart/src/main/resources/logback.xml
View file @ 9b6fabf3
......@@ -32,15 +32,15 @@
<logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
-->
<!--myibatis log configure-->
<logger name="com.apache.ibatis" level="DEBUG"/>
<logger name="org.mybatis" level="DEBUG" />
<logger name="java.sql.Connection" level="DEBUG"/>
<logger name="java.sql.Statement" level="DEBUG"/>
<logger name="java.sql.PreparedStatement" level="DEBUG"/>
<logger name="org.springframework" level="DEBUG"/>
<logger name="com.apache.ibatis" level="ERROR"/>
<logger name="org.mybatis" level="ERROR" />
<logger name="java.sql.Connection" level="ERROR"/>
<logger name="java.sql.Statement" level="ERROR"/>
<logger name="java.sql.PreparedStatement" level="ERROR"/>
<logger name="org.springframework" level="ERROR"/>
<!-- 日志输出级别 -->
<root level="DEBUG">
<root level="ERROR">
<appender-ref ref="FILE" />
<appender-ref ref="STDOUT" />
</root>
......
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