diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index a533a99..5c5aa0a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -46,6 +46,8 @@ void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); + void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus); + Page pop(Page page, @Param("deptIdStr") String deptIdStr); List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index a533a99..5c5aa0a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -46,6 +46,8 @@ void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); + void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus); + Page pop(Page page, @Param("deptIdStr") String deptIdStr); List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index 65ec5f0..720da0c 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -26,108 +26,108 @@ @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index a533a99..5c5aa0a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -46,6 +46,8 @@ void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); + void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus); + Page pop(Page page, @Param("deptIdStr") String deptIdStr); List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index 65ec5f0..720da0c 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -26,108 +26,108 @@ @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index a533a99..5c5aa0a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -46,6 +46,8 @@ void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); + void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus); + Page pop(Page page, @Param("deptIdStr") String deptIdStr); List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index 65ec5f0..720da0c 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -26,108 +26,108 @@ @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ - WITH device_temp AS (SELECT bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd + WITH device_temp AS (SELECT distinct(bd.id),bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd LEFT join bus_device_ledger lr on lr.DEVICE_ID=bd.ID LEFT join bus_ledger_all_view bv on lr.LEDGER_ID=bv.ID and lr.type = bv.type @@ -45,7 +45,7 @@ WITH device_temp AS ( SELECT - count( 1 ) AS deviceCount, + count(DISTINCT bd.id) AS deviceCount, bd.DEVICE_TYPE FROM bus_device bd @@ -74,19 +74,24 @@ WITH device_temp AS ( SELECT - count(1) AS deviceCount, + count(bd.id) AS deviceCount, SUM(CASE WHEN bd.ONLINE_STATE=0 THEN 1 ELSE 0 END) as offCount, bd.DEVICE_TYPE FROM - bus_device bd + (SELECT + DISTINCT(bd.id) as id, + bd.ONLINE_STATE, + bd.DEVICE_TYPE + FROM + bus_device bd LEFT JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.ID LEFT JOIN bus_ledger_all_view lt ON bl.LEDGER_ID = lt.ID and bl.type = lt.type - WHERE - bd.VALID > 0 - - and lt.DEPTID in (${deptStrs}) - - + WHERE + bd.VALID > 0 + + and lt.DEPTID in (${deptStrs}) + + ) bd GROUP BY bd.DEVICE_TYPE ) SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index a533a99..5c5aa0a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -46,6 +46,8 @@ void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); + void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus); + Page pop(Page page, @Param("deptIdStr") String deptIdStr); List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index 65ec5f0..720da0c 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -26,108 +26,108 @@ @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ - WITH device_temp AS (SELECT bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd + WITH device_temp AS (SELECT distinct(bd.id),bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd LEFT join bus_device_ledger lr on lr.DEVICE_ID=bd.ID LEFT join bus_ledger_all_view bv on lr.LEDGER_ID=bv.ID and lr.type = bv.type @@ -45,7 +45,7 @@ WITH device_temp AS ( SELECT - count( 1 ) AS deviceCount, + count(DISTINCT bd.id) AS deviceCount, bd.DEVICE_TYPE FROM bus_device bd @@ -74,19 +74,24 @@ WITH device_temp AS ( SELECT - count(1) AS deviceCount, + count(bd.id) AS deviceCount, SUM(CASE WHEN bd.ONLINE_STATE=0 THEN 1 ELSE 0 END) as offCount, bd.DEVICE_TYPE FROM - bus_device bd + (SELECT + DISTINCT(bd.id) as id, + bd.ONLINE_STATE, + bd.DEVICE_TYPE + FROM + bus_device bd LEFT JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.ID LEFT JOIN bus_ledger_all_view lt ON bl.LEDGER_ID = lt.ID and bl.type = lt.type - WHERE - bd.VALID > 0 - - and lt.DEPTID in (${deptStrs}) - - + WHERE + bd.VALID > 0 + + and lt.DEPTID in (${deptStrs}) + + ) bd GROUP BY bd.DEVICE_TYPE ) SELECT diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 04d53bb..a716a72 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -95,11 +95,9 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index a533a99..5c5aa0a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -46,6 +46,8 @@ void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); + void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus); + Page pop(Page page, @Param("deptIdStr") String deptIdStr); List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index 65ec5f0..720da0c 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -26,108 +26,108 @@ @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ - WITH device_temp AS (SELECT bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd + WITH device_temp AS (SELECT distinct(bd.id),bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd LEFT join bus_device_ledger lr on lr.DEVICE_ID=bd.ID LEFT join bus_ledger_all_view bv on lr.LEDGER_ID=bv.ID and lr.type = bv.type @@ -45,7 +45,7 @@ WITH device_temp AS ( SELECT - count( 1 ) AS deviceCount, + count(DISTINCT bd.id) AS deviceCount, bd.DEVICE_TYPE FROM bus_device bd @@ -74,19 +74,24 @@ WITH device_temp AS ( SELECT - count(1) AS deviceCount, + count(bd.id) AS deviceCount, SUM(CASE WHEN bd.ONLINE_STATE=0 THEN 1 ELSE 0 END) as offCount, bd.DEVICE_TYPE FROM - bus_device bd + (SELECT + DISTINCT(bd.id) as id, + bd.ONLINE_STATE, + bd.DEVICE_TYPE + FROM + bus_device bd LEFT JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.ID LEFT JOIN bus_ledger_all_view lt ON bl.LEDGER_ID = lt.ID and bl.type = lt.type - WHERE - bd.VALID > 0 - - and lt.DEPTID in (${deptStrs}) - - + WHERE + bd.VALID > 0 + + and lt.DEPTID in (${deptStrs}) + + ) bd GROUP BY bd.DEVICE_TYPE ) SELECT diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 04d53bb..a716a72 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -95,11 +95,9 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml index 8d9c731..b3aff86 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml @@ -102,7 +102,7 @@ and bl.DEPTID in (${deptIds}) - ORDER BY bl.TS DESC + ORDER BY bl.MONITOR_STATE DESC,bl.TS DESC SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ - WITH device_temp AS (SELECT bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd + WITH device_temp AS (SELECT distinct(bd.id),bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd LEFT join bus_device_ledger lr on lr.DEVICE_ID=bd.ID LEFT join bus_ledger_all_view bv on lr.LEDGER_ID=bv.ID and lr.type = bv.type @@ -45,7 +45,7 @@ WITH device_temp AS ( SELECT - count( 1 ) AS deviceCount, + count(DISTINCT bd.id) AS deviceCount, bd.DEVICE_TYPE FROM bus_device bd @@ -74,19 +74,24 @@ WITH device_temp AS ( SELECT - count(1) AS deviceCount, + count(bd.id) AS deviceCount, SUM(CASE WHEN bd.ONLINE_STATE=0 THEN 1 ELSE 0 END) as offCount, bd.DEVICE_TYPE FROM - bus_device bd + (SELECT + DISTINCT(bd.id) as id, + bd.ONLINE_STATE, + bd.DEVICE_TYPE + FROM + bus_device bd LEFT JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.ID LEFT JOIN bus_ledger_all_view lt ON bl.LEDGER_ID = lt.ID and bl.type = lt.type - WHERE - bd.VALID > 0 - - and lt.DEPTID in (${deptStrs}) - - + WHERE + bd.VALID > 0 + + and lt.DEPTID in (${deptStrs}) + + ) bd GROUP BY bd.DEVICE_TYPE ) SELECT diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 04d53bb..a716a72 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -95,11 +95,9 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml index 8d9c731..b3aff86 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml @@ -102,7 +102,7 @@ and bl.DEPTID in (${deptIds}) - ORDER BY bl.TS DESC + ORDER BY bl.MONITOR_STATE DESC,bl.TS DESC SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ - WITH device_temp AS (SELECT bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd + WITH device_temp AS (SELECT distinct(bd.id),bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd LEFT join bus_device_ledger lr on lr.DEVICE_ID=bd.ID LEFT join bus_ledger_all_view bv on lr.LEDGER_ID=bv.ID and lr.type = bv.type @@ -45,7 +45,7 @@ WITH device_temp AS ( SELECT - count( 1 ) AS deviceCount, + count(DISTINCT bd.id) AS deviceCount, bd.DEVICE_TYPE FROM bus_device bd @@ -74,19 +74,24 @@ WITH device_temp AS ( SELECT - count(1) AS deviceCount, + count(bd.id) AS deviceCount, SUM(CASE WHEN bd.ONLINE_STATE=0 THEN 1 ELSE 0 END) as offCount, bd.DEVICE_TYPE FROM - bus_device bd + (SELECT + DISTINCT(bd.id) as id, + bd.ONLINE_STATE, + bd.DEVICE_TYPE + FROM + bus_device bd LEFT JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.ID LEFT JOIN bus_ledger_all_view lt ON bl.LEDGER_ID = lt.ID and bl.type = lt.type - WHERE - bd.VALID > 0 - - and lt.DEPTID in (${deptStrs}) - - + WHERE + bd.VALID > 0 + + and lt.DEPTID in (${deptStrs}) + + ) bd GROUP BY bd.DEVICE_TYPE ) SELECT diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 04d53bb..a716a72 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -95,11 +95,9 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml index 8d9c731..b3aff86 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml @@ -102,7 +102,7 @@ and bl.DEPTID in (${deptIds}) - ORDER BY bl.TS DESC + ORDER BY bl.MONITOR_STATE DESC,bl.TS DESC SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ - WITH device_temp AS (SELECT bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd + WITH device_temp AS (SELECT distinct(bd.id),bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd LEFT join bus_device_ledger lr on lr.DEVICE_ID=bd.ID LEFT join bus_ledger_all_view bv on lr.LEDGER_ID=bv.ID and lr.type = bv.type @@ -45,7 +45,7 @@ WITH device_temp AS ( SELECT - count( 1 ) AS deviceCount, + count(DISTINCT bd.id) AS deviceCount, bd.DEVICE_TYPE FROM bus_device bd @@ -74,19 +74,24 @@ WITH device_temp AS ( SELECT - count(1) AS deviceCount, + count(bd.id) AS deviceCount, SUM(CASE WHEN bd.ONLINE_STATE=0 THEN 1 ELSE 0 END) as offCount, bd.DEVICE_TYPE FROM - bus_device bd + (SELECT + DISTINCT(bd.id) as id, + bd.ONLINE_STATE, + bd.DEVICE_TYPE + FROM + bus_device bd LEFT JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.ID LEFT JOIN bus_ledger_all_view lt ON bl.LEDGER_ID = lt.ID and bl.type = lt.type - WHERE - bd.VALID > 0 - - and lt.DEPTID in (${deptStrs}) - - + WHERE + bd.VALID > 0 + + and lt.DEPTID in (${deptStrs}) + + ) bd GROUP BY bd.DEVICE_TYPE ) SELECT diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 04d53bb..a716a72 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -95,11 +95,9 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml index 8d9c731..b3aff86 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml @@ -102,7 +102,7 @@ and bl.DEPTID in (${deptIds}) - ORDER BY bl.TS DESC + ORDER BY bl.MONITOR_STATE DESC,bl.TS DESC SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ - WITH device_temp AS (SELECT bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd + WITH device_temp AS (SELECT distinct(bd.id),bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd LEFT join bus_device_ledger lr on lr.DEVICE_ID=bd.ID LEFT join bus_ledger_all_view bv on lr.LEDGER_ID=bv.ID and lr.type = bv.type @@ -45,7 +45,7 @@ WITH device_temp AS ( SELECT - count( 1 ) AS deviceCount, + count(DISTINCT bd.id) AS deviceCount, bd.DEVICE_TYPE FROM bus_device bd @@ -74,19 +74,24 @@ WITH device_temp AS ( SELECT - count(1) AS deviceCount, + count(bd.id) AS deviceCount, SUM(CASE WHEN bd.ONLINE_STATE=0 THEN 1 ELSE 0 END) as offCount, bd.DEVICE_TYPE FROM - bus_device bd + (SELECT + DISTINCT(bd.id) as id, + bd.ONLINE_STATE, + bd.DEVICE_TYPE + FROM + bus_device bd LEFT JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.ID LEFT JOIN bus_ledger_all_view lt ON bl.LEDGER_ID = lt.ID and bl.type = lt.type - WHERE - bd.VALID > 0 - - and lt.DEPTID in (${deptStrs}) - - + WHERE + bd.VALID > 0 + + and lt.DEPTID in (${deptStrs}) + + ) bd GROUP BY bd.DEVICE_TYPE ) SELECT diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 04d53bb..a716a72 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -95,11 +95,9 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml index 8d9c731..b3aff86 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml @@ -102,7 +102,7 @@ and bl.DEPTID in (${deptIds}) - ORDER BY bl.TS DESC + ORDER BY bl.MONITOR_STATE DESC,bl.TS DESC SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ - WITH device_temp AS (SELECT bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd + WITH device_temp AS (SELECT distinct(bd.id),bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd LEFT join bus_device_ledger lr on lr.DEVICE_ID=bd.ID LEFT join bus_ledger_all_view bv on lr.LEDGER_ID=bv.ID and lr.type = bv.type @@ -45,7 +45,7 @@ WITH device_temp AS ( SELECT - count( 1 ) AS deviceCount, + count(DISTINCT bd.id) AS deviceCount, bd.DEVICE_TYPE FROM bus_device bd @@ -74,19 +74,24 @@ WITH device_temp AS ( SELECT - count(1) AS deviceCount, + count(bd.id) AS deviceCount, SUM(CASE WHEN bd.ONLINE_STATE=0 THEN 1 ELSE 0 END) as offCount, bd.DEVICE_TYPE FROM - bus_device bd + (SELECT + DISTINCT(bd.id) as id, + bd.ONLINE_STATE, + bd.DEVICE_TYPE + FROM + bus_device bd LEFT JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.ID LEFT JOIN bus_ledger_all_view lt ON bl.LEDGER_ID = lt.ID and bl.type = lt.type - WHERE - bd.VALID > 0 - - and lt.DEPTID in (${deptStrs}) - - + WHERE + bd.VALID > 0 + + and lt.DEPTID in (${deptStrs}) + + ) bd GROUP BY bd.DEVICE_TYPE ) SELECT diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 04d53bb..a716a72 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -95,11 +95,9 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml index 8d9c731..b3aff86 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml @@ -102,7 +102,7 @@ and bl.DEPTID in (${deptIds}) - ORDER BY bl.TS DESC + ORDER BY bl.MONITOR_STATE DESC,bl.TS DESC SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ - WITH device_temp AS (SELECT bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd + WITH device_temp AS (SELECT distinct(bd.id),bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd LEFT join bus_device_ledger lr on lr.DEVICE_ID=bd.ID LEFT join bus_ledger_all_view bv on lr.LEDGER_ID=bv.ID and lr.type = bv.type @@ -45,7 +45,7 @@ WITH device_temp AS ( SELECT - count( 1 ) AS deviceCount, + count(DISTINCT bd.id) AS deviceCount, bd.DEVICE_TYPE FROM bus_device bd @@ -74,19 +74,24 @@ WITH device_temp AS ( SELECT - count(1) AS deviceCount, + count(bd.id) AS deviceCount, SUM(CASE WHEN bd.ONLINE_STATE=0 THEN 1 ELSE 0 END) as offCount, bd.DEVICE_TYPE FROM - bus_device bd + (SELECT + DISTINCT(bd.id) as id, + bd.ONLINE_STATE, + bd.DEVICE_TYPE + FROM + bus_device bd LEFT JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.ID LEFT JOIN bus_ledger_all_view lt ON bl.LEDGER_ID = lt.ID and bl.type = lt.type - WHERE - bd.VALID > 0 - - and lt.DEPTID in (${deptStrs}) - - + WHERE + bd.VALID > 0 + + and lt.DEPTID in (${deptStrs}) + + ) bd GROUP BY bd.DEVICE_TYPE ) SELECT diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 04d53bb..a716a72 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -95,11 +95,9 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml index 8d9c731..b3aff86 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml @@ -102,7 +102,7 @@ and bl.DEPTID in (${deptIds}) - ORDER BY bl.TS DESC + ORDER BY bl.MONITOR_STATE DESC,bl.TS DESC SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ - WITH device_temp AS (SELECT bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd + WITH device_temp AS (SELECT distinct(bd.id),bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd LEFT join bus_device_ledger lr on lr.DEVICE_ID=bd.ID LEFT join bus_ledger_all_view bv on lr.LEDGER_ID=bv.ID and lr.type = bv.type @@ -45,7 +45,7 @@ WITH device_temp AS ( SELECT - count( 1 ) AS deviceCount, + count(DISTINCT bd.id) AS deviceCount, bd.DEVICE_TYPE FROM bus_device bd @@ -74,19 +74,24 @@ WITH device_temp AS ( SELECT - count(1) AS deviceCount, + count(bd.id) AS deviceCount, SUM(CASE WHEN bd.ONLINE_STATE=0 THEN 1 ELSE 0 END) as offCount, bd.DEVICE_TYPE FROM - bus_device bd + (SELECT + DISTINCT(bd.id) as id, + bd.ONLINE_STATE, + bd.DEVICE_TYPE + FROM + bus_device bd LEFT JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.ID LEFT JOIN bus_ledger_all_view lt ON bl.LEDGER_ID = lt.ID and bl.type = lt.type - WHERE - bd.VALID > 0 - - and lt.DEPTID in (${deptStrs}) - - + WHERE + bd.VALID > 0 + + and lt.DEPTID in (${deptStrs}) + + ) bd GROUP BY bd.DEVICE_TYPE ) SELECT diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 04d53bb..a716a72 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -95,11 +95,9 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml index 8d9c731..b3aff86 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml @@ -102,7 +102,7 @@ and bl.DEPTID in (${deptIds}) - ORDER BY bl.TS DESC + ORDER BY bl.MONITOR_STATE DESC,bl.TS DESC SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ - WITH device_temp AS (SELECT bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd + WITH device_temp AS (SELECT distinct(bd.id),bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd LEFT join bus_device_ledger lr on lr.DEVICE_ID=bd.ID LEFT join bus_ledger_all_view bv on lr.LEDGER_ID=bv.ID and lr.type = bv.type @@ -45,7 +45,7 @@ WITH device_temp AS ( SELECT - count( 1 ) AS deviceCount, + count(DISTINCT bd.id) AS deviceCount, bd.DEVICE_TYPE FROM bus_device bd @@ -74,19 +74,24 @@ WITH device_temp AS ( SELECT - count(1) AS deviceCount, + count(bd.id) AS deviceCount, SUM(CASE WHEN bd.ONLINE_STATE=0 THEN 1 ELSE 0 END) as offCount, bd.DEVICE_TYPE FROM - bus_device bd + (SELECT + DISTINCT(bd.id) as id, + bd.ONLINE_STATE, + bd.DEVICE_TYPE + FROM + bus_device bd LEFT JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.ID LEFT JOIN bus_ledger_all_view lt ON bl.LEDGER_ID = lt.ID and bl.type = lt.type - WHERE - bd.VALID > 0 - - and lt.DEPTID in (${deptStrs}) - - + WHERE + bd.VALID > 0 + + and lt.DEPTID in (${deptStrs}) + + ) bd GROUP BY bd.DEVICE_TYPE ) SELECT diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 04d53bb..a716a72 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -95,11 +95,9 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml index 8d9c731..b3aff86 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml @@ -102,7 +102,7 @@ and bl.DEPTID in (${deptIds}) - ORDER BY bl.TS DESC + ORDER BY bl.MONITOR_STATE DESC,bl.TS DESC SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ - WITH device_temp AS (SELECT bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd + WITH device_temp AS (SELECT distinct(bd.id),bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd LEFT join bus_device_ledger lr on lr.DEVICE_ID=bd.ID LEFT join bus_ledger_all_view bv on lr.LEDGER_ID=bv.ID and lr.type = bv.type @@ -45,7 +45,7 @@ WITH device_temp AS ( SELECT - count( 1 ) AS deviceCount, + count(DISTINCT bd.id) AS deviceCount, bd.DEVICE_TYPE FROM bus_device bd @@ -74,19 +74,24 @@ WITH device_temp AS ( SELECT - count(1) AS deviceCount, + count(bd.id) AS deviceCount, SUM(CASE WHEN bd.ONLINE_STATE=0 THEN 1 ELSE 0 END) as offCount, bd.DEVICE_TYPE FROM - bus_device bd + (SELECT + DISTINCT(bd.id) as id, + bd.ONLINE_STATE, + bd.DEVICE_TYPE + FROM + bus_device bd LEFT JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.ID LEFT JOIN bus_ledger_all_view lt ON bl.LEDGER_ID = lt.ID and bl.type = lt.type - WHERE - bd.VALID > 0 - - and lt.DEPTID in (${deptStrs}) - - + WHERE + bd.VALID > 0 + + and lt.DEPTID in (${deptStrs}) + + ) bd GROUP BY bd.DEVICE_TYPE ) SELECT diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 04d53bb..a716a72 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -95,11 +95,9 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml index 8d9c731..b3aff86 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml @@ -102,7 +102,7 @@ and bl.DEPTID in (${deptIds}) - ORDER BY bl.TS DESC + ORDER BY bl.MONITOR_STATE DESC,bl.TS DESC SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ - WITH device_temp AS (SELECT bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd + WITH device_temp AS (SELECT distinct(bd.id),bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd LEFT join bus_device_ledger lr on lr.DEVICE_ID=bd.ID LEFT join bus_ledger_all_view bv on lr.LEDGER_ID=bv.ID and lr.type = bv.type @@ -45,7 +45,7 @@ WITH device_temp AS ( SELECT - count( 1 ) AS deviceCount, + count(DISTINCT bd.id) AS deviceCount, bd.DEVICE_TYPE FROM bus_device bd @@ -74,19 +74,24 @@ WITH device_temp AS ( SELECT - count(1) AS deviceCount, + count(bd.id) AS deviceCount, SUM(CASE WHEN bd.ONLINE_STATE=0 THEN 1 ELSE 0 END) as offCount, bd.DEVICE_TYPE FROM - bus_device bd + (SELECT + DISTINCT(bd.id) as id, + bd.ONLINE_STATE, + bd.DEVICE_TYPE + FROM + bus_device bd LEFT JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.ID LEFT JOIN bus_ledger_all_view lt ON bl.LEDGER_ID = lt.ID and bl.type = lt.type - WHERE - bd.VALID > 0 - - and lt.DEPTID in (${deptStrs}) - - + WHERE + bd.VALID > 0 + + and lt.DEPTID in (${deptStrs}) + + ) bd GROUP BY bd.DEVICE_TYPE ) SELECT diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 04d53bb..a716a72 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -95,11 +95,9 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml index 8d9c731..b3aff86 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml @@ -102,7 +102,7 @@ and bl.DEPTID in (${deptIds}) - ORDER BY bl.TS DESC + ORDER BY bl.MONITOR_STATE DESC,bl.TS DESC SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ - WITH device_temp AS (SELECT bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd + WITH device_temp AS (SELECT distinct(bd.id),bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd LEFT join bus_device_ledger lr on lr.DEVICE_ID=bd.ID LEFT join bus_ledger_all_view bv on lr.LEDGER_ID=bv.ID and lr.type = bv.type @@ -45,7 +45,7 @@ WITH device_temp AS ( SELECT - count( 1 ) AS deviceCount, + count(DISTINCT bd.id) AS deviceCount, bd.DEVICE_TYPE FROM bus_device bd @@ -74,19 +74,24 @@ WITH device_temp AS ( SELECT - count(1) AS deviceCount, + count(bd.id) AS deviceCount, SUM(CASE WHEN bd.ONLINE_STATE=0 THEN 1 ELSE 0 END) as offCount, bd.DEVICE_TYPE FROM - bus_device bd + (SELECT + DISTINCT(bd.id) as id, + bd.ONLINE_STATE, + bd.DEVICE_TYPE + FROM + bus_device bd LEFT JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.ID LEFT JOIN bus_ledger_all_view lt ON bl.LEDGER_ID = lt.ID and bl.type = lt.type - WHERE - bd.VALID > 0 - - and lt.DEPTID in (${deptStrs}) - - + WHERE + bd.VALID > 0 + + and lt.DEPTID in (${deptStrs}) + + ) bd GROUP BY bd.DEVICE_TYPE ) SELECT diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 04d53bb..a716a72 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -95,11 +95,9 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml index 8d9c731..b3aff86 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml @@ -102,7 +102,7 @@ and bl.DEPTID in (${deptIds}) - ORDER BY bl.TS DESC + ORDER BY bl.MONITOR_STATE DESC,bl.TS DESC SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ - WITH device_temp AS (SELECT bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd + WITH device_temp AS (SELECT distinct(bd.id),bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd LEFT join bus_device_ledger lr on lr.DEVICE_ID=bd.ID LEFT join bus_ledger_all_view bv on lr.LEDGER_ID=bv.ID and lr.type = bv.type @@ -45,7 +45,7 @@ WITH device_temp AS ( SELECT - count( 1 ) AS deviceCount, + count(DISTINCT bd.id) AS deviceCount, bd.DEVICE_TYPE FROM bus_device bd @@ -74,19 +74,24 @@ WITH device_temp AS ( SELECT - count(1) AS deviceCount, + count(bd.id) AS deviceCount, SUM(CASE WHEN bd.ONLINE_STATE=0 THEN 1 ELSE 0 END) as offCount, bd.DEVICE_TYPE FROM - bus_device bd + (SELECT + DISTINCT(bd.id) as id, + bd.ONLINE_STATE, + bd.DEVICE_TYPE + FROM + bus_device bd LEFT JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.ID LEFT JOIN bus_ledger_all_view lt ON bl.LEDGER_ID = lt.ID and bl.type = lt.type - WHERE - bd.VALID > 0 - - and lt.DEPTID in (${deptStrs}) - - + WHERE + bd.VALID > 0 + + and lt.DEPTID in (${deptStrs}) + + ) bd GROUP BY bd.DEVICE_TYPE ) SELECT diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 04d53bb..a716a72 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -95,11 +95,9 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml index 8d9c731..b3aff86 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml @@ -102,7 +102,7 @@ and bl.DEPTID in (${deptIds}) - ORDER BY bl.TS DESC + ORDER BY bl.MONITOR_STATE DESC,bl.TS DESC SELECT - rd.*, - bt.TYPE_NAME AS devTypeName, - rd.LEDGER_NUMBER as tagNumber, - lr.DEPTID as deptid, - lr.lngGaode as lngGaode, - lr.latGaode as latGaode, - ay.ALARM_TYPE, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.*, + bt.TYPE_NAME AS devTypeName, + rd.LEDGER_NUMBER as tagNumber, + lr.DEPTID as deptid, + lr.lngGaode as lngGaode, + lr.latGaode as latGaode, + ay.ALARM_TYPE, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 + LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL where rd.STATUS =1 and rd.EXCEPTION_TYPE=0 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and rd.ALARM_LEVEL =#{request.alarmLevel} - - - and ay.ALARM_CATEGORY =#{request.alarmCategory} - + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and rd.ALARM_LEVEL =#{request.alarmLevel} + + + and ay.ALARM_CATEGORY =#{request.alarmCategory} + ORDER BY rd.ALARM_TIME DESC @@ -152,8 +152,8 @@ LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type AND bl.VALID = 1 AND lr.VALID =1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID where rd.STATUS =1 and rd.EXCEPTION_TYPE=1 @@ -175,7 +175,7 @@ and rd.PROCESS_STATUS =#{request.processStatus} - and rd.POSITION like concat('%', #{request.position}, '%') + and rd.POSITION like concat('%', #{request.position}, '%') and lr.DEPTID in (${deptIdStr}) @@ -188,123 +188,124 @@ - SELECT - rd.DEVCODE, - ay.ALARM_TYPE, - rd.ALARM_CONTENT, - rd.ALARM_TIME, - bt.TYPE_NAME AS devTypeName, - CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, - TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, - lr.DEPTID, - rd.REAL_ALARM, - ay.ALARM_CATEGORY, - ac.ALARM_LEVEL as alarmLevelName + rd.DEVCODE, + ay.ALARM_TYPE, + rd.ALARM_CONTENT, + rd.ALARM_TIME, + bt.TYPE_NAME AS devTypeName, + CONCAT(rd.LEDGER_NUMBER,'|',lr.ledgerName,'|',rd.POSITION ) AS POSITION, rd.CANCEL_TIME, + TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration, + lr.DEPTID, + rd.REAL_ALARM, + ay.ALARM_CATEGORY, + ac.ALARM_LEVEL as alarmLevelName FROM - alarm_records rd - LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE - LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID - LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID - AND bl.VALID = 1 - LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID - AND lr.type = bl.type - AND bl.VALID = 1 - AND lr.VALID = 1 - LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID - left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID - LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL + alarm_records rd + LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID + LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID + AND bl.VALID = 1 + LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID + AND lr.type = bl.type + AND bl.VALID = 1 + AND lr.VALID = 1 + LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID + left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID + LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL WHERE - rd.STATUS = 0 - AND rd.EXCEPTION_TYPE = 1 - - and rd.DEVCODE like concat('%', #{request.devCode}, '%') - - - and bd.DEVICE_TYPE =#{request.devTypeId} - - - and rd.ALARM_TIME >= #{request.begTime} - - - and rd.ALARM_TIME #{request.endTime} - - - and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - - - and rd.PROCESS_STATUS =#{request.processStatus} - - - and rd.POSITION like concat('%', #{request.position}, '%') - - - and lr.DEPTID in (${deptIdStr}) - - - and bp.MANUFACTURER_ID =#{request.manufacturerId} - - ORDER BY rd.ALARM_TIME DESC + rd.STATUS = 0 + AND rd.EXCEPTION_TYPE = 1 + + and rd.DEVCODE like concat('%', #{request.devCode}, '%') + + + and bd.DEVICE_TYPE =#{request.devTypeId} + + + and rd.ALARM_TIME >= #{request.begTime} + + + and rd.ALARM_TIME #{request.endTime} + + + and rd.ALARM_TYPE_ID =#{request.alarmTypeId} + + + and rd.PROCESS_STATUS =#{request.processStatus} + + + and rd.POSITION like concat('%', #{request.position}, '%') + + + and lr.DEPTID in (${deptIdStr}) + + + and bp.MANUFACTURER_ID =#{request.manufacturerId} + + ORDER BY rd.ALARM_TIME DESC @@ -492,62 +490,63 @@ SELECT - ar.DEVCODE, - ar.LONGITUDE_LATITUDE, - ar.ALARM_TIME + ar.DEVCODE, + ar.LONGITUDE_LATITUDE, + ar.ALARM_TIME FROM - `alarm_records` ar + `alarm_records` ar WHERE - ar.LONGITUDE_LATITUDE > 0 - AND ar.DEVCODE = #{request.devCode} - - and ar.ALARM_TIME >= #{request.begTime} - - - and ar.ALARM_TIME #{request.endTime} - + ar.LONGITUDE_LATITUDE > 0 + AND ar.DEVCODE = #{request.devCode} + + and ar.ALARM_TIME >= #{request.begTime} + + + and ar.ALARM_TIME #{request.endTime} + ORDER BY ar.ALARM_TIME ASC @@ -609,47 +608,56 @@ - - update bus_device set - CELL = #{cell}, - ONLINE_STATE = #{onLineStatus}, - MONITOR_VALUE = #{value}, - LOGTIME = now() - where DEVCODE = #{devCode} and valid >0 + update bus_device + set CELL = #{cell}, + ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, + LOGTIME = now() + where DEVCODE = #{devCode} + and valid > 0 + + + + update bus_ledger + set MONITOR_STATE = #{onLineStatus} + where TAG_NUMBER = #{tagNumber} + and valid > 0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 5b0032f..f00a1fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -228,22 +228,21 @@ and av.DEPTID in (${deptStrs}) GROUP BY - av.alarmTypeId, - av.watchObject, - av.DEPTID), - alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), - alarm_type_tmp as( SELECT - ay.id, - IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), - IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, - ay.alarm_type, - bt.WATCH_OBJECT + av.alarmTypeId, + av.watchObject, + av.DEPTID), + alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT), + alarm_type_tmp as( SELECT + ay.id, + IF(bt.WATCH_OBJECT = 1,CONCAT( '闸井', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ), + IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name, + ay.alarm_type, + bt.WATCH_OBJECT FROM - alarm_type ay + alarm_type ay LEFT JOIN alarm_group bt ON ay.id = bt.alarm_type_id WHERE - ay.ALARM_CATEGORY IN (2,3)) - + ay.ALARM_CATEGORY IN (2,3)) SELECT ap.DEPTID,ap.alarmSum,ap.alarmType,att.alarm_name from alarm_type_tmp att LEFT JOIN alarm_temp ap on ap.alarmType=att.id and ap.watchObject=att.WATCH_OBJECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml index 2a5f8b4..fc36edc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml @@ -39,7 +39,7 @@ - WITH device_temp AS (SELECT bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd + WITH device_temp AS (SELECT distinct(bd.id),bd.VALID,bd.ONLINE_STATE FROM `bus_device` bd LEFT join bus_device_ledger lr on lr.DEVICE_ID=bd.ID LEFT join bus_ledger_all_view bv on lr.LEDGER_ID=bv.ID and lr.type = bv.type @@ -45,7 +45,7 @@ WITH device_temp AS ( SELECT - count( 1 ) AS deviceCount, + count(DISTINCT bd.id) AS deviceCount, bd.DEVICE_TYPE FROM bus_device bd @@ -74,19 +74,24 @@ WITH device_temp AS ( SELECT - count(1) AS deviceCount, + count(bd.id) AS deviceCount, SUM(CASE WHEN bd.ONLINE_STATE=0 THEN 1 ELSE 0 END) as offCount, bd.DEVICE_TYPE FROM - bus_device bd + (SELECT + DISTINCT(bd.id) as id, + bd.ONLINE_STATE, + bd.DEVICE_TYPE + FROM + bus_device bd LEFT JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.ID LEFT JOIN bus_ledger_all_view lt ON bl.LEDGER_ID = lt.ID and bl.type = lt.type - WHERE - bd.VALID > 0 - - and lt.DEPTID in (${deptStrs}) - - + WHERE + bd.VALID > 0 + + and lt.DEPTID in (${deptStrs}) + + ) bd GROUP BY bd.DEVICE_TYPE ) SELECT diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 04d53bb..a716a72 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -95,11 +95,9 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml index 8d9c731..b3aff86 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml @@ -102,7 +102,7 @@ and bl.DEPTID in (${deptIds}) - ORDER BY bl.TS DESC + ORDER BY bl.MONITOR_STATE DESC,bl.TS DESC