diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 2aa5880..b8242c4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') + TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') + TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 2aa5880..b8242c4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') + TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') + TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index e99c9b6..322945c 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') + TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') + TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 6022570..d073cef 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -264,7 +264,7 @@ GROUP BY ar.WELL_CODE - ORDER BY alarmCount DESC + ORDER BY "alarmCount" DESC