diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index d735cd9..7c0a003 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -98,7 +98,7 @@ - ID AS id, JOBCODE AS "jobcode", JOG_TYPE AS "jogType", + ID AS "id", JOBCODE AS "jobcode", JOG_TYPE AS "jogType", WELL_CODE AS "wellCode", DEVCODE AS "devcode", @@ -118,7 +118,7 @@ AS "handleJobTime", HANDLE_MESSAGE AS "handleMessage", - HANDLE_PHOTOS AS "handlePhotos", FLOW AS flow + HANDLE_PHOTOS AS "handlePhotos", FLOW AS "flow" @@ -139,7 +139,7 @@ - AS over + AS "over" FROM ( SELECT @@ -187,7 +187,7 @@ - AS over + AS "over" FROM ( SELECT @@ -414,43 +414,43 @@ - ar.id AS alarmId, - aj.DEVCODE AS devcode, - aj.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContentName, - ar.STATUS AS alarmStatus, - aj.ID AS id, - aj.ID AS jobId, - aj.JOG_TYPE AS jobType, - aj.JOBCODE AS jobCode, - aj.JOB_STATUS AS jobStatus, - aj.JOB_BELONG_TO AS jobBelongTo, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.id AS "alarmId", + aj.DEVCODE AS "devcode", + aj.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContentName", + ar.STATUS AS "alarmStatus", + aj.ID AS "id", + aj.ID AS "jobId", + aj.JOG_TYPE AS "jobType", + aj.JOBCODE AS "jobCode", + aj.JOB_STATUS AS "jobStatus", + aj.JOB_BELONG_TO AS "jobBelongTo", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", - AS createTime, + AS "createTime", - AS alarmTime, + AS "alarmTime", aj.GET_JOB_PERSON AS getJobPerson, - AS shouldGetTime, + AS "shouldGetTime", - AS getJobTime, + AS "getJobTime", aj.CONFIRM_JOB_PERSON AS confirmJobPerson, - AS confirmJobTime, + AS "confirmJobTime", aj.HANDLE_JOB_Person AS handleJobPerson, @@ -459,20 +459,20 @@ - AS handleJobTime, - aj.JOB_FLAG_1 AS jobFlag, - bwi.RESPONSIBLE_DEPT AS deptid + AS "handleJobTime", + aj.JOB_FLAG_1 AS "jobFlag", + bwi.RESPONSIBLE_DEPT AS "deptid" ar.id AS "alarmId", - aj.DEVCODE AS devcode, + aj.DEVCODE AS "devcode", aj.WELL_CODE AS "wellCode", ar.ALARM_TYPE AS "alarmType", ar.ALARM_CONTENT AS "alarmContentName", ar.STATUS AS "alarmStatus", - aj.ID AS id, + aj.ID AS "id", aj.ID AS "jobId", aj.JOG_TYPE AS "jobType", aj.JOBCODE AS "jobCode", @@ -513,7 +513,7 @@ AS "handleJobTime", aj.JOB_FLAG_1 AS "jobFlag", - bwi.RESPONSIBLE_DEPT AS deptid + bwi.RESPONSIBLE_DEPT AS "deptid" @@ -564,7 +564,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -748,7 +748,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -881,7 +881,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -670,7 +670,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -794,7 +794,7 @@ SELECT - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable, + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable", FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY @@ -999,7 +999,7 @@ ar.ALARM_TYPE AS "alarmType", ar.ALARM_CONTENT AS "alarmContentName", ar.STATUS AS "alarmStatus", - aj.ID AS id, + aj.ID AS "id", ar.JOB_ID AS "jobId", aj.JOG_TYPE AS "jobType", aj.JOBCODE AS "jobCode", @@ -1044,8 +1044,8 @@ aj.HANDLE_MESSAGE AS "handleMessage", aj.HANDLE_PHOTOS AS "handlePhotos", aj.JOB_FLAG_1 AS "jobFlag", - coalesce(aj.FLOW,'') AS flow, - bwi.RESPONSIBLE_DEPT AS deptid + coalesce(aj.FLOW,'') AS "flow", + bwi.RESPONSIBLE_DEPT AS "deptid" FROM ( SELECT * FROM alarm_job diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index d9bb2f4..50d98f9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -25,11 +25,11 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -670,7 +670,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -794,7 +794,7 @@ SELECT - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable, + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable", FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY @@ -999,7 +999,7 @@ ar.ALARM_TYPE AS "alarmType", ar.ALARM_CONTENT AS "alarmContentName", ar.STATUS AS "alarmStatus", - aj.ID AS id, + aj.ID AS "id", ar.JOB_ID AS "jobId", aj.JOG_TYPE AS "jobType", aj.JOBCODE AS "jobCode", @@ -1044,8 +1044,8 @@ aj.HANDLE_MESSAGE AS "handleMessage", aj.HANDLE_PHOTOS AS "handlePhotos", aj.JOB_FLAG_1 AS "jobFlag", - coalesce(aj.FLOW,'') AS flow, - bwi.RESPONSIBLE_DEPT AS deptid + coalesce(aj.FLOW,'') AS "flow", + bwi.RESPONSIBLE_DEPT AS "deptid" FROM ( SELECT * FROM alarm_job diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index d9bb2f4..50d98f9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -25,11 +25,11 @@ SELECT - b.alarmTimeDate AS 'date' , - count( b.wellId ) AS alarmWells , - sum( alarmTimes ) AS alarmTimes + b.alarmTimeDate AS "date" , + count( b.wellId ) AS "alarmWells", + sum( alarmTimes ) AS "alarmTimes" FROM ( SELECT alarmTimeDate, wellId, count( 1 ) AS alarmTimes diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index d735cd9..7c0a003 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -98,7 +98,7 @@ - ID AS id, JOBCODE AS "jobcode", JOG_TYPE AS "jogType", + ID AS "id", JOBCODE AS "jobcode", JOG_TYPE AS "jogType", WELL_CODE AS "wellCode", DEVCODE AS "devcode", @@ -118,7 +118,7 @@ AS "handleJobTime", HANDLE_MESSAGE AS "handleMessage", - HANDLE_PHOTOS AS "handlePhotos", FLOW AS flow + HANDLE_PHOTOS AS "handlePhotos", FLOW AS "flow" @@ -139,7 +139,7 @@ - AS over + AS "over" FROM ( SELECT @@ -187,7 +187,7 @@ - AS over + AS "over" FROM ( SELECT @@ -414,43 +414,43 @@ - ar.id AS alarmId, - aj.DEVCODE AS devcode, - aj.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContentName, - ar.STATUS AS alarmStatus, - aj.ID AS id, - aj.ID AS jobId, - aj.JOG_TYPE AS jobType, - aj.JOBCODE AS jobCode, - aj.JOB_STATUS AS jobStatus, - aj.JOB_BELONG_TO AS jobBelongTo, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.id AS "alarmId", + aj.DEVCODE AS "devcode", + aj.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContentName", + ar.STATUS AS "alarmStatus", + aj.ID AS "id", + aj.ID AS "jobId", + aj.JOG_TYPE AS "jobType", + aj.JOBCODE AS "jobCode", + aj.JOB_STATUS AS "jobStatus", + aj.JOB_BELONG_TO AS "jobBelongTo", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", - AS createTime, + AS "createTime", - AS alarmTime, + AS "alarmTime", aj.GET_JOB_PERSON AS getJobPerson, - AS shouldGetTime, + AS "shouldGetTime", - AS getJobTime, + AS "getJobTime", aj.CONFIRM_JOB_PERSON AS confirmJobPerson, - AS confirmJobTime, + AS "confirmJobTime", aj.HANDLE_JOB_Person AS handleJobPerson, @@ -459,20 +459,20 @@ - AS handleJobTime, - aj.JOB_FLAG_1 AS jobFlag, - bwi.RESPONSIBLE_DEPT AS deptid + AS "handleJobTime", + aj.JOB_FLAG_1 AS "jobFlag", + bwi.RESPONSIBLE_DEPT AS "deptid" ar.id AS "alarmId", - aj.DEVCODE AS devcode, + aj.DEVCODE AS "devcode", aj.WELL_CODE AS "wellCode", ar.ALARM_TYPE AS "alarmType", ar.ALARM_CONTENT AS "alarmContentName", ar.STATUS AS "alarmStatus", - aj.ID AS id, + aj.ID AS "id", aj.ID AS "jobId", aj.JOG_TYPE AS "jobType", aj.JOBCODE AS "jobCode", @@ -513,7 +513,7 @@ AS "handleJobTime", aj.JOB_FLAG_1 AS "jobFlag", - bwi.RESPONSIBLE_DEPT AS deptid + bwi.RESPONSIBLE_DEPT AS "deptid" @@ -564,7 +564,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -748,7 +748,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -881,7 +881,7 @@ SELECT - level, - name, + level AS "level", + name "name", OPEN_ALARM AS "openAlarm", OPEN_JOB AS "openJob", - TS AS ts + TS AS "ts" FROM alarm_level WHERE TENANT_ID = #{tenantId} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 4edee65..da99850 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -64,9 +64,9 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -670,7 +670,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -794,7 +794,7 @@ SELECT - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable, + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable", FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY @@ -999,7 +999,7 @@ ar.ALARM_TYPE AS "alarmType", ar.ALARM_CONTENT AS "alarmContentName", ar.STATUS AS "alarmStatus", - aj.ID AS id, + aj.ID AS "id", ar.JOB_ID AS "jobId", aj.JOG_TYPE AS "jobType", aj.JOBCODE AS "jobCode", @@ -1044,8 +1044,8 @@ aj.HANDLE_MESSAGE AS "handleMessage", aj.HANDLE_PHOTOS AS "handlePhotos", aj.JOB_FLAG_1 AS "jobFlag", - coalesce(aj.FLOW,'') AS flow, - bwi.RESPONSIBLE_DEPT AS deptid + coalesce(aj.FLOW,'') AS "flow", + bwi.RESPONSIBLE_DEPT AS "deptid" FROM ( SELECT * FROM alarm_job diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index d9bb2f4..50d98f9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -25,11 +25,11 @@ SELECT - b.alarmTimeDate AS 'date' , - count( b.wellId ) AS alarmWells , - sum( alarmTimes ) AS alarmTimes + b.alarmTimeDate AS "date" , + count( b.wellId ) AS "alarmWells", + sum( alarmTimes ) AS "alarmTimes" FROM ( SELECT alarmTimeDate, wellId, count( 1 ) AS alarmTimes 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 768fa5f..bce2a38 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 @@ -50,7 +50,7 @@ bd.DEVICE_TYPE as "deviceType",bwi.ID AS "wellId",bwi.WELL_NAME as "wellName", COALESCE (ar.OPERATOR,'') AS "user", bwi.WELL_CODE as "wellCode",bwi.DEEP as "deep",bwi.DEPTID as "deptid", - COALESCE (,'') AS ts + COALESCE (,'') AS "ts" FROM alarm_rule ar LEFT JOIN bus_device bd ON ar.DEVCODE = bd.DEVCODE LEFT JOIN bus_device_well bdw ON bd.ID = bdw.DEVICE_ID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml index eb007e8..39f8cf0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml @@ -3,13 +3,13 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index d735cd9..7c0a003 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -98,7 +98,7 @@ - ID AS id, JOBCODE AS "jobcode", JOG_TYPE AS "jogType", + ID AS "id", JOBCODE AS "jobcode", JOG_TYPE AS "jogType", WELL_CODE AS "wellCode", DEVCODE AS "devcode", @@ -118,7 +118,7 @@ AS "handleJobTime", HANDLE_MESSAGE AS "handleMessage", - HANDLE_PHOTOS AS "handlePhotos", FLOW AS flow + HANDLE_PHOTOS AS "handlePhotos", FLOW AS "flow" @@ -139,7 +139,7 @@ - AS over + AS "over" FROM ( SELECT @@ -187,7 +187,7 @@ - AS over + AS "over" FROM ( SELECT @@ -414,43 +414,43 @@ - ar.id AS alarmId, - aj.DEVCODE AS devcode, - aj.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContentName, - ar.STATUS AS alarmStatus, - aj.ID AS id, - aj.ID AS jobId, - aj.JOG_TYPE AS jobType, - aj.JOBCODE AS jobCode, - aj.JOB_STATUS AS jobStatus, - aj.JOB_BELONG_TO AS jobBelongTo, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.id AS "alarmId", + aj.DEVCODE AS "devcode", + aj.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContentName", + ar.STATUS AS "alarmStatus", + aj.ID AS "id", + aj.ID AS "jobId", + aj.JOG_TYPE AS "jobType", + aj.JOBCODE AS "jobCode", + aj.JOB_STATUS AS "jobStatus", + aj.JOB_BELONG_TO AS "jobBelongTo", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", - AS createTime, + AS "createTime", - AS alarmTime, + AS "alarmTime", aj.GET_JOB_PERSON AS getJobPerson, - AS shouldGetTime, + AS "shouldGetTime", - AS getJobTime, + AS "getJobTime", aj.CONFIRM_JOB_PERSON AS confirmJobPerson, - AS confirmJobTime, + AS "confirmJobTime", aj.HANDLE_JOB_Person AS handleJobPerson, @@ -459,20 +459,20 @@ - AS handleJobTime, - aj.JOB_FLAG_1 AS jobFlag, - bwi.RESPONSIBLE_DEPT AS deptid + AS "handleJobTime", + aj.JOB_FLAG_1 AS "jobFlag", + bwi.RESPONSIBLE_DEPT AS "deptid" ar.id AS "alarmId", - aj.DEVCODE AS devcode, + aj.DEVCODE AS "devcode", aj.WELL_CODE AS "wellCode", ar.ALARM_TYPE AS "alarmType", ar.ALARM_CONTENT AS "alarmContentName", ar.STATUS AS "alarmStatus", - aj.ID AS id, + aj.ID AS "id", aj.ID AS "jobId", aj.JOG_TYPE AS "jobType", aj.JOBCODE AS "jobCode", @@ -513,7 +513,7 @@ AS "handleJobTime", aj.JOB_FLAG_1 AS "jobFlag", - bwi.RESPONSIBLE_DEPT AS deptid + bwi.RESPONSIBLE_DEPT AS "deptid" @@ -564,7 +564,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -748,7 +748,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -881,7 +881,7 @@ SELECT - level, - name, + level AS "level", + name "name", OPEN_ALARM AS "openAlarm", OPEN_JOB AS "openJob", - TS AS ts + TS AS "ts" FROM alarm_level WHERE TENANT_ID = #{tenantId} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 4edee65..da99850 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -64,9 +64,9 @@ - SELECT id,pid + SELECT id AS "id",pid AS "pid" FROM sys_dept diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml index d92b4a4..27e517e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml @@ -26,7 +26,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -670,7 +670,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -794,7 +794,7 @@ SELECT - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable, + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable", FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY @@ -999,7 +999,7 @@ ar.ALARM_TYPE AS "alarmType", ar.ALARM_CONTENT AS "alarmContentName", ar.STATUS AS "alarmStatus", - aj.ID AS id, + aj.ID AS "id", ar.JOB_ID AS "jobId", aj.JOG_TYPE AS "jobType", aj.JOBCODE AS "jobCode", @@ -1044,8 +1044,8 @@ aj.HANDLE_MESSAGE AS "handleMessage", aj.HANDLE_PHOTOS AS "handlePhotos", aj.JOB_FLAG_1 AS "jobFlag", - coalesce(aj.FLOW,'') AS flow, - bwi.RESPONSIBLE_DEPT AS deptid + coalesce(aj.FLOW,'') AS "flow", + bwi.RESPONSIBLE_DEPT AS "deptid" FROM ( SELECT * FROM alarm_job diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index d9bb2f4..50d98f9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -25,11 +25,11 @@ SELECT - b.alarmTimeDate AS 'date' , - count( b.wellId ) AS alarmWells , - sum( alarmTimes ) AS alarmTimes + b.alarmTimeDate AS "date" , + count( b.wellId ) AS "alarmWells", + sum( alarmTimes ) AS "alarmTimes" FROM ( SELECT alarmTimeDate, wellId, count( 1 ) AS alarmTimes 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 768fa5f..bce2a38 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 @@ -50,7 +50,7 @@ bd.DEVICE_TYPE as "deviceType",bwi.ID AS "wellId",bwi.WELL_NAME as "wellName", COALESCE (ar.OPERATOR,'') AS "user", bwi.WELL_CODE as "wellCode",bwi.DEEP as "deep",bwi.DEPTID as "deptid", - COALESCE (,'') AS ts + COALESCE (,'') AS "ts" FROM alarm_rule ar LEFT JOIN bus_device bd ON ar.DEVCODE = bd.DEVCODE LEFT JOIN bus_device_well bdw ON bd.ID = bdw.DEVICE_ID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml index eb007e8..39f8cf0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml @@ -3,13 +3,13 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml index d92b4a4..27e517e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml @@ -26,7 +26,7 @@ SELECT A.wellCount AS "wellCount", - A.deptid, + A.deptid AS "deptid", SD.simple_name as "deptName", - SD.pid + SD.pid AS "pid" FROM ( SELECT COUNT( 1 ) AS wellCount, DEPTID AS deptid FROM bus_well_info WHERE VALID = '1' GROUP BY DEPTID ) A LEFT JOIN sys_dept SD ON A.DEPTID = SD.id @@ -30,12 +30,12 @@ SELECT COALESCE(SUM(CASE WHEN BD.ONLINE_STATE ]]> '0' THEN 1 ELSE 0 END)) - AS online, + AS "online", COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END)) - AS offline, - count(1) AS total + AS "offline", + count(1) AS "total" FROM bus_device BD LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID @@ -154,10 +154,10 @@ SELECT - bwi.DEPTID AS deptid, + bwi.DEPTID AS "deptid", @@ -191,7 +191,7 @@ - AS cancel + AS "cancel" FROM alarm_job aj INNER JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON aj.DEVCODE = bd.DEVCODE @@ -231,7 +231,7 @@ - AS cancel + AS "cancel" FROM alarm_job aj INNER JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON aj.DEVCODE = bd.DEVCODE @@ -259,8 +259,9 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -670,7 +670,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -794,7 +794,7 @@ SELECT - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable, + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable", FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY @@ -999,7 +999,7 @@ ar.ALARM_TYPE AS "alarmType", ar.ALARM_CONTENT AS "alarmContentName", ar.STATUS AS "alarmStatus", - aj.ID AS id, + aj.ID AS "id", ar.JOB_ID AS "jobId", aj.JOG_TYPE AS "jobType", aj.JOBCODE AS "jobCode", @@ -1044,8 +1044,8 @@ aj.HANDLE_MESSAGE AS "handleMessage", aj.HANDLE_PHOTOS AS "handlePhotos", aj.JOB_FLAG_1 AS "jobFlag", - coalesce(aj.FLOW,'') AS flow, - bwi.RESPONSIBLE_DEPT AS deptid + coalesce(aj.FLOW,'') AS "flow", + bwi.RESPONSIBLE_DEPT AS "deptid" FROM ( SELECT * FROM alarm_job diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index d9bb2f4..50d98f9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -25,11 +25,11 @@ SELECT - b.alarmTimeDate AS 'date' , - count( b.wellId ) AS alarmWells , - sum( alarmTimes ) AS alarmTimes + b.alarmTimeDate AS "date" , + count( b.wellId ) AS "alarmWells", + sum( alarmTimes ) AS "alarmTimes" FROM ( SELECT alarmTimeDate, wellId, count( 1 ) AS alarmTimes 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 768fa5f..bce2a38 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 @@ -50,7 +50,7 @@ bd.DEVICE_TYPE as "deviceType",bwi.ID AS "wellId",bwi.WELL_NAME as "wellName", COALESCE (ar.OPERATOR,'') AS "user", bwi.WELL_CODE as "wellCode",bwi.DEEP as "deep",bwi.DEPTID as "deptid", - COALESCE (,'') AS ts + COALESCE (,'') AS "ts" FROM alarm_rule ar LEFT JOIN bus_device bd ON ar.DEVCODE = bd.DEVCODE LEFT JOIN bus_device_well bdw ON bd.ID = bdw.DEVICE_ID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml index eb007e8..39f8cf0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml @@ -3,13 +3,13 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml index d92b4a4..27e517e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml @@ -26,7 +26,7 @@ SELECT A.wellCount AS "wellCount", - A.deptid, + A.deptid AS "deptid", SD.simple_name as "deptName", - SD.pid + SD.pid AS "pid" FROM ( SELECT COUNT( 1 ) AS wellCount, DEPTID AS deptid FROM bus_well_info WHERE VALID = '1' GROUP BY DEPTID ) A LEFT JOIN sys_dept SD ON A.DEPTID = SD.id @@ -30,12 +30,12 @@ SELECT COALESCE(SUM(CASE WHEN BD.ONLINE_STATE ]]> '0' THEN 1 ELSE 0 END)) - AS online, + AS "online", COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END)) - AS offline, - count(1) AS total + AS "offline", + count(1) AS "total" FROM bus_device BD LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID @@ -154,10 +154,10 @@ SELECT - bwi.DEPTID AS deptid, + bwi.DEPTID AS "deptid", @@ -191,7 +191,7 @@ - AS cancel + AS "cancel" FROM alarm_job aj INNER JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON aj.DEVCODE = bd.DEVCODE @@ -231,7 +231,7 @@ - AS cancel + AS "cancel" FROM alarm_job aj INNER JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON aj.DEVCODE = bd.DEVCODE @@ -259,8 +259,9 @@ - SELECT * FROM sys_dict + SELECT + FROM sys_dict WHERE pid IN (SELECT id FROM sys_dict WHERE pid=0 AND name = #{typeName} ) ; @@ -65,7 +66,7 @@ @@ -142,12 +146,14 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index d735cd9..7c0a003 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -98,7 +98,7 @@ - ID AS id, JOBCODE AS "jobcode", JOG_TYPE AS "jogType", + ID AS "id", JOBCODE AS "jobcode", JOG_TYPE AS "jogType", WELL_CODE AS "wellCode", DEVCODE AS "devcode", @@ -118,7 +118,7 @@ AS "handleJobTime", HANDLE_MESSAGE AS "handleMessage", - HANDLE_PHOTOS AS "handlePhotos", FLOW AS flow + HANDLE_PHOTOS AS "handlePhotos", FLOW AS "flow" @@ -139,7 +139,7 @@ - AS over + AS "over" FROM ( SELECT @@ -187,7 +187,7 @@ - AS over + AS "over" FROM ( SELECT @@ -414,43 +414,43 @@ - ar.id AS alarmId, - aj.DEVCODE AS devcode, - aj.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContentName, - ar.STATUS AS alarmStatus, - aj.ID AS id, - aj.ID AS jobId, - aj.JOG_TYPE AS jobType, - aj.JOBCODE AS jobCode, - aj.JOB_STATUS AS jobStatus, - aj.JOB_BELONG_TO AS jobBelongTo, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.id AS "alarmId", + aj.DEVCODE AS "devcode", + aj.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContentName", + ar.STATUS AS "alarmStatus", + aj.ID AS "id", + aj.ID AS "jobId", + aj.JOG_TYPE AS "jobType", + aj.JOBCODE AS "jobCode", + aj.JOB_STATUS AS "jobStatus", + aj.JOB_BELONG_TO AS "jobBelongTo", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", - AS createTime, + AS "createTime", - AS alarmTime, + AS "alarmTime", aj.GET_JOB_PERSON AS getJobPerson, - AS shouldGetTime, + AS "shouldGetTime", - AS getJobTime, + AS "getJobTime", aj.CONFIRM_JOB_PERSON AS confirmJobPerson, - AS confirmJobTime, + AS "confirmJobTime", aj.HANDLE_JOB_Person AS handleJobPerson, @@ -459,20 +459,20 @@ - AS handleJobTime, - aj.JOB_FLAG_1 AS jobFlag, - bwi.RESPONSIBLE_DEPT AS deptid + AS "handleJobTime", + aj.JOB_FLAG_1 AS "jobFlag", + bwi.RESPONSIBLE_DEPT AS "deptid" ar.id AS "alarmId", - aj.DEVCODE AS devcode, + aj.DEVCODE AS "devcode", aj.WELL_CODE AS "wellCode", ar.ALARM_TYPE AS "alarmType", ar.ALARM_CONTENT AS "alarmContentName", ar.STATUS AS "alarmStatus", - aj.ID AS id, + aj.ID AS "id", aj.ID AS "jobId", aj.JOG_TYPE AS "jobType", aj.JOBCODE AS "jobCode", @@ -513,7 +513,7 @@ AS "handleJobTime", aj.JOB_FLAG_1 AS "jobFlag", - bwi.RESPONSIBLE_DEPT AS deptid + bwi.RESPONSIBLE_DEPT AS "deptid" @@ -564,7 +564,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -748,7 +748,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -881,7 +881,7 @@ SELECT - level, - name, + level AS "level", + name "name", OPEN_ALARM AS "openAlarm", OPEN_JOB AS "openJob", - TS AS ts + TS AS "ts" FROM alarm_level WHERE TENANT_ID = #{tenantId} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 4edee65..da99850 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -64,9 +64,9 @@ - SELECT id,pid + SELECT id AS "id",pid AS "pid" FROM sys_dept diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml index d92b4a4..27e517e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml @@ -26,7 +26,7 @@ SELECT A.wellCount AS "wellCount", - A.deptid, + A.deptid AS "deptid", SD.simple_name as "deptName", - SD.pid + SD.pid AS "pid" FROM ( SELECT COUNT( 1 ) AS wellCount, DEPTID AS deptid FROM bus_well_info WHERE VALID = '1' GROUP BY DEPTID ) A LEFT JOIN sys_dept SD ON A.DEPTID = SD.id @@ -30,12 +30,12 @@ SELECT COALESCE(SUM(CASE WHEN BD.ONLINE_STATE ]]> '0' THEN 1 ELSE 0 END)) - AS online, + AS "online", COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END)) - AS offline, - count(1) AS total + AS "offline", + count(1) AS "total" FROM bus_device BD LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID @@ -154,10 +154,10 @@ SELECT - bwi.DEPTID AS deptid, + bwi.DEPTID AS "deptid", @@ -191,7 +191,7 @@ - AS cancel + AS "cancel" FROM alarm_job aj INNER JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON aj.DEVCODE = bd.DEVCODE @@ -231,7 +231,7 @@ - AS cancel + AS "cancel" FROM alarm_job aj INNER JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON aj.DEVCODE = bd.DEVCODE @@ -259,8 +259,9 @@ - SELECT * FROM sys_dict + SELECT + FROM sys_dict WHERE pid IN (SELECT id FROM sys_dict WHERE pid=0 AND name = #{typeName} ) ; @@ -65,7 +66,7 @@ @@ -142,12 +146,14 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 9e5b366..5d6ff85 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -20,10 +20,10 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -670,7 +670,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -794,7 +794,7 @@ SELECT - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable, + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable", FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY @@ -999,7 +999,7 @@ ar.ALARM_TYPE AS "alarmType", ar.ALARM_CONTENT AS "alarmContentName", ar.STATUS AS "alarmStatus", - aj.ID AS id, + aj.ID AS "id", ar.JOB_ID AS "jobId", aj.JOG_TYPE AS "jobType", aj.JOBCODE AS "jobCode", @@ -1044,8 +1044,8 @@ aj.HANDLE_MESSAGE AS "handleMessage", aj.HANDLE_PHOTOS AS "handlePhotos", aj.JOB_FLAG_1 AS "jobFlag", - coalesce(aj.FLOW,'') AS flow, - bwi.RESPONSIBLE_DEPT AS deptid + coalesce(aj.FLOW,'') AS "flow", + bwi.RESPONSIBLE_DEPT AS "deptid" FROM ( SELECT * FROM alarm_job diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index d9bb2f4..50d98f9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -25,11 +25,11 @@ SELECT - b.alarmTimeDate AS 'date' , - count( b.wellId ) AS alarmWells , - sum( alarmTimes ) AS alarmTimes + b.alarmTimeDate AS "date" , + count( b.wellId ) AS "alarmWells", + sum( alarmTimes ) AS "alarmTimes" FROM ( SELECT alarmTimeDate, wellId, count( 1 ) AS alarmTimes 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 768fa5f..bce2a38 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 @@ -50,7 +50,7 @@ bd.DEVICE_TYPE as "deviceType",bwi.ID AS "wellId",bwi.WELL_NAME as "wellName", COALESCE (ar.OPERATOR,'') AS "user", bwi.WELL_CODE as "wellCode",bwi.DEEP as "deep",bwi.DEPTID as "deptid", - COALESCE (,'') AS ts + COALESCE (,'') AS "ts" FROM alarm_rule ar LEFT JOIN bus_device bd ON ar.DEVCODE = bd.DEVCODE LEFT JOIN bus_device_well bdw ON bd.ID = bdw.DEVICE_ID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml index eb007e8..39f8cf0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml @@ -3,13 +3,13 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml index d92b4a4..27e517e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml @@ -26,7 +26,7 @@ SELECT A.wellCount AS "wellCount", - A.deptid, + A.deptid AS "deptid", SD.simple_name as "deptName", - SD.pid + SD.pid AS "pid" FROM ( SELECT COUNT( 1 ) AS wellCount, DEPTID AS deptid FROM bus_well_info WHERE VALID = '1' GROUP BY DEPTID ) A LEFT JOIN sys_dept SD ON A.DEPTID = SD.id @@ -30,12 +30,12 @@ SELECT COALESCE(SUM(CASE WHEN BD.ONLINE_STATE ]]> '0' THEN 1 ELSE 0 END)) - AS online, + AS "online", COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END)) - AS offline, - count(1) AS total + AS "offline", + count(1) AS "total" FROM bus_device BD LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID @@ -154,10 +154,10 @@ SELECT - bwi.DEPTID AS deptid, + bwi.DEPTID AS "deptid", @@ -191,7 +191,7 @@ - AS cancel + AS "cancel" FROM alarm_job aj INNER JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON aj.DEVCODE = bd.DEVCODE @@ -231,7 +231,7 @@ - AS cancel + AS "cancel" FROM alarm_job aj INNER JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON aj.DEVCODE = bd.DEVCODE @@ -259,8 +259,9 @@ - SELECT * FROM sys_dict + SELECT + FROM sys_dict WHERE pid IN (SELECT id FROM sys_dict WHERE pid=0 AND name = #{typeName} ) ; @@ -65,7 +66,7 @@ @@ -142,12 +146,14 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 9e5b366..5d6ff85 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -20,10 +20,10 @@ SELECT - bd.devcode AS devcode, + bd.devcode AS "devcode", bdt.TYPE_NAME AS "deviceTypeName", bd.device_type AS deviceType, bwi.well_code AS "wellCode", @@ -312,7 +312,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -670,7 +670,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -794,7 +794,7 @@ SELECT - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable, + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable", FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY @@ -999,7 +999,7 @@ ar.ALARM_TYPE AS "alarmType", ar.ALARM_CONTENT AS "alarmContentName", ar.STATUS AS "alarmStatus", - aj.ID AS id, + aj.ID AS "id", ar.JOB_ID AS "jobId", aj.JOG_TYPE AS "jobType", aj.JOBCODE AS "jobCode", @@ -1044,8 +1044,8 @@ aj.HANDLE_MESSAGE AS "handleMessage", aj.HANDLE_PHOTOS AS "handlePhotos", aj.JOB_FLAG_1 AS "jobFlag", - coalesce(aj.FLOW,'') AS flow, - bwi.RESPONSIBLE_DEPT AS deptid + coalesce(aj.FLOW,'') AS "flow", + bwi.RESPONSIBLE_DEPT AS "deptid" FROM ( SELECT * FROM alarm_job diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index d9bb2f4..50d98f9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -25,11 +25,11 @@ SELECT - b.alarmTimeDate AS 'date' , - count( b.wellId ) AS alarmWells , - sum( alarmTimes ) AS alarmTimes + b.alarmTimeDate AS "date" , + count( b.wellId ) AS "alarmWells", + sum( alarmTimes ) AS "alarmTimes" FROM ( SELECT alarmTimeDate, wellId, count( 1 ) AS alarmTimes 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 768fa5f..bce2a38 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 @@ -50,7 +50,7 @@ bd.DEVICE_TYPE as "deviceType",bwi.ID AS "wellId",bwi.WELL_NAME as "wellName", COALESCE (ar.OPERATOR,'') AS "user", bwi.WELL_CODE as "wellCode",bwi.DEEP as "deep",bwi.DEPTID as "deptid", - COALESCE (,'') AS ts + COALESCE (,'') AS "ts" FROM alarm_rule ar LEFT JOIN bus_device bd ON ar.DEVCODE = bd.DEVCODE LEFT JOIN bus_device_well bdw ON bd.ID = bdw.DEVICE_ID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml index eb007e8..39f8cf0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml @@ -3,13 +3,13 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml index d92b4a4..27e517e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml @@ -26,7 +26,7 @@ SELECT A.wellCount AS "wellCount", - A.deptid, + A.deptid AS "deptid", SD.simple_name as "deptName", - SD.pid + SD.pid AS "pid" FROM ( SELECT COUNT( 1 ) AS wellCount, DEPTID AS deptid FROM bus_well_info WHERE VALID = '1' GROUP BY DEPTID ) A LEFT JOIN sys_dept SD ON A.DEPTID = SD.id @@ -30,12 +30,12 @@ SELECT COALESCE(SUM(CASE WHEN BD.ONLINE_STATE ]]> '0' THEN 1 ELSE 0 END)) - AS online, + AS "online", COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END)) - AS offline, - count(1) AS total + AS "offline", + count(1) AS "total" FROM bus_device BD LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID @@ -154,10 +154,10 @@ SELECT - bwi.DEPTID AS deptid, + bwi.DEPTID AS "deptid", @@ -191,7 +191,7 @@ - AS cancel + AS "cancel" FROM alarm_job aj INNER JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON aj.DEVCODE = bd.DEVCODE @@ -231,7 +231,7 @@ - AS cancel + AS "cancel" FROM alarm_job aj INNER JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON aj.DEVCODE = bd.DEVCODE @@ -259,8 +259,9 @@ - SELECT * FROM sys_dict + SELECT + FROM sys_dict WHERE pid IN (SELECT id FROM sys_dict WHERE pid=0 AND name = #{typeName} ) ; @@ -65,7 +66,7 @@ @@ -142,12 +146,14 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 9e5b366..5d6ff85 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -20,10 +20,10 @@ SELECT - bd.devcode AS devcode, + bd.devcode AS "devcode", bdt.TYPE_NAME AS "deviceTypeName", bd.device_type AS deviceType, bwi.well_code AS "wellCode", @@ -312,7 +312,7 @@ SELECT - bdm.ID AS id, + bdm.ID AS "id", bdm.MODEL_NAME AS "modelName", - bdm.COMMUNICATION AS communication, + bdm.COMMUNICATION AS "communication", bdm.DEVICE_TYPE AS "deviceType", bdt.TYPE_NAME AS "deviceTypeName" FROM @@ -40,7 +40,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -670,7 +670,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -794,7 +794,7 @@ SELECT - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable, + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable", FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY @@ -999,7 +999,7 @@ ar.ALARM_TYPE AS "alarmType", ar.ALARM_CONTENT AS "alarmContentName", ar.STATUS AS "alarmStatus", - aj.ID AS id, + aj.ID AS "id", ar.JOB_ID AS "jobId", aj.JOG_TYPE AS "jobType", aj.JOBCODE AS "jobCode", @@ -1044,8 +1044,8 @@ aj.HANDLE_MESSAGE AS "handleMessage", aj.HANDLE_PHOTOS AS "handlePhotos", aj.JOB_FLAG_1 AS "jobFlag", - coalesce(aj.FLOW,'') AS flow, - bwi.RESPONSIBLE_DEPT AS deptid + coalesce(aj.FLOW,'') AS "flow", + bwi.RESPONSIBLE_DEPT AS "deptid" FROM ( SELECT * FROM alarm_job diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index d9bb2f4..50d98f9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -25,11 +25,11 @@ SELECT - b.alarmTimeDate AS 'date' , - count( b.wellId ) AS alarmWells , - sum( alarmTimes ) AS alarmTimes + b.alarmTimeDate AS "date" , + count( b.wellId ) AS "alarmWells", + sum( alarmTimes ) AS "alarmTimes" FROM ( SELECT alarmTimeDate, wellId, count( 1 ) AS alarmTimes 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 768fa5f..bce2a38 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 @@ -50,7 +50,7 @@ bd.DEVICE_TYPE as "deviceType",bwi.ID AS "wellId",bwi.WELL_NAME as "wellName", COALESCE (ar.OPERATOR,'') AS "user", bwi.WELL_CODE as "wellCode",bwi.DEEP as "deep",bwi.DEPTID as "deptid", - COALESCE (,'') AS ts + COALESCE (,'') AS "ts" FROM alarm_rule ar LEFT JOIN bus_device bd ON ar.DEVCODE = bd.DEVCODE LEFT JOIN bus_device_well bdw ON bd.ID = bdw.DEVICE_ID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml index eb007e8..39f8cf0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml @@ -3,13 +3,13 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml index d92b4a4..27e517e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml @@ -26,7 +26,7 @@ SELECT A.wellCount AS "wellCount", - A.deptid, + A.deptid AS "deptid", SD.simple_name as "deptName", - SD.pid + SD.pid AS "pid" FROM ( SELECT COUNT( 1 ) AS wellCount, DEPTID AS deptid FROM bus_well_info WHERE VALID = '1' GROUP BY DEPTID ) A LEFT JOIN sys_dept SD ON A.DEPTID = SD.id @@ -30,12 +30,12 @@ SELECT COALESCE(SUM(CASE WHEN BD.ONLINE_STATE ]]> '0' THEN 1 ELSE 0 END)) - AS online, + AS "online", COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END)) - AS offline, - count(1) AS total + AS "offline", + count(1) AS "total" FROM bus_device BD LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID @@ -154,10 +154,10 @@ SELECT - bwi.DEPTID AS deptid, + bwi.DEPTID AS "deptid", @@ -191,7 +191,7 @@ - AS cancel + AS "cancel" FROM alarm_job aj INNER JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON aj.DEVCODE = bd.DEVCODE @@ -231,7 +231,7 @@ - AS cancel + AS "cancel" FROM alarm_job aj INNER JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON aj.DEVCODE = bd.DEVCODE @@ -259,8 +259,9 @@ - SELECT * FROM sys_dict + SELECT + FROM sys_dict WHERE pid IN (SELECT id FROM sys_dict WHERE pid=0 AND name = #{typeName} ) ; @@ -65,7 +66,7 @@ @@ -142,12 +146,14 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 9e5b366..5d6ff85 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -20,10 +20,10 @@ SELECT - bd.devcode AS devcode, + bd.devcode AS "devcode", bdt.TYPE_NAME AS "deviceTypeName", bd.device_type AS deviceType, bwi.well_code AS "wellCode", @@ -312,7 +312,7 @@ SELECT - bdm.ID AS id, + bdm.ID AS "id", bdm.MODEL_NAME AS "modelName", - bdm.COMMUNICATION AS communication, + bdm.COMMUNICATION AS "communication", bdm.DEVICE_TYPE AS "deviceType", bdt.TYPE_NAME AS "deviceTypeName" FROM @@ -40,7 +40,7 @@ - SELECT bwi.WELL_CODE AS "wellCode",WELL_NAME AS "wellName",DEEP AS deep, + SELECT bwi.WELL_CODE AS "wellCode",WELL_NAME AS "wellName",DEEP AS "deep", LNG_GAODE AS "lngGaode",LAT_GAODE AS "latGaode",AREA AS "area",POSITION AS "position", - RESPONSIBLE_DEPT AS "responsibleDept",PHOTOS AS photos,WELL_TYPE AS wellType,STAFF AS staff,TEL AS "tel" , - bwi.VALID AS valid,BFZT AS bfzt,WELL_FLAG_1 AS "groupId",DEPTID as deptid + RESPONSIBLE_DEPT AS "responsibleDept",PHOTOS AS "photos",WELL_TYPE AS "wellType",STAFF AS "staff",TEL AS "tel" , + bwi.VALID AS "valid",BFZT AS "bfzt",WELL_FLAG_1 AS "groupId",DEPTID as "deptid" FROM bus_well_info bwi, bus_device_well bdw, bus_device bd @@ -53,7 +53,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -670,7 +670,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -794,7 +794,7 @@ SELECT - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable, + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable", FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY @@ -999,7 +999,7 @@ ar.ALARM_TYPE AS "alarmType", ar.ALARM_CONTENT AS "alarmContentName", ar.STATUS AS "alarmStatus", - aj.ID AS id, + aj.ID AS "id", ar.JOB_ID AS "jobId", aj.JOG_TYPE AS "jobType", aj.JOBCODE AS "jobCode", @@ -1044,8 +1044,8 @@ aj.HANDLE_MESSAGE AS "handleMessage", aj.HANDLE_PHOTOS AS "handlePhotos", aj.JOB_FLAG_1 AS "jobFlag", - coalesce(aj.FLOW,'') AS flow, - bwi.RESPONSIBLE_DEPT AS deptid + coalesce(aj.FLOW,'') AS "flow", + bwi.RESPONSIBLE_DEPT AS "deptid" FROM ( SELECT * FROM alarm_job diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index d9bb2f4..50d98f9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -25,11 +25,11 @@ SELECT - b.alarmTimeDate AS 'date' , - count( b.wellId ) AS alarmWells , - sum( alarmTimes ) AS alarmTimes + b.alarmTimeDate AS "date" , + count( b.wellId ) AS "alarmWells", + sum( alarmTimes ) AS "alarmTimes" FROM ( SELECT alarmTimeDate, wellId, count( 1 ) AS alarmTimes 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 768fa5f..bce2a38 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 @@ -50,7 +50,7 @@ bd.DEVICE_TYPE as "deviceType",bwi.ID AS "wellId",bwi.WELL_NAME as "wellName", COALESCE (ar.OPERATOR,'') AS "user", bwi.WELL_CODE as "wellCode",bwi.DEEP as "deep",bwi.DEPTID as "deptid", - COALESCE (,'') AS ts + COALESCE (,'') AS "ts" FROM alarm_rule ar LEFT JOIN bus_device bd ON ar.DEVCODE = bd.DEVCODE LEFT JOIN bus_device_well bdw ON bd.ID = bdw.DEVICE_ID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml index eb007e8..39f8cf0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml @@ -3,13 +3,13 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml index d92b4a4..27e517e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml @@ -26,7 +26,7 @@ SELECT A.wellCount AS "wellCount", - A.deptid, + A.deptid AS "deptid", SD.simple_name as "deptName", - SD.pid + SD.pid AS "pid" FROM ( SELECT COUNT( 1 ) AS wellCount, DEPTID AS deptid FROM bus_well_info WHERE VALID = '1' GROUP BY DEPTID ) A LEFT JOIN sys_dept SD ON A.DEPTID = SD.id @@ -30,12 +30,12 @@ SELECT COALESCE(SUM(CASE WHEN BD.ONLINE_STATE ]]> '0' THEN 1 ELSE 0 END)) - AS online, + AS "online", COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END)) - AS offline, - count(1) AS total + AS "offline", + count(1) AS "total" FROM bus_device BD LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID @@ -154,10 +154,10 @@ SELECT - bwi.DEPTID AS deptid, + bwi.DEPTID AS "deptid", @@ -191,7 +191,7 @@ - AS cancel + AS "cancel" FROM alarm_job aj INNER JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON aj.DEVCODE = bd.DEVCODE @@ -231,7 +231,7 @@ - AS cancel + AS "cancel" FROM alarm_job aj INNER JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON aj.DEVCODE = bd.DEVCODE @@ -259,8 +259,9 @@ - SELECT * FROM sys_dict + SELECT + FROM sys_dict WHERE pid IN (SELECT id FROM sys_dict WHERE pid=0 AND name = #{typeName} ) ; @@ -65,7 +66,7 @@ @@ -142,12 +146,14 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 9e5b366..5d6ff85 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -20,10 +20,10 @@ SELECT - bd.devcode AS devcode, + bd.devcode AS "devcode", bdt.TYPE_NAME AS "deviceTypeName", bd.device_type AS deviceType, bwi.well_code AS "wellCode", @@ -312,7 +312,7 @@ SELECT - bdm.ID AS id, + bdm.ID AS "id", bdm.MODEL_NAME AS "modelName", - bdm.COMMUNICATION AS communication, + bdm.COMMUNICATION AS "communication", bdm.DEVICE_TYPE AS "deviceType", bdt.TYPE_NAME AS "deviceTypeName" FROM @@ -40,7 +40,7 @@ - SELECT bwi.WELL_CODE AS "wellCode",WELL_NAME AS "wellName",DEEP AS deep, + SELECT bwi.WELL_CODE AS "wellCode",WELL_NAME AS "wellName",DEEP AS "deep", LNG_GAODE AS "lngGaode",LAT_GAODE AS "latGaode",AREA AS "area",POSITION AS "position", - RESPONSIBLE_DEPT AS "responsibleDept",PHOTOS AS photos,WELL_TYPE AS wellType,STAFF AS staff,TEL AS "tel" , - bwi.VALID AS valid,BFZT AS bfzt,WELL_FLAG_1 AS "groupId",DEPTID as deptid + RESPONSIBLE_DEPT AS "responsibleDept",PHOTOS AS "photos",WELL_TYPE AS "wellType",STAFF AS "staff",TEL AS "tel" , + bwi.VALID AS "valid",BFZT AS "bfzt",WELL_FLAG_1 AS "groupId",DEPTID as "deptid" FROM bus_well_info bwi, bus_device_well bdw, bus_device bd @@ -53,7 +53,7 @@ select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType", - VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue", + VALID AS "valid",ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue", ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent", TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig" from base_device_type diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index d735cd9..7c0a003 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -98,7 +98,7 @@ - ID AS id, JOBCODE AS "jobcode", JOG_TYPE AS "jogType", + ID AS "id", JOBCODE AS "jobcode", JOG_TYPE AS "jogType", WELL_CODE AS "wellCode", DEVCODE AS "devcode", @@ -118,7 +118,7 @@ AS "handleJobTime", HANDLE_MESSAGE AS "handleMessage", - HANDLE_PHOTOS AS "handlePhotos", FLOW AS flow + HANDLE_PHOTOS AS "handlePhotos", FLOW AS "flow" @@ -139,7 +139,7 @@ - AS over + AS "over" FROM ( SELECT @@ -187,7 +187,7 @@ - AS over + AS "over" FROM ( SELECT @@ -414,43 +414,43 @@ - ar.id AS alarmId, - aj.DEVCODE AS devcode, - aj.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContentName, - ar.STATUS AS alarmStatus, - aj.ID AS id, - aj.ID AS jobId, - aj.JOG_TYPE AS jobType, - aj.JOBCODE AS jobCode, - aj.JOB_STATUS AS jobStatus, - aj.JOB_BELONG_TO AS jobBelongTo, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.id AS "alarmId", + aj.DEVCODE AS "devcode", + aj.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContentName", + ar.STATUS AS "alarmStatus", + aj.ID AS "id", + aj.ID AS "jobId", + aj.JOG_TYPE AS "jobType", + aj.JOBCODE AS "jobCode", + aj.JOB_STATUS AS "jobStatus", + aj.JOB_BELONG_TO AS "jobBelongTo", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", - AS createTime, + AS "createTime", - AS alarmTime, + AS "alarmTime", aj.GET_JOB_PERSON AS getJobPerson, - AS shouldGetTime, + AS "shouldGetTime", - AS getJobTime, + AS "getJobTime", aj.CONFIRM_JOB_PERSON AS confirmJobPerson, - AS confirmJobTime, + AS "confirmJobTime", aj.HANDLE_JOB_Person AS handleJobPerson, @@ -459,20 +459,20 @@ - AS handleJobTime, - aj.JOB_FLAG_1 AS jobFlag, - bwi.RESPONSIBLE_DEPT AS deptid + AS "handleJobTime", + aj.JOB_FLAG_1 AS "jobFlag", + bwi.RESPONSIBLE_DEPT AS "deptid" ar.id AS "alarmId", - aj.DEVCODE AS devcode, + aj.DEVCODE AS "devcode", aj.WELL_CODE AS "wellCode", ar.ALARM_TYPE AS "alarmType", ar.ALARM_CONTENT AS "alarmContentName", ar.STATUS AS "alarmStatus", - aj.ID AS id, + aj.ID AS "id", aj.ID AS "jobId", aj.JOG_TYPE AS "jobType", aj.JOBCODE AS "jobCode", @@ -513,7 +513,7 @@ AS "handleJobTime", aj.JOB_FLAG_1 AS "jobFlag", - bwi.RESPONSIBLE_DEPT AS deptid + bwi.RESPONSIBLE_DEPT AS "deptid" @@ -564,7 +564,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -748,7 +748,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -881,7 +881,7 @@ SELECT - level, - name, + level AS "level", + name "name", OPEN_ALARM AS "openAlarm", OPEN_JOB AS "openJob", - TS AS ts + TS AS "ts" FROM alarm_level WHERE TENANT_ID = #{tenantId} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 4edee65..da99850 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -64,9 +64,9 @@ - SELECT id,pid + SELECT id AS "id",pid AS "pid" FROM sys_dept diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml index d92b4a4..27e517e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml @@ -26,7 +26,7 @@ SELECT A.wellCount AS "wellCount", - A.deptid, + A.deptid AS "deptid", SD.simple_name as "deptName", - SD.pid + SD.pid AS "pid" FROM ( SELECT COUNT( 1 ) AS wellCount, DEPTID AS deptid FROM bus_well_info WHERE VALID = '1' GROUP BY DEPTID ) A LEFT JOIN sys_dept SD ON A.DEPTID = SD.id @@ -30,12 +30,12 @@ SELECT COALESCE(SUM(CASE WHEN BD.ONLINE_STATE ]]> '0' THEN 1 ELSE 0 END)) - AS online, + AS "online", COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END)) - AS offline, - count(1) AS total + AS "offline", + count(1) AS "total" FROM bus_device BD LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID @@ -154,10 +154,10 @@ SELECT - bwi.DEPTID AS deptid, + bwi.DEPTID AS "deptid", @@ -191,7 +191,7 @@ - AS cancel + AS "cancel" FROM alarm_job aj INNER JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON aj.DEVCODE = bd.DEVCODE @@ -231,7 +231,7 @@ - AS cancel + AS "cancel" FROM alarm_job aj INNER JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON aj.DEVCODE = bd.DEVCODE @@ -259,8 +259,9 @@ - SELECT * FROM sys_dict + SELECT + FROM sys_dict WHERE pid IN (SELECT id FROM sys_dict WHERE pid=0 AND name = #{typeName} ) ; @@ -65,7 +66,7 @@ @@ -142,12 +146,14 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 9e5b366..5d6ff85 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -20,10 +20,10 @@ SELECT - bd.devcode AS devcode, + bd.devcode AS "devcode", bdt.TYPE_NAME AS "deviceTypeName", bd.device_type AS deviceType, bwi.well_code AS "wellCode", @@ -312,7 +312,7 @@ SELECT - bdm.ID AS id, + bdm.ID AS "id", bdm.MODEL_NAME AS "modelName", - bdm.COMMUNICATION AS communication, + bdm.COMMUNICATION AS "communication", bdm.DEVICE_TYPE AS "deviceType", bdt.TYPE_NAME AS "deviceTypeName" FROM @@ -40,7 +40,7 @@ - SELECT bwi.WELL_CODE AS "wellCode",WELL_NAME AS "wellName",DEEP AS deep, + SELECT bwi.WELL_CODE AS "wellCode",WELL_NAME AS "wellName",DEEP AS "deep", LNG_GAODE AS "lngGaode",LAT_GAODE AS "latGaode",AREA AS "area",POSITION AS "position", - RESPONSIBLE_DEPT AS "responsibleDept",PHOTOS AS photos,WELL_TYPE AS wellType,STAFF AS staff,TEL AS "tel" , - bwi.VALID AS valid,BFZT AS bfzt,WELL_FLAG_1 AS "groupId",DEPTID as deptid + RESPONSIBLE_DEPT AS "responsibleDept",PHOTOS AS "photos",WELL_TYPE AS "wellType",STAFF AS "staff",TEL AS "tel" , + bwi.VALID AS "valid",BFZT AS "bfzt",WELL_FLAG_1 AS "groupId",DEPTID as "deptid" FROM bus_well_info bwi, bus_device_well bdw, bus_device bd @@ -53,7 +53,7 @@ select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType", - VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue", + VALID AS "valid",ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue", ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent", TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig" from base_device_type diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml index f0a395f..3f6662e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml @@ -11,7 +11,8 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -670,7 +670,7 @@ SELECT, - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable" FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY JOB_ID)) @@ -794,7 +794,7 @@ SELECT - CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS editable, + CASE WHEN JOB_BELONG_TO ]]> #{userId} THEN 0 ELSE 1 END AS "editable", FROM alarm_job aj LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY @@ -999,7 +999,7 @@ ar.ALARM_TYPE AS "alarmType", ar.ALARM_CONTENT AS "alarmContentName", ar.STATUS AS "alarmStatus", - aj.ID AS id, + aj.ID AS "id", ar.JOB_ID AS "jobId", aj.JOG_TYPE AS "jobType", aj.JOBCODE AS "jobCode", @@ -1044,8 +1044,8 @@ aj.HANDLE_MESSAGE AS "handleMessage", aj.HANDLE_PHOTOS AS "handlePhotos", aj.JOB_FLAG_1 AS "jobFlag", - coalesce(aj.FLOW,'') AS flow, - bwi.RESPONSIBLE_DEPT AS deptid + coalesce(aj.FLOW,'') AS "flow", + bwi.RESPONSIBLE_DEPT AS "deptid" FROM ( SELECT * FROM alarm_job diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index d9bb2f4..50d98f9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -25,11 +25,11 @@ SELECT - b.alarmTimeDate AS 'date' , - count( b.wellId ) AS alarmWells , - sum( alarmTimes ) AS alarmTimes + b.alarmTimeDate AS "date" , + count( b.wellId ) AS "alarmWells", + sum( alarmTimes ) AS "alarmTimes" FROM ( SELECT alarmTimeDate, wellId, count( 1 ) AS alarmTimes 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 768fa5f..bce2a38 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 @@ -50,7 +50,7 @@ bd.DEVICE_TYPE as "deviceType",bwi.ID AS "wellId",bwi.WELL_NAME as "wellName", COALESCE (ar.OPERATOR,'') AS "user", bwi.WELL_CODE as "wellCode",bwi.DEEP as "deep",bwi.DEPTID as "deptid", - COALESCE (,'') AS ts + COALESCE (,'') AS "ts" FROM alarm_rule ar LEFT JOIN bus_device bd ON ar.DEVCODE = bd.DEVCODE LEFT JOIN bus_device_well bdw ON bd.ID = bdw.DEVICE_ID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml index eb007e8..39f8cf0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataScopeMapper.xml @@ -3,13 +3,13 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml index d92b4a4..27e517e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/MessagePusherMapper.xml @@ -26,7 +26,7 @@ SELECT A.wellCount AS "wellCount", - A.deptid, + A.deptid AS "deptid", SD.simple_name as "deptName", - SD.pid + SD.pid AS "pid" FROM ( SELECT COUNT( 1 ) AS wellCount, DEPTID AS deptid FROM bus_well_info WHERE VALID = '1' GROUP BY DEPTID ) A LEFT JOIN sys_dept SD ON A.DEPTID = SD.id @@ -30,12 +30,12 @@ SELECT COALESCE(SUM(CASE WHEN BD.ONLINE_STATE ]]> '0' THEN 1 ELSE 0 END)) - AS online, + AS "online", COALESCE(SUM(CASE WHEN BD.ONLINE_STATE='0' THEN 1 ELSE 0 END)) - AS offline, - count(1) AS total + AS "offline", + count(1) AS "total" FROM bus_device BD LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID @@ -154,10 +154,10 @@ SELECT - bwi.DEPTID AS deptid, + bwi.DEPTID AS "deptid", @@ -191,7 +191,7 @@ - AS cancel + AS "cancel" FROM alarm_job aj INNER JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON aj.DEVCODE = bd.DEVCODE @@ -231,7 +231,7 @@ - AS cancel + AS "cancel" FROM alarm_job aj INNER JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON aj.DEVCODE = bd.DEVCODE @@ -259,8 +259,9 @@ - SELECT * FROM sys_dict + SELECT + FROM sys_dict WHERE pid IN (SELECT id FROM sys_dict WHERE pid=0 AND name = #{typeName} ) ; @@ -65,7 +66,7 @@ @@ -142,12 +146,14 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 9e5b366..5d6ff85 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -20,10 +20,10 @@ SELECT - bd.devcode AS devcode, + bd.devcode AS "devcode", bdt.TYPE_NAME AS "deviceTypeName", bd.device_type AS deviceType, bwi.well_code AS "wellCode", @@ -312,7 +312,7 @@ SELECT - bdm.ID AS id, + bdm.ID AS "id", bdm.MODEL_NAME AS "modelName", - bdm.COMMUNICATION AS communication, + bdm.COMMUNICATION AS "communication", bdm.DEVICE_TYPE AS "deviceType", bdt.TYPE_NAME AS "deviceTypeName" FROM @@ -40,7 +40,7 @@ - SELECT bwi.WELL_CODE AS "wellCode",WELL_NAME AS "wellName",DEEP AS deep, + SELECT bwi.WELL_CODE AS "wellCode",WELL_NAME AS "wellName",DEEP AS "deep", LNG_GAODE AS "lngGaode",LAT_GAODE AS "latGaode",AREA AS "area",POSITION AS "position", - RESPONSIBLE_DEPT AS "responsibleDept",PHOTOS AS photos,WELL_TYPE AS wellType,STAFF AS staff,TEL AS "tel" , - bwi.VALID AS valid,BFZT AS bfzt,WELL_FLAG_1 AS "groupId",DEPTID as deptid + RESPONSIBLE_DEPT AS "responsibleDept",PHOTOS AS "photos",WELL_TYPE AS "wellType",STAFF AS "staff",TEL AS "tel" , + bwi.VALID AS "valid",BFZT AS "bfzt",WELL_FLAG_1 AS "groupId",DEPTID as "deptid" FROM bus_well_info bwi, bus_device_well bdw, bus_device bd @@ -53,7 +53,7 @@ select ID AS "id",WATCH_TYPE "watchType",ALARM_RULE_TYPE AS "alarmRuleType", - VALID AS valid,ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue", + VALID AS "valid",ALARM_RULE_LOWVALUE AS "alarmRuleLowvalue", ALARM_RULE_HIGHVALUE AS "alarmRuleHighvalue",IS_NO_CONCENT AS "isNoConcent", TYPE_NAME AS "typeName",TYPE_DESCRIPTION AS "typeDescription",DATA_CONFIG AS "dataConfig" from base_device_type diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml index f0a395f..3f6662e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml @@ -11,7 +11,8 @@ - SELECT bd.devcode, + SELECT bd.devcode AS "devcode", AS "logtime", ${fields}, bd.device_Type as "deviceType", - deptid, + deptid AS "deptid", bwi.well_code as "wellCode", type_name as "deviceTypeName" FROM ${tableName} tb