diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java index c7df1cb..979e8be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java @@ -21,11 +21,12 @@ /** * 查询集中器列表 * - * @param page 分页参数 + * @param page 分页参数 * @param dataScope 数据权限 - * @param keywords 关键字 - * @param status 状态 + * @param keywords 关键字 + * @param status 状态 * @return */ - List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("status") String status); + List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, + @Param("keywords") String keywords, @Param("status") String status); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java index c7df1cb..979e8be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java @@ -21,11 +21,12 @@ /** * 查询集中器列表 * - * @param page 分页参数 + * @param page 分页参数 * @param dataScope 数据权限 - * @param keywords 关键字 - * @param status 状态 + * @param keywords 关键字 + * @param status 状态 * @return */ - List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("status") String status); + List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, + @Param("keywords") String keywords, @Param("status") String status); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java index 798d395..9517a30 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java @@ -16,7 +16,9 @@ */ public interface BusNbDeviceMapper extends BaseMapper { List getListByDevcode(@Param("devcode") String devcode); + List getByNodeId(@Param("nodeid") String nodeid); + List getByDevcode(@Param("devcode") String devcode); boolean deleteByNbDeviceId(String nbDeviceId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java index c7df1cb..979e8be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java @@ -21,11 +21,12 @@ /** * 查询集中器列表 * - * @param page 分页参数 + * @param page 分页参数 * @param dataScope 数据权限 - * @param keywords 关键字 - * @param status 状态 + * @param keywords 关键字 + * @param status 状态 * @return */ - List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("status") String status); + List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, + @Param("keywords") String keywords, @Param("status") String status); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java index 798d395..9517a30 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java @@ -16,7 +16,9 @@ */ public interface BusNbDeviceMapper extends BaseMapper { List getListByDevcode(@Param("devcode") String devcode); + List getByNodeId(@Param("nodeid") String nodeid); + List getByDevcode(@Param("devcode") String devcode); boolean deleteByNbDeviceId(String nbDeviceId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java index 9a3e919..302f95e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java @@ -14,5 +14,5 @@ */ public interface DeviceConcentratorMapper extends BaseMapper { - void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId")Long concId); + void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId") Long concId); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java index c7df1cb..979e8be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java @@ -21,11 +21,12 @@ /** * 查询集中器列表 * - * @param page 分页参数 + * @param page 分页参数 * @param dataScope 数据权限 - * @param keywords 关键字 - * @param status 状态 + * @param keywords 关键字 + * @param status 状态 * @return */ - List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("status") String status); + List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, + @Param("keywords") String keywords, @Param("status") String status); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java index 798d395..9517a30 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java @@ -16,7 +16,9 @@ */ public interface BusNbDeviceMapper extends BaseMapper { List getListByDevcode(@Param("devcode") String devcode); + List getByNodeId(@Param("nodeid") String nodeid); + List getByDevcode(@Param("devcode") String devcode); boolean deleteByNbDeviceId(String nbDeviceId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java index 9a3e919..302f95e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java @@ -14,5 +14,5 @@ */ public interface DeviceConcentratorMapper extends BaseMapper { - void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId")Long concId); + void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId") Long concId); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 6b1c6bf..5918e6c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -18,17 +18,19 @@ - ID AS id, DEVICE_ID AS deviceId, FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + ID AS id, DEVICE_ID AS "deviceId", FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + - c.ID AS id, c.DEVICE_ID AS deviceId, c.FRAMECONTENT AS framecontent, + c.ID AS id, c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS framecontent, c.SENSORID AS sensorid, c.SENSORCODE AS sensorcode, c.STATUS AS status, c.ATTEMPTSMAX AS attemptsmax, c.ATTEMPTSCURRENT AS attemptscurrent, c.SENDTIME AS sendtime, c.WRITETIME AS writetime,s.id AS deptid, - s.full_name AS deptName,a.WELL_CODE AS wellCode,d.DEVCODE AS devcode, - d.DEVICE_NAME AS deviceName,d.DEVICE_TYPE AS deviceType, - t.TYPE_NAME AS deviceTypeName + s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS devcode, + d.DEVICE_NAME AS "deviceName",d.DEVICE_TYPE AS "deviceType", + t.TYPE_NAME AS "deviceTypeName" + '%' || #{keywords}|| '%' @@ -39,26 +41,18 @@ CONCAT('%',#{keywords},'%') - - #{keywords} + + ${paramStr} - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - #{sensorid} - - - CONCAT(#{sensorid}) - - - CONCAT(#{sensorid}) - - select FROM bus_config c LEFT JOIN bus_device_well b ON @@ -68,55 +62,43 @@ d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 AND c.sensorid = - + + + and d.DEVCODE like and s.ID = - + + + ORDER by writetime DESC - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java index c7df1cb..979e8be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java @@ -21,11 +21,12 @@ /** * 查询集中器列表 * - * @param page 分页参数 + * @param page 分页参数 * @param dataScope 数据权限 - * @param keywords 关键字 - * @param status 状态 + * @param keywords 关键字 + * @param status 状态 * @return */ - List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("status") String status); + List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, + @Param("keywords") String keywords, @Param("status") String status); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java index 798d395..9517a30 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java @@ -16,7 +16,9 @@ */ public interface BusNbDeviceMapper extends BaseMapper { List getListByDevcode(@Param("devcode") String devcode); + List getByNodeId(@Param("nodeid") String nodeid); + List getByDevcode(@Param("devcode") String devcode); boolean deleteByNbDeviceId(String nbDeviceId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java index 9a3e919..302f95e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java @@ -14,5 +14,5 @@ */ public interface DeviceConcentratorMapper extends BaseMapper { - void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId")Long concId); + void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId") Long concId); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 6b1c6bf..5918e6c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -18,17 +18,19 @@ - ID AS id, DEVICE_ID AS deviceId, FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + ID AS id, DEVICE_ID AS "deviceId", FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + - c.ID AS id, c.DEVICE_ID AS deviceId, c.FRAMECONTENT AS framecontent, + c.ID AS id, c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS framecontent, c.SENSORID AS sensorid, c.SENSORCODE AS sensorcode, c.STATUS AS status, c.ATTEMPTSMAX AS attemptsmax, c.ATTEMPTSCURRENT AS attemptscurrent, c.SENDTIME AS sendtime, c.WRITETIME AS writetime,s.id AS deptid, - s.full_name AS deptName,a.WELL_CODE AS wellCode,d.DEVCODE AS devcode, - d.DEVICE_NAME AS deviceName,d.DEVICE_TYPE AS deviceType, - t.TYPE_NAME AS deviceTypeName + s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS devcode, + d.DEVICE_NAME AS "deviceName",d.DEVICE_TYPE AS "deviceType", + t.TYPE_NAME AS "deviceTypeName" + '%' || #{keywords}|| '%' @@ -39,26 +41,18 @@ CONCAT('%',#{keywords},'%') - - #{keywords} + + ${paramStr} - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - #{sensorid} - - - CONCAT(#{sensorid}) - - - CONCAT(#{sensorid}) - - select FROM bus_config c LEFT JOIN bus_device_well b ON @@ -68,55 +62,43 @@ d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 AND c.sensorid = - + + + and d.DEVCODE like and s.ID = - + + + ORDER by writetime DESC - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml index d2d0214..c13eab4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml @@ -19,27 +19,44 @@ + + '%' || #{devcode}|| '%' + + + CONCAT('%',#{devcode},'%') + + + CONCAT('%',#{devcode},'%') + + - ID AS id, NB_DEVICE_ID AS nbDeviceId, DEVCODE AS devcode, VERIFY_CODE AS verifyCode, - NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS manufacturerId, - MANUFACTURER_NAME AS manufacturerName, DEVICE_TYPE AS deviceType, MODEL AS model, - PROTOCAL_TYPE AS protocalType, IS_SECURE AS isSecure + ID AS id, NB_DEVICE_ID AS "nbDeviceId", DEVCODE AS devcode, VERIFY_CODE AS "verifyCode", + NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS "manufacturerId", + MANUFACTURER_NAME AS "manufacturerName", DEVICE_TYPE AS "deviceType", MODEL AS model, + PROTOCAL_TYPE AS "protocalType", IS_SECURE AS "isSecure" diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java index c7df1cb..979e8be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java @@ -21,11 +21,12 @@ /** * 查询集中器列表 * - * @param page 分页参数 + * @param page 分页参数 * @param dataScope 数据权限 - * @param keywords 关键字 - * @param status 状态 + * @param keywords 关键字 + * @param status 状态 * @return */ - List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("status") String status); + List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, + @Param("keywords") String keywords, @Param("status") String status); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java index 798d395..9517a30 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java @@ -16,7 +16,9 @@ */ public interface BusNbDeviceMapper extends BaseMapper { List getListByDevcode(@Param("devcode") String devcode); + List getByNodeId(@Param("nodeid") String nodeid); + List getByDevcode(@Param("devcode") String devcode); boolean deleteByNbDeviceId(String nbDeviceId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java index 9a3e919..302f95e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java @@ -14,5 +14,5 @@ */ public interface DeviceConcentratorMapper extends BaseMapper { - void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId")Long concId); + void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId") Long concId); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 6b1c6bf..5918e6c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -18,17 +18,19 @@ - ID AS id, DEVICE_ID AS deviceId, FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + ID AS id, DEVICE_ID AS "deviceId", FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + - c.ID AS id, c.DEVICE_ID AS deviceId, c.FRAMECONTENT AS framecontent, + c.ID AS id, c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS framecontent, c.SENSORID AS sensorid, c.SENSORCODE AS sensorcode, c.STATUS AS status, c.ATTEMPTSMAX AS attemptsmax, c.ATTEMPTSCURRENT AS attemptscurrent, c.SENDTIME AS sendtime, c.WRITETIME AS writetime,s.id AS deptid, - s.full_name AS deptName,a.WELL_CODE AS wellCode,d.DEVCODE AS devcode, - d.DEVICE_NAME AS deviceName,d.DEVICE_TYPE AS deviceType, - t.TYPE_NAME AS deviceTypeName + s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS devcode, + d.DEVICE_NAME AS "deviceName",d.DEVICE_TYPE AS "deviceType", + t.TYPE_NAME AS "deviceTypeName" + '%' || #{keywords}|| '%' @@ -39,26 +41,18 @@ CONCAT('%',#{keywords},'%') - - #{keywords} + + ${paramStr} - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - #{sensorid} - - - CONCAT(#{sensorid}) - - - CONCAT(#{sensorid}) - - select FROM bus_config c LEFT JOIN bus_device_well b ON @@ -68,55 +62,43 @@ d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 AND c.sensorid = - + + + and d.DEVCODE like and s.ID = - + + + ORDER by writetime DESC - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml index d2d0214..c13eab4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml @@ -19,27 +19,44 @@ + + '%' || #{devcode}|| '%' + + + CONCAT('%',#{devcode},'%') + + + CONCAT('%',#{devcode},'%') + + - ID AS id, NB_DEVICE_ID AS nbDeviceId, DEVCODE AS devcode, VERIFY_CODE AS verifyCode, - NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS manufacturerId, - MANUFACTURER_NAME AS manufacturerName, DEVICE_TYPE AS deviceType, MODEL AS model, - PROTOCAL_TYPE AS protocalType, IS_SECURE AS isSecure + ID AS id, NB_DEVICE_ID AS "nbDeviceId", DEVCODE AS devcode, VERIFY_CODE AS "verifyCode", + NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS "manufacturerId", + MANUFACTURER_NAME AS "manufacturerName", DEVICE_TYPE AS "deviceType", MODEL AS model, + PROTOCAL_TYPE AS "protocalType", IS_SECURE AS "isSecure" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml index a642d1e..d0c7e1b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml @@ -15,10 +15,14 @@ - ID AS id, DEPTID AS deptid, BASE_URL AS baseUrl, APPID AS appid, APPKEY AS appkey, SUBSCRIBE_URL AS subscribeUrl, APPNAME AS appname + ID AS id, DEPTID AS deptid, BASE_URL AS "baseUrl", APPID AS appid, APPKEY AS appkey, + SUBSCRIBE_URL AS "subscribeUrl", APPNAME AS appname + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java index c7df1cb..979e8be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java @@ -21,11 +21,12 @@ /** * 查询集中器列表 * - * @param page 分页参数 + * @param page 分页参数 * @param dataScope 数据权限 - * @param keywords 关键字 - * @param status 状态 + * @param keywords 关键字 + * @param status 状态 * @return */ - List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("status") String status); + List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, + @Param("keywords") String keywords, @Param("status") String status); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java index 798d395..9517a30 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java @@ -16,7 +16,9 @@ */ public interface BusNbDeviceMapper extends BaseMapper { List getListByDevcode(@Param("devcode") String devcode); + List getByNodeId(@Param("nodeid") String nodeid); + List getByDevcode(@Param("devcode") String devcode); boolean deleteByNbDeviceId(String nbDeviceId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java index 9a3e919..302f95e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java @@ -14,5 +14,5 @@ */ public interface DeviceConcentratorMapper extends BaseMapper { - void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId")Long concId); + void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId") Long concId); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 6b1c6bf..5918e6c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -18,17 +18,19 @@ - ID AS id, DEVICE_ID AS deviceId, FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + ID AS id, DEVICE_ID AS "deviceId", FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + - c.ID AS id, c.DEVICE_ID AS deviceId, c.FRAMECONTENT AS framecontent, + c.ID AS id, c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS framecontent, c.SENSORID AS sensorid, c.SENSORCODE AS sensorcode, c.STATUS AS status, c.ATTEMPTSMAX AS attemptsmax, c.ATTEMPTSCURRENT AS attemptscurrent, c.SENDTIME AS sendtime, c.WRITETIME AS writetime,s.id AS deptid, - s.full_name AS deptName,a.WELL_CODE AS wellCode,d.DEVCODE AS devcode, - d.DEVICE_NAME AS deviceName,d.DEVICE_TYPE AS deviceType, - t.TYPE_NAME AS deviceTypeName + s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS devcode, + d.DEVICE_NAME AS "deviceName",d.DEVICE_TYPE AS "deviceType", + t.TYPE_NAME AS "deviceTypeName" + '%' || #{keywords}|| '%' @@ -39,26 +41,18 @@ CONCAT('%',#{keywords},'%') - - #{keywords} + + ${paramStr} - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - #{sensorid} - - - CONCAT(#{sensorid}) - - - CONCAT(#{sensorid}) - - select FROM bus_config c LEFT JOIN bus_device_well b ON @@ -68,55 +62,43 @@ d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 AND c.sensorid = - + + + and d.DEVCODE like and s.ID = - + + + ORDER by writetime DESC - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml index d2d0214..c13eab4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml @@ -19,27 +19,44 @@ + + '%' || #{devcode}|| '%' + + + CONCAT('%',#{devcode},'%') + + + CONCAT('%',#{devcode},'%') + + - ID AS id, NB_DEVICE_ID AS nbDeviceId, DEVCODE AS devcode, VERIFY_CODE AS verifyCode, - NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS manufacturerId, - MANUFACTURER_NAME AS manufacturerName, DEVICE_TYPE AS deviceType, MODEL AS model, - PROTOCAL_TYPE AS protocalType, IS_SECURE AS isSecure + ID AS id, NB_DEVICE_ID AS "nbDeviceId", DEVCODE AS devcode, VERIFY_CODE AS "verifyCode", + NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS "manufacturerId", + MANUFACTURER_NAME AS "manufacturerName", DEVICE_TYPE AS "deviceType", MODEL AS model, + PROTOCAL_TYPE AS "protocalType", IS_SECURE AS "isSecure" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml index a642d1e..d0c7e1b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml @@ -15,10 +15,14 @@ - ID AS id, DEPTID AS deptid, BASE_URL AS baseUrl, APPID AS appid, APPKEY AS appkey, SUBSCRIBE_URL AS subscribeUrl, APPNAME AS appname + ID AS id, DEPTID AS deptid, BASE_URL AS "baseUrl", APPID AS appid, APPKEY AS appkey, + SUBSCRIBE_URL AS "subscribeUrl", APPNAME AS appname + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml index db0d728..f69e756 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml @@ -4,18 +4,18 @@ - - - - - - - + + + + + + + - ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS wellType, DEVICE_TYPE AS deviceType, area, MAP AS map + ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS "wellType", DEVICE_TYPE AS "deviceType", area, MAP AS map diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java index c7df1cb..979e8be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java @@ -21,11 +21,12 @@ /** * 查询集中器列表 * - * @param page 分页参数 + * @param page 分页参数 * @param dataScope 数据权限 - * @param keywords 关键字 - * @param status 状态 + * @param keywords 关键字 + * @param status 状态 * @return */ - List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("status") String status); + List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, + @Param("keywords") String keywords, @Param("status") String status); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java index 798d395..9517a30 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java @@ -16,7 +16,9 @@ */ public interface BusNbDeviceMapper extends BaseMapper { List getListByDevcode(@Param("devcode") String devcode); + List getByNodeId(@Param("nodeid") String nodeid); + List getByDevcode(@Param("devcode") String devcode); boolean deleteByNbDeviceId(String nbDeviceId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java index 9a3e919..302f95e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java @@ -14,5 +14,5 @@ */ public interface DeviceConcentratorMapper extends BaseMapper { - void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId")Long concId); + void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId") Long concId); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 6b1c6bf..5918e6c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -18,17 +18,19 @@ - ID AS id, DEVICE_ID AS deviceId, FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + ID AS id, DEVICE_ID AS "deviceId", FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + - c.ID AS id, c.DEVICE_ID AS deviceId, c.FRAMECONTENT AS framecontent, + c.ID AS id, c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS framecontent, c.SENSORID AS sensorid, c.SENSORCODE AS sensorcode, c.STATUS AS status, c.ATTEMPTSMAX AS attemptsmax, c.ATTEMPTSCURRENT AS attemptscurrent, c.SENDTIME AS sendtime, c.WRITETIME AS writetime,s.id AS deptid, - s.full_name AS deptName,a.WELL_CODE AS wellCode,d.DEVCODE AS devcode, - d.DEVICE_NAME AS deviceName,d.DEVICE_TYPE AS deviceType, - t.TYPE_NAME AS deviceTypeName + s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS devcode, + d.DEVICE_NAME AS "deviceName",d.DEVICE_TYPE AS "deviceType", + t.TYPE_NAME AS "deviceTypeName" + '%' || #{keywords}|| '%' @@ -39,26 +41,18 @@ CONCAT('%',#{keywords},'%') - - #{keywords} + + ${paramStr} - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - #{sensorid} - - - CONCAT(#{sensorid}) - - - CONCAT(#{sensorid}) - - select FROM bus_config c LEFT JOIN bus_device_well b ON @@ -68,55 +62,43 @@ d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 AND c.sensorid = - + + + and d.DEVCODE like and s.ID = - + + + ORDER by writetime DESC - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml index d2d0214..c13eab4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml @@ -19,27 +19,44 @@ + + '%' || #{devcode}|| '%' + + + CONCAT('%',#{devcode},'%') + + + CONCAT('%',#{devcode},'%') + + - ID AS id, NB_DEVICE_ID AS nbDeviceId, DEVCODE AS devcode, VERIFY_CODE AS verifyCode, - NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS manufacturerId, - MANUFACTURER_NAME AS manufacturerName, DEVICE_TYPE AS deviceType, MODEL AS model, - PROTOCAL_TYPE AS protocalType, IS_SECURE AS isSecure + ID AS id, NB_DEVICE_ID AS "nbDeviceId", DEVCODE AS devcode, VERIFY_CODE AS "verifyCode", + NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS "manufacturerId", + MANUFACTURER_NAME AS "manufacturerName", DEVICE_TYPE AS "deviceType", MODEL AS model, + PROTOCAL_TYPE AS "protocalType", IS_SECURE AS "isSecure" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml index a642d1e..d0c7e1b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml @@ -15,10 +15,14 @@ - ID AS id, DEPTID AS deptid, BASE_URL AS baseUrl, APPID AS appid, APPKEY AS appkey, SUBSCRIBE_URL AS subscribeUrl, APPNAME AS appname + ID AS id, DEPTID AS deptid, BASE_URL AS "baseUrl", APPID AS appid, APPKEY AS appkey, + SUBSCRIBE_URL AS "subscribeUrl", APPNAME AS appname + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml index db0d728..f69e756 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml @@ -4,18 +4,18 @@ - - - - - - - + + + + + + + - ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS wellType, DEVICE_TYPE AS deviceType, area, MAP AS map + ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS "wellType", DEVICE_TYPE AS "deviceType", area, MAP AS map diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml index 1c84ca3..2bc0bfd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml @@ -13,7 +13,7 @@ - DEVICE_ID AS deviceId, CONCEN_ID AS concenId, STATUS AS status, ACTIVE AS active, TS AS ts + DEVICE_ID AS "deviceId", CONCEN_ID AS "concenId", STATUS AS status, ACTIVE AS active, TS AS ts diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java index c7df1cb..979e8be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java @@ -21,11 +21,12 @@ /** * 查询集中器列表 * - * @param page 分页参数 + * @param page 分页参数 * @param dataScope 数据权限 - * @param keywords 关键字 - * @param status 状态 + * @param keywords 关键字 + * @param status 状态 * @return */ - List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("status") String status); + List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, + @Param("keywords") String keywords, @Param("status") String status); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java index 798d395..9517a30 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java @@ -16,7 +16,9 @@ */ public interface BusNbDeviceMapper extends BaseMapper { List getListByDevcode(@Param("devcode") String devcode); + List getByNodeId(@Param("nodeid") String nodeid); + List getByDevcode(@Param("devcode") String devcode); boolean deleteByNbDeviceId(String nbDeviceId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java index 9a3e919..302f95e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java @@ -14,5 +14,5 @@ */ public interface DeviceConcentratorMapper extends BaseMapper { - void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId")Long concId); + void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId") Long concId); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 6b1c6bf..5918e6c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -18,17 +18,19 @@ - ID AS id, DEVICE_ID AS deviceId, FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + ID AS id, DEVICE_ID AS "deviceId", FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + - c.ID AS id, c.DEVICE_ID AS deviceId, c.FRAMECONTENT AS framecontent, + c.ID AS id, c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS framecontent, c.SENSORID AS sensorid, c.SENSORCODE AS sensorcode, c.STATUS AS status, c.ATTEMPTSMAX AS attemptsmax, c.ATTEMPTSCURRENT AS attemptscurrent, c.SENDTIME AS sendtime, c.WRITETIME AS writetime,s.id AS deptid, - s.full_name AS deptName,a.WELL_CODE AS wellCode,d.DEVCODE AS devcode, - d.DEVICE_NAME AS deviceName,d.DEVICE_TYPE AS deviceType, - t.TYPE_NAME AS deviceTypeName + s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS devcode, + d.DEVICE_NAME AS "deviceName",d.DEVICE_TYPE AS "deviceType", + t.TYPE_NAME AS "deviceTypeName" + '%' || #{keywords}|| '%' @@ -39,26 +41,18 @@ CONCAT('%',#{keywords},'%') - - #{keywords} + + ${paramStr} - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - #{sensorid} - - - CONCAT(#{sensorid}) - - - CONCAT(#{sensorid}) - - select FROM bus_config c LEFT JOIN bus_device_well b ON @@ -68,55 +62,43 @@ d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 AND c.sensorid = - + + + and d.DEVCODE like and s.ID = - + + + ORDER by writetime DESC - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml index d2d0214..c13eab4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml @@ -19,27 +19,44 @@ + + '%' || #{devcode}|| '%' + + + CONCAT('%',#{devcode},'%') + + + CONCAT('%',#{devcode},'%') + + - ID AS id, NB_DEVICE_ID AS nbDeviceId, DEVCODE AS devcode, VERIFY_CODE AS verifyCode, - NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS manufacturerId, - MANUFACTURER_NAME AS manufacturerName, DEVICE_TYPE AS deviceType, MODEL AS model, - PROTOCAL_TYPE AS protocalType, IS_SECURE AS isSecure + ID AS id, NB_DEVICE_ID AS "nbDeviceId", DEVCODE AS devcode, VERIFY_CODE AS "verifyCode", + NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS "manufacturerId", + MANUFACTURER_NAME AS "manufacturerName", DEVICE_TYPE AS "deviceType", MODEL AS model, + PROTOCAL_TYPE AS "protocalType", IS_SECURE AS "isSecure" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml index a642d1e..d0c7e1b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml @@ -15,10 +15,14 @@ - ID AS id, DEPTID AS deptid, BASE_URL AS baseUrl, APPID AS appid, APPKEY AS appkey, SUBSCRIBE_URL AS subscribeUrl, APPNAME AS appname + ID AS id, DEPTID AS deptid, BASE_URL AS "baseUrl", APPID AS appid, APPKEY AS appkey, + SUBSCRIBE_URL AS "subscribeUrl", APPNAME AS appname + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml index db0d728..f69e756 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml @@ -4,18 +4,18 @@ - - - - - - - + + + + + + + - ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS wellType, DEVICE_TYPE AS deviceType, area, MAP AS map + ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS "wellType", DEVICE_TYPE AS "deviceType", area, MAP AS map diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml index 1c84ca3..2bc0bfd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml @@ -13,7 +13,7 @@ - DEVICE_ID AS deviceId, CONCEN_ID AS concenId, STATUS AS status, ACTIVE AS active, TS AS ts + DEVICE_ID AS "deviceId", CONCEN_ID AS "concenId", STATUS AS status, ACTIVE AS active, TS AS ts diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4622bdf..e12c713 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -16,26 +16,50 @@ ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, - - as INSTALLDATE + + + + AS "INSTALLDATE" - - DATE_FORMAT - (INSTALLDATE,'%Y-%m-%d') + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') - - to_char - (INSTALLDATE,'yyyy-MM-dd') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - - ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version + + + '%' ||#{keywords}||'%' + + + CONCAT('%',#{keywords},'%') + + + + CONCAT('%',#{keywords},'%') + + + + str_to_date(${paramStr},'%Y-%m-%d %H:%i') + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - DATE_FORMAT - (UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - - '%' ||#{keywords}||'%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - #{endTime} - - - #{beginTime} - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - + - d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate", ONLINE_STATE AS "onlineState", t.TYPE_NAME AS "typeName" + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java index c7df1cb..979e8be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java @@ -21,11 +21,12 @@ /** * 查询集中器列表 * - * @param page 分页参数 + * @param page 分页参数 * @param dataScope 数据权限 - * @param keywords 关键字 - * @param status 状态 + * @param keywords 关键字 + * @param status 状态 * @return */ - List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("status") String status); + List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, + @Param("keywords") String keywords, @Param("status") String status); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java index 798d395..9517a30 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java @@ -16,7 +16,9 @@ */ public interface BusNbDeviceMapper extends BaseMapper { List getListByDevcode(@Param("devcode") String devcode); + List getByNodeId(@Param("nodeid") String nodeid); + List getByDevcode(@Param("devcode") String devcode); boolean deleteByNbDeviceId(String nbDeviceId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java index 9a3e919..302f95e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java @@ -14,5 +14,5 @@ */ public interface DeviceConcentratorMapper extends BaseMapper { - void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId")Long concId); + void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId") Long concId); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 6b1c6bf..5918e6c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -18,17 +18,19 @@ - ID AS id, DEVICE_ID AS deviceId, FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + ID AS id, DEVICE_ID AS "deviceId", FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + - c.ID AS id, c.DEVICE_ID AS deviceId, c.FRAMECONTENT AS framecontent, + c.ID AS id, c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS framecontent, c.SENSORID AS sensorid, c.SENSORCODE AS sensorcode, c.STATUS AS status, c.ATTEMPTSMAX AS attemptsmax, c.ATTEMPTSCURRENT AS attemptscurrent, c.SENDTIME AS sendtime, c.WRITETIME AS writetime,s.id AS deptid, - s.full_name AS deptName,a.WELL_CODE AS wellCode,d.DEVCODE AS devcode, - d.DEVICE_NAME AS deviceName,d.DEVICE_TYPE AS deviceType, - t.TYPE_NAME AS deviceTypeName + s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS devcode, + d.DEVICE_NAME AS "deviceName",d.DEVICE_TYPE AS "deviceType", + t.TYPE_NAME AS "deviceTypeName" + '%' || #{keywords}|| '%' @@ -39,26 +41,18 @@ CONCAT('%',#{keywords},'%') - - #{keywords} + + ${paramStr} - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - #{sensorid} - - - CONCAT(#{sensorid}) - - - CONCAT(#{sensorid}) - - select FROM bus_config c LEFT JOIN bus_device_well b ON @@ -68,55 +62,43 @@ d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 AND c.sensorid = - + + + and d.DEVCODE like and s.ID = - + + + ORDER by writetime DESC - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml index d2d0214..c13eab4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml @@ -19,27 +19,44 @@ + + '%' || #{devcode}|| '%' + + + CONCAT('%',#{devcode},'%') + + + CONCAT('%',#{devcode},'%') + + - ID AS id, NB_DEVICE_ID AS nbDeviceId, DEVCODE AS devcode, VERIFY_CODE AS verifyCode, - NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS manufacturerId, - MANUFACTURER_NAME AS manufacturerName, DEVICE_TYPE AS deviceType, MODEL AS model, - PROTOCAL_TYPE AS protocalType, IS_SECURE AS isSecure + ID AS id, NB_DEVICE_ID AS "nbDeviceId", DEVCODE AS devcode, VERIFY_CODE AS "verifyCode", + NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS "manufacturerId", + MANUFACTURER_NAME AS "manufacturerName", DEVICE_TYPE AS "deviceType", MODEL AS model, + PROTOCAL_TYPE AS "protocalType", IS_SECURE AS "isSecure" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml index a642d1e..d0c7e1b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml @@ -15,10 +15,14 @@ - ID AS id, DEPTID AS deptid, BASE_URL AS baseUrl, APPID AS appid, APPKEY AS appkey, SUBSCRIBE_URL AS subscribeUrl, APPNAME AS appname + ID AS id, DEPTID AS deptid, BASE_URL AS "baseUrl", APPID AS appid, APPKEY AS appkey, + SUBSCRIBE_URL AS "subscribeUrl", APPNAME AS appname + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml index db0d728..f69e756 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml @@ -4,18 +4,18 @@ - - - - - - - + + + + + + + - ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS wellType, DEVICE_TYPE AS deviceType, area, MAP AS map + ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS "wellType", DEVICE_TYPE AS "deviceType", area, MAP AS map diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml index 1c84ca3..2bc0bfd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml @@ -13,7 +13,7 @@ - DEVICE_ID AS deviceId, CONCEN_ID AS concenId, STATUS AS status, ACTIVE AS active, TS AS ts + DEVICE_ID AS "deviceId", CONCEN_ID AS "concenId", STATUS AS status, ACTIVE AS active, TS AS ts diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4622bdf..e12c713 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -16,26 +16,50 @@ ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, - - as INSTALLDATE + + + + AS "INSTALLDATE" - - DATE_FORMAT - (INSTALLDATE,'%Y-%m-%d') + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') - - to_char - (INSTALLDATE,'yyyy-MM-dd') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - - ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version + + + '%' ||#{keywords}||'%' + + + CONCAT('%',#{keywords},'%') + + + + CONCAT('%',#{keywords},'%') + + + + str_to_date(${paramStr},'%Y-%m-%d %H:%i') + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - DATE_FORMAT - (UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - - '%' ||#{keywords}||'%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - #{endTime} - - - #{beginTime} - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - + - d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate", ONLINE_STATE AS "onlineState", t.TYPE_NAME AS "typeName" + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 9f1b06f..4943869 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -12,7 +12,7 @@ - ID AS id, MODEL_NAME AS modelName, DEVICE_TYPE AS deviceType, COMMUNICATION AS communication + ID AS id, MODEL_NAME AS "modelName", DEVICE_TYPE AS "deviceType", COMMUNICATION AS communication SELECT bdm.ID AS id, - bdm.MODEL_NAME AS modelName, + bdm.MODEL_NAME AS "modelName", bdm.COMMUNICATION AS communication, - bdm.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName + bdm.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName" FROM base_device_models bdm LEFT JOIN base_device_type bdt ON bdm.DEVICE_TYPE = bdt.ID @@ -40,13 +40,14 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java index c7df1cb..979e8be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java @@ -21,11 +21,12 @@ /** * 查询集中器列表 * - * @param page 分页参数 + * @param page 分页参数 * @param dataScope 数据权限 - * @param keywords 关键字 - * @param status 状态 + * @param keywords 关键字 + * @param status 状态 * @return */ - List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("status") String status); + List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, + @Param("keywords") String keywords, @Param("status") String status); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java index 798d395..9517a30 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java @@ -16,7 +16,9 @@ */ public interface BusNbDeviceMapper extends BaseMapper { List getListByDevcode(@Param("devcode") String devcode); + List getByNodeId(@Param("nodeid") String nodeid); + List getByDevcode(@Param("devcode") String devcode); boolean deleteByNbDeviceId(String nbDeviceId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java index 9a3e919..302f95e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java @@ -14,5 +14,5 @@ */ public interface DeviceConcentratorMapper extends BaseMapper { - void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId")Long concId); + void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId") Long concId); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 6b1c6bf..5918e6c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -18,17 +18,19 @@ - ID AS id, DEVICE_ID AS deviceId, FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + ID AS id, DEVICE_ID AS "deviceId", FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + - c.ID AS id, c.DEVICE_ID AS deviceId, c.FRAMECONTENT AS framecontent, + c.ID AS id, c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS framecontent, c.SENSORID AS sensorid, c.SENSORCODE AS sensorcode, c.STATUS AS status, c.ATTEMPTSMAX AS attemptsmax, c.ATTEMPTSCURRENT AS attemptscurrent, c.SENDTIME AS sendtime, c.WRITETIME AS writetime,s.id AS deptid, - s.full_name AS deptName,a.WELL_CODE AS wellCode,d.DEVCODE AS devcode, - d.DEVICE_NAME AS deviceName,d.DEVICE_TYPE AS deviceType, - t.TYPE_NAME AS deviceTypeName + s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS devcode, + d.DEVICE_NAME AS "deviceName",d.DEVICE_TYPE AS "deviceType", + t.TYPE_NAME AS "deviceTypeName" + '%' || #{keywords}|| '%' @@ -39,26 +41,18 @@ CONCAT('%',#{keywords},'%') - - #{keywords} + + ${paramStr} - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - #{sensorid} - - - CONCAT(#{sensorid}) - - - CONCAT(#{sensorid}) - - select FROM bus_config c LEFT JOIN bus_device_well b ON @@ -68,55 +62,43 @@ d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 AND c.sensorid = - + + + and d.DEVCODE like and s.ID = - + + + ORDER by writetime DESC - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml index d2d0214..c13eab4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml @@ -19,27 +19,44 @@ + + '%' || #{devcode}|| '%' + + + CONCAT('%',#{devcode},'%') + + + CONCAT('%',#{devcode},'%') + + - ID AS id, NB_DEVICE_ID AS nbDeviceId, DEVCODE AS devcode, VERIFY_CODE AS verifyCode, - NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS manufacturerId, - MANUFACTURER_NAME AS manufacturerName, DEVICE_TYPE AS deviceType, MODEL AS model, - PROTOCAL_TYPE AS protocalType, IS_SECURE AS isSecure + ID AS id, NB_DEVICE_ID AS "nbDeviceId", DEVCODE AS devcode, VERIFY_CODE AS "verifyCode", + NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS "manufacturerId", + MANUFACTURER_NAME AS "manufacturerName", DEVICE_TYPE AS "deviceType", MODEL AS model, + PROTOCAL_TYPE AS "protocalType", IS_SECURE AS "isSecure" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml index a642d1e..d0c7e1b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml @@ -15,10 +15,14 @@ - ID AS id, DEPTID AS deptid, BASE_URL AS baseUrl, APPID AS appid, APPKEY AS appkey, SUBSCRIBE_URL AS subscribeUrl, APPNAME AS appname + ID AS id, DEPTID AS deptid, BASE_URL AS "baseUrl", APPID AS appid, APPKEY AS appkey, + SUBSCRIBE_URL AS "subscribeUrl", APPNAME AS appname + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml index db0d728..f69e756 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml @@ -4,18 +4,18 @@ - - - - - - - + + + + + + + - ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS wellType, DEVICE_TYPE AS deviceType, area, MAP AS map + ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS "wellType", DEVICE_TYPE AS "deviceType", area, MAP AS map diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml index 1c84ca3..2bc0bfd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml @@ -13,7 +13,7 @@ - DEVICE_ID AS deviceId, CONCEN_ID AS concenId, STATUS AS status, ACTIVE AS active, TS AS ts + DEVICE_ID AS "deviceId", CONCEN_ID AS "concenId", STATUS AS status, ACTIVE AS active, TS AS ts diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4622bdf..e12c713 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -16,26 +16,50 @@ ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, - - as INSTALLDATE + + + + AS "INSTALLDATE" - - DATE_FORMAT - (INSTALLDATE,'%Y-%m-%d') + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') - - to_char - (INSTALLDATE,'yyyy-MM-dd') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - - ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version + + + '%' ||#{keywords}||'%' + + + CONCAT('%',#{keywords},'%') + + + + CONCAT('%',#{keywords},'%') + + + + str_to_date(${paramStr},'%Y-%m-%d %H:%i') + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - DATE_FORMAT - (UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - - '%' ||#{keywords}||'%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - #{endTime} - - - #{beginTime} - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - + - d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate", ONLINE_STATE AS "onlineState", t.TYPE_NAME AS "typeName" + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 9f1b06f..4943869 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -12,7 +12,7 @@ - ID AS id, MODEL_NAME AS modelName, DEVICE_TYPE AS deviceType, COMMUNICATION AS communication + ID AS id, MODEL_NAME AS "modelName", DEVICE_TYPE AS "deviceType", COMMUNICATION AS communication SELECT bdm.ID AS id, - bdm.MODEL_NAME AS modelName, + bdm.MODEL_NAME AS "modelName", bdm.COMMUNICATION AS communication, - bdm.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName + bdm.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName" FROM base_device_models bdm LEFT JOIN base_device_type bdt ON bdm.DEVICE_TYPE = bdt.ID @@ -40,13 +40,14 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml index fce044c..0ed47e1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml @@ -17,7 +17,8 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts @@ -31,7 +32,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java index c7df1cb..979e8be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java @@ -21,11 +21,12 @@ /** * 查询集中器列表 * - * @param page 分页参数 + * @param page 分页参数 * @param dataScope 数据权限 - * @param keywords 关键字 - * @param status 状态 + * @param keywords 关键字 + * @param status 状态 * @return */ - List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("status") String status); + List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, + @Param("keywords") String keywords, @Param("status") String status); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java index 798d395..9517a30 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java @@ -16,7 +16,9 @@ */ public interface BusNbDeviceMapper extends BaseMapper { List getListByDevcode(@Param("devcode") String devcode); + List getByNodeId(@Param("nodeid") String nodeid); + List getByDevcode(@Param("devcode") String devcode); boolean deleteByNbDeviceId(String nbDeviceId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java index 9a3e919..302f95e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java @@ -14,5 +14,5 @@ */ public interface DeviceConcentratorMapper extends BaseMapper { - void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId")Long concId); + void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId") Long concId); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 6b1c6bf..5918e6c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -18,17 +18,19 @@ - ID AS id, DEVICE_ID AS deviceId, FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + ID AS id, DEVICE_ID AS "deviceId", FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + - c.ID AS id, c.DEVICE_ID AS deviceId, c.FRAMECONTENT AS framecontent, + c.ID AS id, c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS framecontent, c.SENSORID AS sensorid, c.SENSORCODE AS sensorcode, c.STATUS AS status, c.ATTEMPTSMAX AS attemptsmax, c.ATTEMPTSCURRENT AS attemptscurrent, c.SENDTIME AS sendtime, c.WRITETIME AS writetime,s.id AS deptid, - s.full_name AS deptName,a.WELL_CODE AS wellCode,d.DEVCODE AS devcode, - d.DEVICE_NAME AS deviceName,d.DEVICE_TYPE AS deviceType, - t.TYPE_NAME AS deviceTypeName + s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS devcode, + d.DEVICE_NAME AS "deviceName",d.DEVICE_TYPE AS "deviceType", + t.TYPE_NAME AS "deviceTypeName" + '%' || #{keywords}|| '%' @@ -39,26 +41,18 @@ CONCAT('%',#{keywords},'%') - - #{keywords} + + ${paramStr} - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - #{sensorid} - - - CONCAT(#{sensorid}) - - - CONCAT(#{sensorid}) - - select FROM bus_config c LEFT JOIN bus_device_well b ON @@ -68,55 +62,43 @@ d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 AND c.sensorid = - + + + and d.DEVCODE like and s.ID = - + + + ORDER by writetime DESC - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml index d2d0214..c13eab4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml @@ -19,27 +19,44 @@ + + '%' || #{devcode}|| '%' + + + CONCAT('%',#{devcode},'%') + + + CONCAT('%',#{devcode},'%') + + - ID AS id, NB_DEVICE_ID AS nbDeviceId, DEVCODE AS devcode, VERIFY_CODE AS verifyCode, - NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS manufacturerId, - MANUFACTURER_NAME AS manufacturerName, DEVICE_TYPE AS deviceType, MODEL AS model, - PROTOCAL_TYPE AS protocalType, IS_SECURE AS isSecure + ID AS id, NB_DEVICE_ID AS "nbDeviceId", DEVCODE AS devcode, VERIFY_CODE AS "verifyCode", + NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS "manufacturerId", + MANUFACTURER_NAME AS "manufacturerName", DEVICE_TYPE AS "deviceType", MODEL AS model, + PROTOCAL_TYPE AS "protocalType", IS_SECURE AS "isSecure" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml index a642d1e..d0c7e1b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml @@ -15,10 +15,14 @@ - ID AS id, DEPTID AS deptid, BASE_URL AS baseUrl, APPID AS appid, APPKEY AS appkey, SUBSCRIBE_URL AS subscribeUrl, APPNAME AS appname + ID AS id, DEPTID AS deptid, BASE_URL AS "baseUrl", APPID AS appid, APPKEY AS appkey, + SUBSCRIBE_URL AS "subscribeUrl", APPNAME AS appname + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml index db0d728..f69e756 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml @@ -4,18 +4,18 @@ - - - - - - - + + + + + + + - ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS wellType, DEVICE_TYPE AS deviceType, area, MAP AS map + ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS "wellType", DEVICE_TYPE AS "deviceType", area, MAP AS map diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml index 1c84ca3..2bc0bfd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml @@ -13,7 +13,7 @@ - DEVICE_ID AS deviceId, CONCEN_ID AS concenId, STATUS AS status, ACTIVE AS active, TS AS ts + DEVICE_ID AS "deviceId", CONCEN_ID AS "concenId", STATUS AS status, ACTIVE AS active, TS AS ts diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4622bdf..e12c713 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -16,26 +16,50 @@ ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, - - as INSTALLDATE + + + + AS "INSTALLDATE" - - DATE_FORMAT - (INSTALLDATE,'%Y-%m-%d') + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') - - to_char - (INSTALLDATE,'yyyy-MM-dd') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - - ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version + + + '%' ||#{keywords}||'%' + + + CONCAT('%',#{keywords},'%') + + + + CONCAT('%',#{keywords},'%') + + + + str_to_date(${paramStr},'%Y-%m-%d %H:%i') + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - DATE_FORMAT - (UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - - '%' ||#{keywords}||'%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - #{endTime} - - - #{beginTime} - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - + - d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate", ONLINE_STATE AS "onlineState", t.TYPE_NAME AS "typeName" + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 9f1b06f..4943869 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -12,7 +12,7 @@ - ID AS id, MODEL_NAME AS modelName, DEVICE_TYPE AS deviceType, COMMUNICATION AS communication + ID AS id, MODEL_NAME AS "modelName", DEVICE_TYPE AS "deviceType", COMMUNICATION AS communication SELECT bdm.ID AS id, - bdm.MODEL_NAME AS modelName, + bdm.MODEL_NAME AS "modelName", bdm.COMMUNICATION AS communication, - bdm.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName + bdm.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName" FROM base_device_models bdm LEFT JOIN base_device_type bdt ON bdm.DEVICE_TYPE = bdt.ID @@ -40,13 +40,14 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml index fce044c..0ed47e1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml @@ -17,7 +17,8 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts @@ -31,7 +32,7 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java index c7df1cb..979e8be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java @@ -21,11 +21,12 @@ /** * 查询集中器列表 * - * @param page 分页参数 + * @param page 分页参数 * @param dataScope 数据权限 - * @param keywords 关键字 - * @param status 状态 + * @param keywords 关键字 + * @param status 状态 * @return */ - List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("status") String status); + List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, + @Param("keywords") String keywords, @Param("status") String status); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java index 798d395..9517a30 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java @@ -16,7 +16,9 @@ */ public interface BusNbDeviceMapper extends BaseMapper { List getListByDevcode(@Param("devcode") String devcode); + List getByNodeId(@Param("nodeid") String nodeid); + List getByDevcode(@Param("devcode") String devcode); boolean deleteByNbDeviceId(String nbDeviceId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java index 9a3e919..302f95e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java @@ -14,5 +14,5 @@ */ public interface DeviceConcentratorMapper extends BaseMapper { - void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId")Long concId); + void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId") Long concId); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 6b1c6bf..5918e6c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -18,17 +18,19 @@ - ID AS id, DEVICE_ID AS deviceId, FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + ID AS id, DEVICE_ID AS "deviceId", FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + - c.ID AS id, c.DEVICE_ID AS deviceId, c.FRAMECONTENT AS framecontent, + c.ID AS id, c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS framecontent, c.SENSORID AS sensorid, c.SENSORCODE AS sensorcode, c.STATUS AS status, c.ATTEMPTSMAX AS attemptsmax, c.ATTEMPTSCURRENT AS attemptscurrent, c.SENDTIME AS sendtime, c.WRITETIME AS writetime,s.id AS deptid, - s.full_name AS deptName,a.WELL_CODE AS wellCode,d.DEVCODE AS devcode, - d.DEVICE_NAME AS deviceName,d.DEVICE_TYPE AS deviceType, - t.TYPE_NAME AS deviceTypeName + s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS devcode, + d.DEVICE_NAME AS "deviceName",d.DEVICE_TYPE AS "deviceType", + t.TYPE_NAME AS "deviceTypeName" + '%' || #{keywords}|| '%' @@ -39,26 +41,18 @@ CONCAT('%',#{keywords},'%') - - #{keywords} + + ${paramStr} - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - #{sensorid} - - - CONCAT(#{sensorid}) - - - CONCAT(#{sensorid}) - - select FROM bus_config c LEFT JOIN bus_device_well b ON @@ -68,55 +62,43 @@ d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 AND c.sensorid = - + + + and d.DEVCODE like and s.ID = - + + + ORDER by writetime DESC - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml index d2d0214..c13eab4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml @@ -19,27 +19,44 @@ + + '%' || #{devcode}|| '%' + + + CONCAT('%',#{devcode},'%') + + + CONCAT('%',#{devcode},'%') + + - ID AS id, NB_DEVICE_ID AS nbDeviceId, DEVCODE AS devcode, VERIFY_CODE AS verifyCode, - NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS manufacturerId, - MANUFACTURER_NAME AS manufacturerName, DEVICE_TYPE AS deviceType, MODEL AS model, - PROTOCAL_TYPE AS protocalType, IS_SECURE AS isSecure + ID AS id, NB_DEVICE_ID AS "nbDeviceId", DEVCODE AS devcode, VERIFY_CODE AS "verifyCode", + NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS "manufacturerId", + MANUFACTURER_NAME AS "manufacturerName", DEVICE_TYPE AS "deviceType", MODEL AS model, + PROTOCAL_TYPE AS "protocalType", IS_SECURE AS "isSecure" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml index a642d1e..d0c7e1b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml @@ -15,10 +15,14 @@ - ID AS id, DEPTID AS deptid, BASE_URL AS baseUrl, APPID AS appid, APPKEY AS appkey, SUBSCRIBE_URL AS subscribeUrl, APPNAME AS appname + ID AS id, DEPTID AS deptid, BASE_URL AS "baseUrl", APPID AS appid, APPKEY AS appkey, + SUBSCRIBE_URL AS "subscribeUrl", APPNAME AS appname + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml index db0d728..f69e756 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml @@ -4,18 +4,18 @@ - - - - - - - + + + + + + + - ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS wellType, DEVICE_TYPE AS deviceType, area, MAP AS map + ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS "wellType", DEVICE_TYPE AS "deviceType", area, MAP AS map diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml index 1c84ca3..2bc0bfd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml @@ -13,7 +13,7 @@ - DEVICE_ID AS deviceId, CONCEN_ID AS concenId, STATUS AS status, ACTIVE AS active, TS AS ts + DEVICE_ID AS "deviceId", CONCEN_ID AS "concenId", STATUS AS status, ACTIVE AS active, TS AS ts diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4622bdf..e12c713 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -16,26 +16,50 @@ ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, - - as INSTALLDATE + + + + AS "INSTALLDATE" - - DATE_FORMAT - (INSTALLDATE,'%Y-%m-%d') + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') - - to_char - (INSTALLDATE,'yyyy-MM-dd') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - - ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version + + + '%' ||#{keywords}||'%' + + + CONCAT('%',#{keywords},'%') + + + + CONCAT('%',#{keywords},'%') + + + + str_to_date(${paramStr},'%Y-%m-%d %H:%i') + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - DATE_FORMAT - (UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - - '%' ||#{keywords}||'%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - #{endTime} - - - #{beginTime} - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - + - d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate", ONLINE_STATE AS "onlineState", t.TYPE_NAME AS "typeName" + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 9f1b06f..4943869 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -12,7 +12,7 @@ - ID AS id, MODEL_NAME AS modelName, DEVICE_TYPE AS deviceType, COMMUNICATION AS communication + ID AS id, MODEL_NAME AS "modelName", DEVICE_TYPE AS "deviceType", COMMUNICATION AS communication SELECT bdm.ID AS id, - bdm.MODEL_NAME AS modelName, + bdm.MODEL_NAME AS "modelName", bdm.COMMUNICATION AS communication, - bdm.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName + bdm.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName" FROM base_device_models bdm LEFT JOIN base_device_type bdt ON bdm.DEVICE_TYPE = bdt.ID @@ -40,13 +40,14 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml index fce044c..0ed47e1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml @@ -17,7 +17,8 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts @@ -31,7 +32,7 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index 44755e4..9bd5107 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -12,10 +12,11 @@ - DEVICE_ID AS deviceId, WELL_ID AS wellId, TS AS ts, VALID AS valid + DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid UPDATE bus_device_well SET WELL_ID = #{wellId} WHERE DEVICE_ID = #{deviceId} + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java index c7df1cb..979e8be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java @@ -21,11 +21,12 @@ /** * 查询集中器列表 * - * @param page 分页参数 + * @param page 分页参数 * @param dataScope 数据权限 - * @param keywords 关键字 - * @param status 状态 + * @param keywords 关键字 + * @param status 状态 * @return */ - List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("status") String status); + List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, + @Param("keywords") String keywords, @Param("status") String status); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java index 798d395..9517a30 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java @@ -16,7 +16,9 @@ */ public interface BusNbDeviceMapper extends BaseMapper { List getListByDevcode(@Param("devcode") String devcode); + List getByNodeId(@Param("nodeid") String nodeid); + List getByDevcode(@Param("devcode") String devcode); boolean deleteByNbDeviceId(String nbDeviceId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java index 9a3e919..302f95e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java @@ -14,5 +14,5 @@ */ public interface DeviceConcentratorMapper extends BaseMapper { - void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId")Long concId); + void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId") Long concId); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 6b1c6bf..5918e6c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -18,17 +18,19 @@ - ID AS id, DEVICE_ID AS deviceId, FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + ID AS id, DEVICE_ID AS "deviceId", FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + - c.ID AS id, c.DEVICE_ID AS deviceId, c.FRAMECONTENT AS framecontent, + c.ID AS id, c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS framecontent, c.SENSORID AS sensorid, c.SENSORCODE AS sensorcode, c.STATUS AS status, c.ATTEMPTSMAX AS attemptsmax, c.ATTEMPTSCURRENT AS attemptscurrent, c.SENDTIME AS sendtime, c.WRITETIME AS writetime,s.id AS deptid, - s.full_name AS deptName,a.WELL_CODE AS wellCode,d.DEVCODE AS devcode, - d.DEVICE_NAME AS deviceName,d.DEVICE_TYPE AS deviceType, - t.TYPE_NAME AS deviceTypeName + s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS devcode, + d.DEVICE_NAME AS "deviceName",d.DEVICE_TYPE AS "deviceType", + t.TYPE_NAME AS "deviceTypeName" + '%' || #{keywords}|| '%' @@ -39,26 +41,18 @@ CONCAT('%',#{keywords},'%') - - #{keywords} + + ${paramStr} - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - #{sensorid} - - - CONCAT(#{sensorid}) - - - CONCAT(#{sensorid}) - - select FROM bus_config c LEFT JOIN bus_device_well b ON @@ -68,55 +62,43 @@ d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 AND c.sensorid = - + + + and d.DEVCODE like and s.ID = - + + + ORDER by writetime DESC - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml index d2d0214..c13eab4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml @@ -19,27 +19,44 @@ + + '%' || #{devcode}|| '%' + + + CONCAT('%',#{devcode},'%') + + + CONCAT('%',#{devcode},'%') + + - ID AS id, NB_DEVICE_ID AS nbDeviceId, DEVCODE AS devcode, VERIFY_CODE AS verifyCode, - NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS manufacturerId, - MANUFACTURER_NAME AS manufacturerName, DEVICE_TYPE AS deviceType, MODEL AS model, - PROTOCAL_TYPE AS protocalType, IS_SECURE AS isSecure + ID AS id, NB_DEVICE_ID AS "nbDeviceId", DEVCODE AS devcode, VERIFY_CODE AS "verifyCode", + NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS "manufacturerId", + MANUFACTURER_NAME AS "manufacturerName", DEVICE_TYPE AS "deviceType", MODEL AS model, + PROTOCAL_TYPE AS "protocalType", IS_SECURE AS "isSecure" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml index a642d1e..d0c7e1b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml @@ -15,10 +15,14 @@ - ID AS id, DEPTID AS deptid, BASE_URL AS baseUrl, APPID AS appid, APPKEY AS appkey, SUBSCRIBE_URL AS subscribeUrl, APPNAME AS appname + ID AS id, DEPTID AS deptid, BASE_URL AS "baseUrl", APPID AS appid, APPKEY AS appkey, + SUBSCRIBE_URL AS "subscribeUrl", APPNAME AS appname + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml index db0d728..f69e756 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml @@ -4,18 +4,18 @@ - - - - - - - + + + + + + + - ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS wellType, DEVICE_TYPE AS deviceType, area, MAP AS map + ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS "wellType", DEVICE_TYPE AS "deviceType", area, MAP AS map diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml index 1c84ca3..2bc0bfd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml @@ -13,7 +13,7 @@ - DEVICE_ID AS deviceId, CONCEN_ID AS concenId, STATUS AS status, ACTIVE AS active, TS AS ts + DEVICE_ID AS "deviceId", CONCEN_ID AS "concenId", STATUS AS status, ACTIVE AS active, TS AS ts diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4622bdf..e12c713 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -16,26 +16,50 @@ ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, - - as INSTALLDATE + + + + AS "INSTALLDATE" - - DATE_FORMAT - (INSTALLDATE,'%Y-%m-%d') + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') - - to_char - (INSTALLDATE,'yyyy-MM-dd') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - - ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version + + + '%' ||#{keywords}||'%' + + + CONCAT('%',#{keywords},'%') + + + + CONCAT('%',#{keywords},'%') + + + + str_to_date(${paramStr},'%Y-%m-%d %H:%i') + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - DATE_FORMAT - (UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - - '%' ||#{keywords}||'%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - #{endTime} - - - #{beginTime} - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - + - d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate", ONLINE_STATE AS "onlineState", t.TYPE_NAME AS "typeName" + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 9f1b06f..4943869 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -12,7 +12,7 @@ - ID AS id, MODEL_NAME AS modelName, DEVICE_TYPE AS deviceType, COMMUNICATION AS communication + ID AS id, MODEL_NAME AS "modelName", DEVICE_TYPE AS "deviceType", COMMUNICATION AS communication SELECT bdm.ID AS id, - bdm.MODEL_NAME AS modelName, + bdm.MODEL_NAME AS "modelName", bdm.COMMUNICATION AS communication, - bdm.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName + bdm.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName" FROM base_device_models bdm LEFT JOIN base_device_type bdt ON bdm.DEVICE_TYPE = bdt.ID @@ -40,13 +40,14 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml index fce044c..0ed47e1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml @@ -17,7 +17,8 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts @@ -31,7 +32,7 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index 44755e4..9bd5107 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -12,10 +12,11 @@ - DEVICE_ID AS deviceId, WELL_ID AS wellId, TS AS ts, VALID AS valid + DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid UPDATE bus_device_well SET WELL_ID = #{wellId} WHERE DEVICE_ID = #{deviceId} + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java index 1c0ea8e..2960e16 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java @@ -11,7 +11,7 @@ put("concencode","集中器编号"); put("simid","SIM卡号"); put("position","集中器位置"); - put("lat"," 纬度"); + put("lat","纬度"); put("lng","经度"); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java index c7df1cb..979e8be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java @@ -21,11 +21,12 @@ /** * 查询集中器列表 * - * @param page 分页参数 + * @param page 分页参数 * @param dataScope 数据权限 - * @param keywords 关键字 - * @param status 状态 + * @param keywords 关键字 + * @param status 状态 * @return */ - List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("status") String status); + List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, + @Param("keywords") String keywords, @Param("status") String status); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java index 798d395..9517a30 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java @@ -16,7 +16,9 @@ */ public interface BusNbDeviceMapper extends BaseMapper { List getListByDevcode(@Param("devcode") String devcode); + List getByNodeId(@Param("nodeid") String nodeid); + List getByDevcode(@Param("devcode") String devcode); boolean deleteByNbDeviceId(String nbDeviceId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java index 9a3e919..302f95e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java @@ -14,5 +14,5 @@ */ public interface DeviceConcentratorMapper extends BaseMapper { - void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId")Long concId); + void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId") Long concId); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 6b1c6bf..5918e6c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -18,17 +18,19 @@ - ID AS id, DEVICE_ID AS deviceId, FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + ID AS id, DEVICE_ID AS "deviceId", FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + - c.ID AS id, c.DEVICE_ID AS deviceId, c.FRAMECONTENT AS framecontent, + c.ID AS id, c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS framecontent, c.SENSORID AS sensorid, c.SENSORCODE AS sensorcode, c.STATUS AS status, c.ATTEMPTSMAX AS attemptsmax, c.ATTEMPTSCURRENT AS attemptscurrent, c.SENDTIME AS sendtime, c.WRITETIME AS writetime,s.id AS deptid, - s.full_name AS deptName,a.WELL_CODE AS wellCode,d.DEVCODE AS devcode, - d.DEVICE_NAME AS deviceName,d.DEVICE_TYPE AS deviceType, - t.TYPE_NAME AS deviceTypeName + s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS devcode, + d.DEVICE_NAME AS "deviceName",d.DEVICE_TYPE AS "deviceType", + t.TYPE_NAME AS "deviceTypeName" + '%' || #{keywords}|| '%' @@ -39,26 +41,18 @@ CONCAT('%',#{keywords},'%') - - #{keywords} + + ${paramStr} - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - #{sensorid} - - - CONCAT(#{sensorid}) - - - CONCAT(#{sensorid}) - - select FROM bus_config c LEFT JOIN bus_device_well b ON @@ -68,55 +62,43 @@ d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 AND c.sensorid = - + + + and d.DEVCODE like and s.ID = - + + + ORDER by writetime DESC - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml index d2d0214..c13eab4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml @@ -19,27 +19,44 @@ + + '%' || #{devcode}|| '%' + + + CONCAT('%',#{devcode},'%') + + + CONCAT('%',#{devcode},'%') + + - ID AS id, NB_DEVICE_ID AS nbDeviceId, DEVCODE AS devcode, VERIFY_CODE AS verifyCode, - NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS manufacturerId, - MANUFACTURER_NAME AS manufacturerName, DEVICE_TYPE AS deviceType, MODEL AS model, - PROTOCAL_TYPE AS protocalType, IS_SECURE AS isSecure + ID AS id, NB_DEVICE_ID AS "nbDeviceId", DEVCODE AS devcode, VERIFY_CODE AS "verifyCode", + NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS "manufacturerId", + MANUFACTURER_NAME AS "manufacturerName", DEVICE_TYPE AS "deviceType", MODEL AS model, + PROTOCAL_TYPE AS "protocalType", IS_SECURE AS "isSecure" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml index a642d1e..d0c7e1b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml @@ -15,10 +15,14 @@ - ID AS id, DEPTID AS deptid, BASE_URL AS baseUrl, APPID AS appid, APPKEY AS appkey, SUBSCRIBE_URL AS subscribeUrl, APPNAME AS appname + ID AS id, DEPTID AS deptid, BASE_URL AS "baseUrl", APPID AS appid, APPKEY AS appkey, + SUBSCRIBE_URL AS "subscribeUrl", APPNAME AS appname + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml index db0d728..f69e756 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml @@ -4,18 +4,18 @@ - - - - - - - + + + + + + + - ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS wellType, DEVICE_TYPE AS deviceType, area, MAP AS map + ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS "wellType", DEVICE_TYPE AS "deviceType", area, MAP AS map diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml index 1c84ca3..2bc0bfd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml @@ -13,7 +13,7 @@ - DEVICE_ID AS deviceId, CONCEN_ID AS concenId, STATUS AS status, ACTIVE AS active, TS AS ts + DEVICE_ID AS "deviceId", CONCEN_ID AS "concenId", STATUS AS status, ACTIVE AS active, TS AS ts diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4622bdf..e12c713 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -16,26 +16,50 @@ ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, - - as INSTALLDATE + + + + AS "INSTALLDATE" - - DATE_FORMAT - (INSTALLDATE,'%Y-%m-%d') + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') - - to_char - (INSTALLDATE,'yyyy-MM-dd') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - - ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version + + + '%' ||#{keywords}||'%' + + + CONCAT('%',#{keywords},'%') + + + + CONCAT('%',#{keywords},'%') + + + + str_to_date(${paramStr},'%Y-%m-%d %H:%i') + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - DATE_FORMAT - (UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - - '%' ||#{keywords}||'%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - #{endTime} - - - #{beginTime} - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - + - d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate", ONLINE_STATE AS "onlineState", t.TYPE_NAME AS "typeName" + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 9f1b06f..4943869 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -12,7 +12,7 @@ - ID AS id, MODEL_NAME AS modelName, DEVICE_TYPE AS deviceType, COMMUNICATION AS communication + ID AS id, MODEL_NAME AS "modelName", DEVICE_TYPE AS "deviceType", COMMUNICATION AS communication SELECT bdm.ID AS id, - bdm.MODEL_NAME AS modelName, + bdm.MODEL_NAME AS "modelName", bdm.COMMUNICATION AS communication, - bdm.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName + bdm.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName" FROM base_device_models bdm LEFT JOIN base_device_type bdt ON bdm.DEVICE_TYPE = bdt.ID @@ -40,13 +40,14 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml index fce044c..0ed47e1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml @@ -17,7 +17,8 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts @@ -31,7 +32,7 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index 44755e4..9bd5107 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -12,10 +12,11 @@ - DEVICE_ID AS deviceId, WELL_ID AS wellId, TS AS ts, VALID AS valid + DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid UPDATE bus_device_well SET WELL_ID = #{wellId} WHERE DEVICE_ID = #{deviceId} + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java index 1c0ea8e..2960e16 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java @@ -11,7 +11,7 @@ put("concencode","集中器编号"); put("simid","SIM卡号"); put("position","集中器位置"); - put("lat"," 纬度"); + put("lat","纬度"); put("lng","经度"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java deleted file mode 100644 index 4064d07..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.casic.missiles.modular.system.model; - -import lombok.Data; - -/** - * @author cz - * @date 2022-6-22 - */ -@Data -public class DeviceAddParam { - private String deviceName; - private String devcode; - private String deviceType; - private String wellCode; - private String modelId; - private String installDate; - private String concenCode; - private String installHe; -} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java index c7df1cb..979e8be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java @@ -21,11 +21,12 @@ /** * 查询集中器列表 * - * @param page 分页参数 + * @param page 分页参数 * @param dataScope 数据权限 - * @param keywords 关键字 - * @param status 状态 + * @param keywords 关键字 + * @param status 状态 * @return */ - List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("status") String status); + List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, + @Param("keywords") String keywords, @Param("status") String status); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java index 798d395..9517a30 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java @@ -16,7 +16,9 @@ */ public interface BusNbDeviceMapper extends BaseMapper { List getListByDevcode(@Param("devcode") String devcode); + List getByNodeId(@Param("nodeid") String nodeid); + List getByDevcode(@Param("devcode") String devcode); boolean deleteByNbDeviceId(String nbDeviceId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java index 9a3e919..302f95e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java @@ -14,5 +14,5 @@ */ public interface DeviceConcentratorMapper extends BaseMapper { - void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId")Long concId); + void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId") Long concId); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 6b1c6bf..5918e6c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -18,17 +18,19 @@ - ID AS id, DEVICE_ID AS deviceId, FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + ID AS id, DEVICE_ID AS "deviceId", FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + - c.ID AS id, c.DEVICE_ID AS deviceId, c.FRAMECONTENT AS framecontent, + c.ID AS id, c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS framecontent, c.SENSORID AS sensorid, c.SENSORCODE AS sensorcode, c.STATUS AS status, c.ATTEMPTSMAX AS attemptsmax, c.ATTEMPTSCURRENT AS attemptscurrent, c.SENDTIME AS sendtime, c.WRITETIME AS writetime,s.id AS deptid, - s.full_name AS deptName,a.WELL_CODE AS wellCode,d.DEVCODE AS devcode, - d.DEVICE_NAME AS deviceName,d.DEVICE_TYPE AS deviceType, - t.TYPE_NAME AS deviceTypeName + s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS devcode, + d.DEVICE_NAME AS "deviceName",d.DEVICE_TYPE AS "deviceType", + t.TYPE_NAME AS "deviceTypeName" + '%' || #{keywords}|| '%' @@ -39,26 +41,18 @@ CONCAT('%',#{keywords},'%') - - #{keywords} + + ${paramStr} - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - #{sensorid} - - - CONCAT(#{sensorid}) - - - CONCAT(#{sensorid}) - - select FROM bus_config c LEFT JOIN bus_device_well b ON @@ -68,55 +62,43 @@ d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 AND c.sensorid = - + + + and d.DEVCODE like and s.ID = - + + + ORDER by writetime DESC - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml index d2d0214..c13eab4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml @@ -19,27 +19,44 @@ + + '%' || #{devcode}|| '%' + + + CONCAT('%',#{devcode},'%') + + + CONCAT('%',#{devcode},'%') + + - ID AS id, NB_DEVICE_ID AS nbDeviceId, DEVCODE AS devcode, VERIFY_CODE AS verifyCode, - NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS manufacturerId, - MANUFACTURER_NAME AS manufacturerName, DEVICE_TYPE AS deviceType, MODEL AS model, - PROTOCAL_TYPE AS protocalType, IS_SECURE AS isSecure + ID AS id, NB_DEVICE_ID AS "nbDeviceId", DEVCODE AS devcode, VERIFY_CODE AS "verifyCode", + NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS "manufacturerId", + MANUFACTURER_NAME AS "manufacturerName", DEVICE_TYPE AS "deviceType", MODEL AS model, + PROTOCAL_TYPE AS "protocalType", IS_SECURE AS "isSecure" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml index a642d1e..d0c7e1b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml @@ -15,10 +15,14 @@ - ID AS id, DEPTID AS deptid, BASE_URL AS baseUrl, APPID AS appid, APPKEY AS appkey, SUBSCRIBE_URL AS subscribeUrl, APPNAME AS appname + ID AS id, DEPTID AS deptid, BASE_URL AS "baseUrl", APPID AS appid, APPKEY AS appkey, + SUBSCRIBE_URL AS "subscribeUrl", APPNAME AS appname + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml index db0d728..f69e756 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml @@ -4,18 +4,18 @@ - - - - - - - + + + + + + + - ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS wellType, DEVICE_TYPE AS deviceType, area, MAP AS map + ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS "wellType", DEVICE_TYPE AS "deviceType", area, MAP AS map diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml index 1c84ca3..2bc0bfd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml @@ -13,7 +13,7 @@ - DEVICE_ID AS deviceId, CONCEN_ID AS concenId, STATUS AS status, ACTIVE AS active, TS AS ts + DEVICE_ID AS "deviceId", CONCEN_ID AS "concenId", STATUS AS status, ACTIVE AS active, TS AS ts diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4622bdf..e12c713 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -16,26 +16,50 @@ ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, - - as INSTALLDATE + + + + AS "INSTALLDATE" - - DATE_FORMAT - (INSTALLDATE,'%Y-%m-%d') + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') - - to_char - (INSTALLDATE,'yyyy-MM-dd') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - - ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version + + + '%' ||#{keywords}||'%' + + + CONCAT('%',#{keywords},'%') + + + + CONCAT('%',#{keywords},'%') + + + + str_to_date(${paramStr},'%Y-%m-%d %H:%i') + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - DATE_FORMAT - (UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - - '%' ||#{keywords}||'%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - #{endTime} - - - #{beginTime} - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - + - d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate", ONLINE_STATE AS "onlineState", t.TYPE_NAME AS "typeName" + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 9f1b06f..4943869 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -12,7 +12,7 @@ - ID AS id, MODEL_NAME AS modelName, DEVICE_TYPE AS deviceType, COMMUNICATION AS communication + ID AS id, MODEL_NAME AS "modelName", DEVICE_TYPE AS "deviceType", COMMUNICATION AS communication SELECT bdm.ID AS id, - bdm.MODEL_NAME AS modelName, + bdm.MODEL_NAME AS "modelName", bdm.COMMUNICATION AS communication, - bdm.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName + bdm.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName" FROM base_device_models bdm LEFT JOIN base_device_type bdt ON bdm.DEVICE_TYPE = bdt.ID @@ -40,13 +40,14 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml index fce044c..0ed47e1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml @@ -17,7 +17,8 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts @@ -31,7 +32,7 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index 44755e4..9bd5107 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -12,10 +12,11 @@ - DEVICE_ID AS deviceId, WELL_ID AS wellId, TS AS ts, VALID AS valid + DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid UPDATE bus_device_well SET WELL_ID = #{wellId} WHERE DEVICE_ID = #{deviceId} + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java index 1c0ea8e..2960e16 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java @@ -11,7 +11,7 @@ put("concencode","集中器编号"); put("simid","SIM卡号"); put("position","集中器位置"); - put("lat"," 纬度"); + put("lat","纬度"); put("lng","经度"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java deleted file mode 100644 index 4064d07..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.casic.missiles.modular.system.model; - -import lombok.Data; - -/** - * @author cz - * @date 2022-6-22 - */ -@Data -public class DeviceAddParam { - private String deviceName; - private String devcode; - private String deviceType; - private String wellCode; - private String modelId; - private String installDate; - private String concenCode; - private String installHe; -} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 21df9e4..1504adb 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -266,7 +266,7 @@ this.setWellCode(busWellInfo.getWellCode()); this.setWellName(busWellInfo.getWellName()); this.setWellType(busWellInfo.getWellType()); - this.setDeptid(busWellInfo.getDeptid()); + this.setDeptid(busWellInfo.getDeptid().toString()); this.setDeep(busWellInfo.getDeep()); this.setCoordinateX(busWellInfo.getCoordinateX()); this.setCoordinateY(busWellInfo.getCoordinateY()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java index c7df1cb..979e8be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java @@ -21,11 +21,12 @@ /** * 查询集中器列表 * - * @param page 分页参数 + * @param page 分页参数 * @param dataScope 数据权限 - * @param keywords 关键字 - * @param status 状态 + * @param keywords 关键字 + * @param status 状态 * @return */ - List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("status") String status); + List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, + @Param("keywords") String keywords, @Param("status") String status); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java index 798d395..9517a30 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java @@ -16,7 +16,9 @@ */ public interface BusNbDeviceMapper extends BaseMapper { List getListByDevcode(@Param("devcode") String devcode); + List getByNodeId(@Param("nodeid") String nodeid); + List getByDevcode(@Param("devcode") String devcode); boolean deleteByNbDeviceId(String nbDeviceId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java index 9a3e919..302f95e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java @@ -14,5 +14,5 @@ */ public interface DeviceConcentratorMapper extends BaseMapper { - void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId")Long concId); + void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId") Long concId); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 6b1c6bf..5918e6c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -18,17 +18,19 @@ - ID AS id, DEVICE_ID AS deviceId, FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + ID AS id, DEVICE_ID AS "deviceId", FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + - c.ID AS id, c.DEVICE_ID AS deviceId, c.FRAMECONTENT AS framecontent, + c.ID AS id, c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS framecontent, c.SENSORID AS sensorid, c.SENSORCODE AS sensorcode, c.STATUS AS status, c.ATTEMPTSMAX AS attemptsmax, c.ATTEMPTSCURRENT AS attemptscurrent, c.SENDTIME AS sendtime, c.WRITETIME AS writetime,s.id AS deptid, - s.full_name AS deptName,a.WELL_CODE AS wellCode,d.DEVCODE AS devcode, - d.DEVICE_NAME AS deviceName,d.DEVICE_TYPE AS deviceType, - t.TYPE_NAME AS deviceTypeName + s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS devcode, + d.DEVICE_NAME AS "deviceName",d.DEVICE_TYPE AS "deviceType", + t.TYPE_NAME AS "deviceTypeName" + '%' || #{keywords}|| '%' @@ -39,26 +41,18 @@ CONCAT('%',#{keywords},'%') - - #{keywords} + + ${paramStr} - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - #{sensorid} - - - CONCAT(#{sensorid}) - - - CONCAT(#{sensorid}) - - select FROM bus_config c LEFT JOIN bus_device_well b ON @@ -68,55 +62,43 @@ d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 AND c.sensorid = - + + + and d.DEVCODE like and s.ID = - + + + ORDER by writetime DESC - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml index d2d0214..c13eab4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml @@ -19,27 +19,44 @@ + + '%' || #{devcode}|| '%' + + + CONCAT('%',#{devcode},'%') + + + CONCAT('%',#{devcode},'%') + + - ID AS id, NB_DEVICE_ID AS nbDeviceId, DEVCODE AS devcode, VERIFY_CODE AS verifyCode, - NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS manufacturerId, - MANUFACTURER_NAME AS manufacturerName, DEVICE_TYPE AS deviceType, MODEL AS model, - PROTOCAL_TYPE AS protocalType, IS_SECURE AS isSecure + ID AS id, NB_DEVICE_ID AS "nbDeviceId", DEVCODE AS devcode, VERIFY_CODE AS "verifyCode", + NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS "manufacturerId", + MANUFACTURER_NAME AS "manufacturerName", DEVICE_TYPE AS "deviceType", MODEL AS model, + PROTOCAL_TYPE AS "protocalType", IS_SECURE AS "isSecure" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml index a642d1e..d0c7e1b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml @@ -15,10 +15,14 @@ - ID AS id, DEPTID AS deptid, BASE_URL AS baseUrl, APPID AS appid, APPKEY AS appkey, SUBSCRIBE_URL AS subscribeUrl, APPNAME AS appname + ID AS id, DEPTID AS deptid, BASE_URL AS "baseUrl", APPID AS appid, APPKEY AS appkey, + SUBSCRIBE_URL AS "subscribeUrl", APPNAME AS appname + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml index db0d728..f69e756 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml @@ -4,18 +4,18 @@ - - - - - - - + + + + + + + - ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS wellType, DEVICE_TYPE AS deviceType, area, MAP AS map + ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS "wellType", DEVICE_TYPE AS "deviceType", area, MAP AS map diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml index 1c84ca3..2bc0bfd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml @@ -13,7 +13,7 @@ - DEVICE_ID AS deviceId, CONCEN_ID AS concenId, STATUS AS status, ACTIVE AS active, TS AS ts + DEVICE_ID AS "deviceId", CONCEN_ID AS "concenId", STATUS AS status, ACTIVE AS active, TS AS ts diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4622bdf..e12c713 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -16,26 +16,50 @@ ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, - - as INSTALLDATE + + + + AS "INSTALLDATE" - - DATE_FORMAT - (INSTALLDATE,'%Y-%m-%d') + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') - - to_char - (INSTALLDATE,'yyyy-MM-dd') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - - ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version + + + '%' ||#{keywords}||'%' + + + CONCAT('%',#{keywords},'%') + + + + CONCAT('%',#{keywords},'%') + + + + str_to_date(${paramStr},'%Y-%m-%d %H:%i') + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - DATE_FORMAT - (UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - - '%' ||#{keywords}||'%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - #{endTime} - - - #{beginTime} - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - + - d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate", ONLINE_STATE AS "onlineState", t.TYPE_NAME AS "typeName" + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 9f1b06f..4943869 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -12,7 +12,7 @@ - ID AS id, MODEL_NAME AS modelName, DEVICE_TYPE AS deviceType, COMMUNICATION AS communication + ID AS id, MODEL_NAME AS "modelName", DEVICE_TYPE AS "deviceType", COMMUNICATION AS communication SELECT bdm.ID AS id, - bdm.MODEL_NAME AS modelName, + bdm.MODEL_NAME AS "modelName", bdm.COMMUNICATION AS communication, - bdm.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName + bdm.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName" FROM base_device_models bdm LEFT JOIN base_device_type bdt ON bdm.DEVICE_TYPE = bdt.ID @@ -40,13 +40,14 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml index fce044c..0ed47e1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml @@ -17,7 +17,8 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts @@ -31,7 +32,7 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index 44755e4..9bd5107 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -12,10 +12,11 @@ - DEVICE_ID AS deviceId, WELL_ID AS wellId, TS AS ts, VALID AS valid + DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid UPDATE bus_device_well SET WELL_ID = #{wellId} WHERE DEVICE_ID = #{deviceId} + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java index 1c0ea8e..2960e16 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java @@ -11,7 +11,7 @@ put("concencode","集中器编号"); put("simid","SIM卡号"); put("position","集中器位置"); - put("lat"," 纬度"); + put("lat","纬度"); put("lng","经度"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java deleted file mode 100644 index 4064d07..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.casic.missiles.modular.system.model; - -import lombok.Data; - -/** - * @author cz - * @date 2022-6-22 - */ -@Data -public class DeviceAddParam { - private String deviceName; - private String devcode; - private String deviceType; - private String wellCode; - private String modelId; - private String installDate; - private String concenCode; - private String installHe; -} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 21df9e4..1504adb 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -266,7 +266,7 @@ this.setWellCode(busWellInfo.getWellCode()); this.setWellName(busWellInfo.getWellName()); this.setWellType(busWellInfo.getWellType()); - this.setDeptid(busWellInfo.getDeptid()); + this.setDeptid(busWellInfo.getDeptid().toString()); this.setDeep(busWellInfo.getDeep()); this.setCoordinateX(busWellInfo.getCoordinateX()); this.setCoordinateY(busWellInfo.getCoordinateY()); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index 5b2bbff..cd3837a 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -122,7 +122,7 @@ @ExcelProperty("权属单位代码") @NotEmpty(message = "权属单位代码不能为空") @TableField("DEPTID") - private String deptid; + private Long deptid; /** * 路标图片路径集合 */ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java index c7df1cb..979e8be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java @@ -21,11 +21,12 @@ /** * 查询集中器列表 * - * @param page 分页参数 + * @param page 分页参数 * @param dataScope 数据权限 - * @param keywords 关键字 - * @param status 状态 + * @param keywords 关键字 + * @param status 状态 * @return */ - List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("status") String status); + List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, + @Param("keywords") String keywords, @Param("status") String status); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java index 798d395..9517a30 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java @@ -16,7 +16,9 @@ */ public interface BusNbDeviceMapper extends BaseMapper { List getListByDevcode(@Param("devcode") String devcode); + List getByNodeId(@Param("nodeid") String nodeid); + List getByDevcode(@Param("devcode") String devcode); boolean deleteByNbDeviceId(String nbDeviceId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java index 9a3e919..302f95e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java @@ -14,5 +14,5 @@ */ public interface DeviceConcentratorMapper extends BaseMapper { - void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId")Long concId); + void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId") Long concId); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 6b1c6bf..5918e6c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -18,17 +18,19 @@ - ID AS id, DEVICE_ID AS deviceId, FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + ID AS id, DEVICE_ID AS "deviceId", FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + - c.ID AS id, c.DEVICE_ID AS deviceId, c.FRAMECONTENT AS framecontent, + c.ID AS id, c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS framecontent, c.SENSORID AS sensorid, c.SENSORCODE AS sensorcode, c.STATUS AS status, c.ATTEMPTSMAX AS attemptsmax, c.ATTEMPTSCURRENT AS attemptscurrent, c.SENDTIME AS sendtime, c.WRITETIME AS writetime,s.id AS deptid, - s.full_name AS deptName,a.WELL_CODE AS wellCode,d.DEVCODE AS devcode, - d.DEVICE_NAME AS deviceName,d.DEVICE_TYPE AS deviceType, - t.TYPE_NAME AS deviceTypeName + s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS devcode, + d.DEVICE_NAME AS "deviceName",d.DEVICE_TYPE AS "deviceType", + t.TYPE_NAME AS "deviceTypeName" + '%' || #{keywords}|| '%' @@ -39,26 +41,18 @@ CONCAT('%',#{keywords},'%') - - #{keywords} + + ${paramStr} - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - #{sensorid} - - - CONCAT(#{sensorid}) - - - CONCAT(#{sensorid}) - - select FROM bus_config c LEFT JOIN bus_device_well b ON @@ -68,55 +62,43 @@ d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 AND c.sensorid = - + + + and d.DEVCODE like and s.ID = - + + + ORDER by writetime DESC - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml index d2d0214..c13eab4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml @@ -19,27 +19,44 @@ + + '%' || #{devcode}|| '%' + + + CONCAT('%',#{devcode},'%') + + + CONCAT('%',#{devcode},'%') + + - ID AS id, NB_DEVICE_ID AS nbDeviceId, DEVCODE AS devcode, VERIFY_CODE AS verifyCode, - NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS manufacturerId, - MANUFACTURER_NAME AS manufacturerName, DEVICE_TYPE AS deviceType, MODEL AS model, - PROTOCAL_TYPE AS protocalType, IS_SECURE AS isSecure + ID AS id, NB_DEVICE_ID AS "nbDeviceId", DEVCODE AS devcode, VERIFY_CODE AS "verifyCode", + NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS "manufacturerId", + MANUFACTURER_NAME AS "manufacturerName", DEVICE_TYPE AS "deviceType", MODEL AS model, + PROTOCAL_TYPE AS "protocalType", IS_SECURE AS "isSecure" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml index a642d1e..d0c7e1b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml @@ -15,10 +15,14 @@ - ID AS id, DEPTID AS deptid, BASE_URL AS baseUrl, APPID AS appid, APPKEY AS appkey, SUBSCRIBE_URL AS subscribeUrl, APPNAME AS appname + ID AS id, DEPTID AS deptid, BASE_URL AS "baseUrl", APPID AS appid, APPKEY AS appkey, + SUBSCRIBE_URL AS "subscribeUrl", APPNAME AS appname + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml index db0d728..f69e756 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml @@ -4,18 +4,18 @@ - - - - - - - + + + + + + + - ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS wellType, DEVICE_TYPE AS deviceType, area, MAP AS map + ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS "wellType", DEVICE_TYPE AS "deviceType", area, MAP AS map diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml index 1c84ca3..2bc0bfd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml @@ -13,7 +13,7 @@ - DEVICE_ID AS deviceId, CONCEN_ID AS concenId, STATUS AS status, ACTIVE AS active, TS AS ts + DEVICE_ID AS "deviceId", CONCEN_ID AS "concenId", STATUS AS status, ACTIVE AS active, TS AS ts diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4622bdf..e12c713 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -16,26 +16,50 @@ ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, - - as INSTALLDATE + + + + AS "INSTALLDATE" - - DATE_FORMAT - (INSTALLDATE,'%Y-%m-%d') + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') - - to_char - (INSTALLDATE,'yyyy-MM-dd') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - - ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version + + + '%' ||#{keywords}||'%' + + + CONCAT('%',#{keywords},'%') + + + + CONCAT('%',#{keywords},'%') + + + + str_to_date(${paramStr},'%Y-%m-%d %H:%i') + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - DATE_FORMAT - (UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - - '%' ||#{keywords}||'%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - #{endTime} - - - #{beginTime} - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - + - d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate", ONLINE_STATE AS "onlineState", t.TYPE_NAME AS "typeName" + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 9f1b06f..4943869 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -12,7 +12,7 @@ - ID AS id, MODEL_NAME AS modelName, DEVICE_TYPE AS deviceType, COMMUNICATION AS communication + ID AS id, MODEL_NAME AS "modelName", DEVICE_TYPE AS "deviceType", COMMUNICATION AS communication SELECT bdm.ID AS id, - bdm.MODEL_NAME AS modelName, + bdm.MODEL_NAME AS "modelName", bdm.COMMUNICATION AS communication, - bdm.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName + bdm.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName" FROM base_device_models bdm LEFT JOIN base_device_type bdt ON bdm.DEVICE_TYPE = bdt.ID @@ -40,13 +40,14 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml index fce044c..0ed47e1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml @@ -17,7 +17,8 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts @@ -31,7 +32,7 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index 44755e4..9bd5107 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -12,10 +12,11 @@ - DEVICE_ID AS deviceId, WELL_ID AS wellId, TS AS ts, VALID AS valid + DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid UPDATE bus_device_well SET WELL_ID = #{wellId} WHERE DEVICE_ID = #{deviceId} + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java index 1c0ea8e..2960e16 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java @@ -11,7 +11,7 @@ put("concencode","集中器编号"); put("simid","SIM卡号"); put("position","集中器位置"); - put("lat"," 纬度"); + put("lat","纬度"); put("lng","经度"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java deleted file mode 100644 index 4064d07..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.casic.missiles.modular.system.model; - -import lombok.Data; - -/** - * @author cz - * @date 2022-6-22 - */ -@Data -public class DeviceAddParam { - private String deviceName; - private String devcode; - private String deviceType; - private String wellCode; - private String modelId; - private String installDate; - private String concenCode; - private String installHe; -} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 21df9e4..1504adb 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -266,7 +266,7 @@ this.setWellCode(busWellInfo.getWellCode()); this.setWellName(busWellInfo.getWellName()); this.setWellType(busWellInfo.getWellType()); - this.setDeptid(busWellInfo.getDeptid()); + this.setDeptid(busWellInfo.getDeptid().toString()); this.setDeep(busWellInfo.getDeep()); this.setCoordinateX(busWellInfo.getCoordinateX()); this.setCoordinateY(busWellInfo.getCoordinateY()); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index 5b2bbff..cd3837a 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -122,7 +122,7 @@ @ExcelProperty("权属单位代码") @NotEmpty(message = "权属单位代码不能为空") @TableField("DEPTID") - private String deptid; + private Long deptid; /** * 路标图片路径集合 */ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 348c792..3a8c3f7 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -114,7 +114,7 @@ try { if(null==busWellInfo.getResponsibleDept()){ - busWellInfo.setResponsibleDept(busWellInfo.getDeptid()); + busWellInfo.setResponsibleDept(busWellInfo.getDeptid().toString()); } // List deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true); @@ -175,7 +175,7 @@ Utility.convertCoordinate(busWellInfo); if(ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())){ - busWellInfo.setResponsibleDept(busWellInfo.getDeptid()); + busWellInfo.setResponsibleDept(busWellInfo.getDeptid().toString()); } // List deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true); // if(ToolUtil.isNotEmpty(deptTopRoleUsers)){ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java index c7df1cb..979e8be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java @@ -21,11 +21,12 @@ /** * 查询集中器列表 * - * @param page 分页参数 + * @param page 分页参数 * @param dataScope 数据权限 - * @param keywords 关键字 - * @param status 状态 + * @param keywords 关键字 + * @param status 状态 * @return */ - List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("status") String status); + List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, + @Param("keywords") String keywords, @Param("status") String status); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java index 798d395..9517a30 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java @@ -16,7 +16,9 @@ */ public interface BusNbDeviceMapper extends BaseMapper { List getListByDevcode(@Param("devcode") String devcode); + List getByNodeId(@Param("nodeid") String nodeid); + List getByDevcode(@Param("devcode") String devcode); boolean deleteByNbDeviceId(String nbDeviceId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java index 9a3e919..302f95e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java @@ -14,5 +14,5 @@ */ public interface DeviceConcentratorMapper extends BaseMapper { - void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId")Long concId); + void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId") Long concId); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 6b1c6bf..5918e6c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -18,17 +18,19 @@ - ID AS id, DEVICE_ID AS deviceId, FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + ID AS id, DEVICE_ID AS "deviceId", FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + - c.ID AS id, c.DEVICE_ID AS deviceId, c.FRAMECONTENT AS framecontent, + c.ID AS id, c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS framecontent, c.SENSORID AS sensorid, c.SENSORCODE AS sensorcode, c.STATUS AS status, c.ATTEMPTSMAX AS attemptsmax, c.ATTEMPTSCURRENT AS attemptscurrent, c.SENDTIME AS sendtime, c.WRITETIME AS writetime,s.id AS deptid, - s.full_name AS deptName,a.WELL_CODE AS wellCode,d.DEVCODE AS devcode, - d.DEVICE_NAME AS deviceName,d.DEVICE_TYPE AS deviceType, - t.TYPE_NAME AS deviceTypeName + s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS devcode, + d.DEVICE_NAME AS "deviceName",d.DEVICE_TYPE AS "deviceType", + t.TYPE_NAME AS "deviceTypeName" + '%' || #{keywords}|| '%' @@ -39,26 +41,18 @@ CONCAT('%',#{keywords},'%') - - #{keywords} + + ${paramStr} - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - #{sensorid} - - - CONCAT(#{sensorid}) - - - CONCAT(#{sensorid}) - - select FROM bus_config c LEFT JOIN bus_device_well b ON @@ -68,55 +62,43 @@ d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 AND c.sensorid = - + + + and d.DEVCODE like and s.ID = - + + + ORDER by writetime DESC - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml index d2d0214..c13eab4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml @@ -19,27 +19,44 @@ + + '%' || #{devcode}|| '%' + + + CONCAT('%',#{devcode},'%') + + + CONCAT('%',#{devcode},'%') + + - ID AS id, NB_DEVICE_ID AS nbDeviceId, DEVCODE AS devcode, VERIFY_CODE AS verifyCode, - NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS manufacturerId, - MANUFACTURER_NAME AS manufacturerName, DEVICE_TYPE AS deviceType, MODEL AS model, - PROTOCAL_TYPE AS protocalType, IS_SECURE AS isSecure + ID AS id, NB_DEVICE_ID AS "nbDeviceId", DEVCODE AS devcode, VERIFY_CODE AS "verifyCode", + NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS "manufacturerId", + MANUFACTURER_NAME AS "manufacturerName", DEVICE_TYPE AS "deviceType", MODEL AS model, + PROTOCAL_TYPE AS "protocalType", IS_SECURE AS "isSecure" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml index a642d1e..d0c7e1b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml @@ -15,10 +15,14 @@ - ID AS id, DEPTID AS deptid, BASE_URL AS baseUrl, APPID AS appid, APPKEY AS appkey, SUBSCRIBE_URL AS subscribeUrl, APPNAME AS appname + ID AS id, DEPTID AS deptid, BASE_URL AS "baseUrl", APPID AS appid, APPKEY AS appkey, + SUBSCRIBE_URL AS "subscribeUrl", APPNAME AS appname + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml index db0d728..f69e756 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml @@ -4,18 +4,18 @@ - - - - - - - + + + + + + + - ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS wellType, DEVICE_TYPE AS deviceType, area, MAP AS map + ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS "wellType", DEVICE_TYPE AS "deviceType", area, MAP AS map diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml index 1c84ca3..2bc0bfd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml @@ -13,7 +13,7 @@ - DEVICE_ID AS deviceId, CONCEN_ID AS concenId, STATUS AS status, ACTIVE AS active, TS AS ts + DEVICE_ID AS "deviceId", CONCEN_ID AS "concenId", STATUS AS status, ACTIVE AS active, TS AS ts diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4622bdf..e12c713 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -16,26 +16,50 @@ ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, - - as INSTALLDATE + + + + AS "INSTALLDATE" - - DATE_FORMAT - (INSTALLDATE,'%Y-%m-%d') + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') - - to_char - (INSTALLDATE,'yyyy-MM-dd') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - - ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version + + + '%' ||#{keywords}||'%' + + + CONCAT('%',#{keywords},'%') + + + + CONCAT('%',#{keywords},'%') + + + + str_to_date(${paramStr},'%Y-%m-%d %H:%i') + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - DATE_FORMAT - (UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - - '%' ||#{keywords}||'%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - #{endTime} - - - #{beginTime} - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - + - d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate", ONLINE_STATE AS "onlineState", t.TYPE_NAME AS "typeName" + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 9f1b06f..4943869 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -12,7 +12,7 @@ - ID AS id, MODEL_NAME AS modelName, DEVICE_TYPE AS deviceType, COMMUNICATION AS communication + ID AS id, MODEL_NAME AS "modelName", DEVICE_TYPE AS "deviceType", COMMUNICATION AS communication SELECT bdm.ID AS id, - bdm.MODEL_NAME AS modelName, + bdm.MODEL_NAME AS "modelName", bdm.COMMUNICATION AS communication, - bdm.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName + bdm.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName" FROM base_device_models bdm LEFT JOIN base_device_type bdt ON bdm.DEVICE_TYPE = bdt.ID @@ -40,13 +40,14 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml index fce044c..0ed47e1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml @@ -17,7 +17,8 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts @@ -31,7 +32,7 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index 44755e4..9bd5107 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -12,10 +12,11 @@ - DEVICE_ID AS deviceId, WELL_ID AS wellId, TS AS ts, VALID AS valid + DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid UPDATE bus_device_well SET WELL_ID = #{wellId} WHERE DEVICE_ID = #{deviceId} + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java index 1c0ea8e..2960e16 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java @@ -11,7 +11,7 @@ put("concencode","集中器编号"); put("simid","SIM卡号"); put("position","集中器位置"); - put("lat"," 纬度"); + put("lat","纬度"); put("lng","经度"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java deleted file mode 100644 index 4064d07..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.casic.missiles.modular.system.model; - -import lombok.Data; - -/** - * @author cz - * @date 2022-6-22 - */ -@Data -public class DeviceAddParam { - private String deviceName; - private String devcode; - private String deviceType; - private String wellCode; - private String modelId; - private String installDate; - private String concenCode; - private String installHe; -} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 21df9e4..1504adb 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -266,7 +266,7 @@ this.setWellCode(busWellInfo.getWellCode()); this.setWellName(busWellInfo.getWellName()); this.setWellType(busWellInfo.getWellType()); - this.setDeptid(busWellInfo.getDeptid()); + this.setDeptid(busWellInfo.getDeptid().toString()); this.setDeep(busWellInfo.getDeep()); this.setCoordinateX(busWellInfo.getCoordinateX()); this.setCoordinateY(busWellInfo.getCoordinateY()); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index 5b2bbff..cd3837a 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -122,7 +122,7 @@ @ExcelProperty("权属单位代码") @NotEmpty(message = "权属单位代码不能为空") @TableField("DEPTID") - private String deptid; + private Long deptid; /** * 路标图片路径集合 */ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 348c792..3a8c3f7 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -114,7 +114,7 @@ try { if(null==busWellInfo.getResponsibleDept()){ - busWellInfo.setResponsibleDept(busWellInfo.getDeptid()); + busWellInfo.setResponsibleDept(busWellInfo.getDeptid().toString()); } // List deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true); @@ -175,7 +175,7 @@ Utility.convertCoordinate(busWellInfo); if(ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())){ - busWellInfo.setResponsibleDept(busWellInfo.getDeptid()); + busWellInfo.setResponsibleDept(busWellInfo.getDeptid().toString()); } // List deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true); // if(ToolUtil.isNotEmpty(deptTopRoleUsers)){ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java index 7d606a9..89f9586 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java @@ -38,7 +38,7 @@ String getAreaId(@Param("qu") String qu, @Param("area") String area); - String getAreaPId(@Param("id") String id); + String getAreaPId(@Param("id") Long id); List getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c52630c..8117a93 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -304,7 +306,7 @@ QueryWrapper busWellInfoEntityWrapper = new QueryWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE", wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if (busWellInfo != null && StrUtil.isNotEmpty(busWellInfo.getDeptid())) { + if (busWellInfo != null && ObjectUtil.isEmpty(busWellInfo.getDeptid())) { List roleids = new ArrayList<>(); for (SelectDto selectDto : selectDtoList) { if (StrUtil.isNotEmpty(selectDto.getName()) 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 401a28a..9d5d9e2 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 @@ -41,7 +41,7 @@ - COALESCE(SUM(IF(job_status=${numberStatus},1,0)),0) + COALESCE(SUM(CASE WHEN job_status=${numberStatus} THEN 1 ELSE 0 END)) @@ -73,11 +73,8 @@ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') - - + and datediff(now(),aj.create_time) ${paramDay} @@ -85,9 +82,7 @@ - + and date_part(now(),aj.create_time) ${paramDay} @@ -365,7 +360,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java index c7df1cb..979e8be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java @@ -21,11 +21,12 @@ /** * 查询集中器列表 * - * @param page 分页参数 + * @param page 分页参数 * @param dataScope 数据权限 - * @param keywords 关键字 - * @param status 状态 + * @param keywords 关键字 + * @param status 状态 * @return */ - List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("status") String status); + List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, + @Param("keywords") String keywords, @Param("status") String status); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java index 798d395..9517a30 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java @@ -16,7 +16,9 @@ */ public interface BusNbDeviceMapper extends BaseMapper { List getListByDevcode(@Param("devcode") String devcode); + List getByNodeId(@Param("nodeid") String nodeid); + List getByDevcode(@Param("devcode") String devcode); boolean deleteByNbDeviceId(String nbDeviceId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java index 9a3e919..302f95e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java @@ -14,5 +14,5 @@ */ public interface DeviceConcentratorMapper extends BaseMapper { - void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId")Long concId); + void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId") Long concId); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 6b1c6bf..5918e6c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -18,17 +18,19 @@ - ID AS id, DEVICE_ID AS deviceId, FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + ID AS id, DEVICE_ID AS "deviceId", FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + - c.ID AS id, c.DEVICE_ID AS deviceId, c.FRAMECONTENT AS framecontent, + c.ID AS id, c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS framecontent, c.SENSORID AS sensorid, c.SENSORCODE AS sensorcode, c.STATUS AS status, c.ATTEMPTSMAX AS attemptsmax, c.ATTEMPTSCURRENT AS attemptscurrent, c.SENDTIME AS sendtime, c.WRITETIME AS writetime,s.id AS deptid, - s.full_name AS deptName,a.WELL_CODE AS wellCode,d.DEVCODE AS devcode, - d.DEVICE_NAME AS deviceName,d.DEVICE_TYPE AS deviceType, - t.TYPE_NAME AS deviceTypeName + s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS devcode, + d.DEVICE_NAME AS "deviceName",d.DEVICE_TYPE AS "deviceType", + t.TYPE_NAME AS "deviceTypeName" + '%' || #{keywords}|| '%' @@ -39,26 +41,18 @@ CONCAT('%',#{keywords},'%') - - #{keywords} + + ${paramStr} - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - #{sensorid} - - - CONCAT(#{sensorid}) - - - CONCAT(#{sensorid}) - - select FROM bus_config c LEFT JOIN bus_device_well b ON @@ -68,55 +62,43 @@ d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 AND c.sensorid = - + + + and d.DEVCODE like and s.ID = - + + + ORDER by writetime DESC - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml index d2d0214..c13eab4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml @@ -19,27 +19,44 @@ + + '%' || #{devcode}|| '%' + + + CONCAT('%',#{devcode},'%') + + + CONCAT('%',#{devcode},'%') + + - ID AS id, NB_DEVICE_ID AS nbDeviceId, DEVCODE AS devcode, VERIFY_CODE AS verifyCode, - NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS manufacturerId, - MANUFACTURER_NAME AS manufacturerName, DEVICE_TYPE AS deviceType, MODEL AS model, - PROTOCAL_TYPE AS protocalType, IS_SECURE AS isSecure + ID AS id, NB_DEVICE_ID AS "nbDeviceId", DEVCODE AS devcode, VERIFY_CODE AS "verifyCode", + NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS "manufacturerId", + MANUFACTURER_NAME AS "manufacturerName", DEVICE_TYPE AS "deviceType", MODEL AS model, + PROTOCAL_TYPE AS "protocalType", IS_SECURE AS "isSecure" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml index a642d1e..d0c7e1b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml @@ -15,10 +15,14 @@ - ID AS id, DEPTID AS deptid, BASE_URL AS baseUrl, APPID AS appid, APPKEY AS appkey, SUBSCRIBE_URL AS subscribeUrl, APPNAME AS appname + ID AS id, DEPTID AS deptid, BASE_URL AS "baseUrl", APPID AS appid, APPKEY AS appkey, + SUBSCRIBE_URL AS "subscribeUrl", APPNAME AS appname + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml index db0d728..f69e756 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml @@ -4,18 +4,18 @@ - - - - - - - + + + + + + + - ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS wellType, DEVICE_TYPE AS deviceType, area, MAP AS map + ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS "wellType", DEVICE_TYPE AS "deviceType", area, MAP AS map diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml index 1c84ca3..2bc0bfd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml @@ -13,7 +13,7 @@ - DEVICE_ID AS deviceId, CONCEN_ID AS concenId, STATUS AS status, ACTIVE AS active, TS AS ts + DEVICE_ID AS "deviceId", CONCEN_ID AS "concenId", STATUS AS status, ACTIVE AS active, TS AS ts diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4622bdf..e12c713 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -16,26 +16,50 @@ ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, - - as INSTALLDATE + + + + AS "INSTALLDATE" - - DATE_FORMAT - (INSTALLDATE,'%Y-%m-%d') + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') - - to_char - (INSTALLDATE,'yyyy-MM-dd') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - - ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version + + + '%' ||#{keywords}||'%' + + + CONCAT('%',#{keywords},'%') + + + + CONCAT('%',#{keywords},'%') + + + + str_to_date(${paramStr},'%Y-%m-%d %H:%i') + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - DATE_FORMAT - (UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - - '%' ||#{keywords}||'%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - #{endTime} - - - #{beginTime} - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - + - d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate", ONLINE_STATE AS "onlineState", t.TYPE_NAME AS "typeName" + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 9f1b06f..4943869 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -12,7 +12,7 @@ - ID AS id, MODEL_NAME AS modelName, DEVICE_TYPE AS deviceType, COMMUNICATION AS communication + ID AS id, MODEL_NAME AS "modelName", DEVICE_TYPE AS "deviceType", COMMUNICATION AS communication SELECT bdm.ID AS id, - bdm.MODEL_NAME AS modelName, + bdm.MODEL_NAME AS "modelName", bdm.COMMUNICATION AS communication, - bdm.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName + bdm.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName" FROM base_device_models bdm LEFT JOIN base_device_type bdt ON bdm.DEVICE_TYPE = bdt.ID @@ -40,13 +40,14 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml index fce044c..0ed47e1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml @@ -17,7 +17,8 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts @@ -31,7 +32,7 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index 44755e4..9bd5107 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -12,10 +12,11 @@ - DEVICE_ID AS deviceId, WELL_ID AS wellId, TS AS ts, VALID AS valid + DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid UPDATE bus_device_well SET WELL_ID = #{wellId} WHERE DEVICE_ID = #{deviceId} + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java index 1c0ea8e..2960e16 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java @@ -11,7 +11,7 @@ put("concencode","集中器编号"); put("simid","SIM卡号"); put("position","集中器位置"); - put("lat"," 纬度"); + put("lat","纬度"); put("lng","经度"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java deleted file mode 100644 index 4064d07..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.casic.missiles.modular.system.model; - -import lombok.Data; - -/** - * @author cz - * @date 2022-6-22 - */ -@Data -public class DeviceAddParam { - private String deviceName; - private String devcode; - private String deviceType; - private String wellCode; - private String modelId; - private String installDate; - private String concenCode; - private String installHe; -} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 21df9e4..1504adb 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -266,7 +266,7 @@ this.setWellCode(busWellInfo.getWellCode()); this.setWellName(busWellInfo.getWellName()); this.setWellType(busWellInfo.getWellType()); - this.setDeptid(busWellInfo.getDeptid()); + this.setDeptid(busWellInfo.getDeptid().toString()); this.setDeep(busWellInfo.getDeep()); this.setCoordinateX(busWellInfo.getCoordinateX()); this.setCoordinateY(busWellInfo.getCoordinateY()); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index 5b2bbff..cd3837a 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -122,7 +122,7 @@ @ExcelProperty("权属单位代码") @NotEmpty(message = "权属单位代码不能为空") @TableField("DEPTID") - private String deptid; + private Long deptid; /** * 路标图片路径集合 */ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 348c792..3a8c3f7 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -114,7 +114,7 @@ try { if(null==busWellInfo.getResponsibleDept()){ - busWellInfo.setResponsibleDept(busWellInfo.getDeptid()); + busWellInfo.setResponsibleDept(busWellInfo.getDeptid().toString()); } // List deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true); @@ -175,7 +175,7 @@ Utility.convertCoordinate(busWellInfo); if(ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())){ - busWellInfo.setResponsibleDept(busWellInfo.getDeptid()); + busWellInfo.setResponsibleDept(busWellInfo.getDeptid().toString()); } // List deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true); // if(ToolUtil.isNotEmpty(deptTopRoleUsers)){ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java index 7d606a9..89f9586 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java @@ -38,7 +38,7 @@ String getAreaId(@Param("qu") String qu, @Param("area") String area); - String getAreaPId(@Param("id") String id); + String getAreaPId(@Param("id") Long id); List getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index 82cc624..567fbca 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -29,13 +29,22 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, + COORDINATE_X AS "coordinateX", COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", + LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", LAT_GAODE AS "latGaode", AREA AS area, + POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, + WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", + DEEP AS deep, COORDINATE_X AS "coordinateX", COORDINATE_Y AS "coordinateY", + LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, + DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS "wellType", + STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, + d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + - '%' || - #{keywords} - || - '%' + '%'||#{keywords}||'%' - CONCAT - ('%', - #{keywords}, - '%' - ) + CONCAT('%',#{keywords},'%') - CONCAT - ('%', - #{keywords}, - '%' - ) + CONCAT('%',#{keywords},'%') - d - . - ID - AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate", + ONLINE_STATE AS "onlineState", t.WATCH_TYPE AS "watchType", t.id as type - SELECT w.WELL_CODE AS wellCode, w.WELL_NAME AS wellName, w.deep, w.WELL_TYPE AS wellType,w.deptid AS deptId, + SELECT w.WELL_CODE AS "wellCode", w.WELL_NAME AS "wellName", + w.deep, w.WELL_TYPE AS "wellType",w.deptid AS "deptId", w.bfzt, w.position,w.id FROM bus_well_info w WHERE 1 = 1 @@ -144,8 +142,9 @@ + + + '%'||#{area}||'%' + + + CONCAT('%',#{area},'%') + + + CONCAT('%',#{area},'%') + + - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java index c7df1cb..979e8be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java @@ -21,11 +21,12 @@ /** * 查询集中器列表 * - * @param page 分页参数 + * @param page 分页参数 * @param dataScope 数据权限 - * @param keywords 关键字 - * @param status 状态 + * @param keywords 关键字 + * @param status 状态 * @return */ - List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("status") String status); + List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, + @Param("keywords") String keywords, @Param("status") String status); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java index 798d395..9517a30 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java @@ -16,7 +16,9 @@ */ public interface BusNbDeviceMapper extends BaseMapper { List getListByDevcode(@Param("devcode") String devcode); + List getByNodeId(@Param("nodeid") String nodeid); + List getByDevcode(@Param("devcode") String devcode); boolean deleteByNbDeviceId(String nbDeviceId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java index 9a3e919..302f95e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java @@ -14,5 +14,5 @@ */ public interface DeviceConcentratorMapper extends BaseMapper { - void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId")Long concId); + void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId") Long concId); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 6b1c6bf..5918e6c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -18,17 +18,19 @@ - ID AS id, DEVICE_ID AS deviceId, FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + ID AS id, DEVICE_ID AS "deviceId", FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + - c.ID AS id, c.DEVICE_ID AS deviceId, c.FRAMECONTENT AS framecontent, + c.ID AS id, c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS framecontent, c.SENSORID AS sensorid, c.SENSORCODE AS sensorcode, c.STATUS AS status, c.ATTEMPTSMAX AS attemptsmax, c.ATTEMPTSCURRENT AS attemptscurrent, c.SENDTIME AS sendtime, c.WRITETIME AS writetime,s.id AS deptid, - s.full_name AS deptName,a.WELL_CODE AS wellCode,d.DEVCODE AS devcode, - d.DEVICE_NAME AS deviceName,d.DEVICE_TYPE AS deviceType, - t.TYPE_NAME AS deviceTypeName + s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS devcode, + d.DEVICE_NAME AS "deviceName",d.DEVICE_TYPE AS "deviceType", + t.TYPE_NAME AS "deviceTypeName" + '%' || #{keywords}|| '%' @@ -39,26 +41,18 @@ CONCAT('%',#{keywords},'%') - - #{keywords} + + ${paramStr} - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - #{sensorid} - - - CONCAT(#{sensorid}) - - - CONCAT(#{sensorid}) - - select FROM bus_config c LEFT JOIN bus_device_well b ON @@ -68,55 +62,43 @@ d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 AND c.sensorid = - + + + and d.DEVCODE like and s.ID = - + + + ORDER by writetime DESC - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml index d2d0214..c13eab4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml @@ -19,27 +19,44 @@ + + '%' || #{devcode}|| '%' + + + CONCAT('%',#{devcode},'%') + + + CONCAT('%',#{devcode},'%') + + - ID AS id, NB_DEVICE_ID AS nbDeviceId, DEVCODE AS devcode, VERIFY_CODE AS verifyCode, - NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS manufacturerId, - MANUFACTURER_NAME AS manufacturerName, DEVICE_TYPE AS deviceType, MODEL AS model, - PROTOCAL_TYPE AS protocalType, IS_SECURE AS isSecure + ID AS id, NB_DEVICE_ID AS "nbDeviceId", DEVCODE AS devcode, VERIFY_CODE AS "verifyCode", + NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS "manufacturerId", + MANUFACTURER_NAME AS "manufacturerName", DEVICE_TYPE AS "deviceType", MODEL AS model, + PROTOCAL_TYPE AS "protocalType", IS_SECURE AS "isSecure" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml index a642d1e..d0c7e1b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml @@ -15,10 +15,14 @@ - ID AS id, DEPTID AS deptid, BASE_URL AS baseUrl, APPID AS appid, APPKEY AS appkey, SUBSCRIBE_URL AS subscribeUrl, APPNAME AS appname + ID AS id, DEPTID AS deptid, BASE_URL AS "baseUrl", APPID AS appid, APPKEY AS appkey, + SUBSCRIBE_URL AS "subscribeUrl", APPNAME AS appname + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml index db0d728..f69e756 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml @@ -4,18 +4,18 @@ - - - - - - - + + + + + + + - ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS wellType, DEVICE_TYPE AS deviceType, area, MAP AS map + ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS "wellType", DEVICE_TYPE AS "deviceType", area, MAP AS map diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml index 1c84ca3..2bc0bfd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml @@ -13,7 +13,7 @@ - DEVICE_ID AS deviceId, CONCEN_ID AS concenId, STATUS AS status, ACTIVE AS active, TS AS ts + DEVICE_ID AS "deviceId", CONCEN_ID AS "concenId", STATUS AS status, ACTIVE AS active, TS AS ts diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4622bdf..e12c713 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -16,26 +16,50 @@ ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, - - as INSTALLDATE + + + + AS "INSTALLDATE" - - DATE_FORMAT - (INSTALLDATE,'%Y-%m-%d') + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') - - to_char - (INSTALLDATE,'yyyy-MM-dd') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - - ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version + + + '%' ||#{keywords}||'%' + + + CONCAT('%',#{keywords},'%') + + + + CONCAT('%',#{keywords},'%') + + + + str_to_date(${paramStr},'%Y-%m-%d %H:%i') + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - DATE_FORMAT - (UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - - '%' ||#{keywords}||'%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - #{endTime} - - - #{beginTime} - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - + - d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate", ONLINE_STATE AS "onlineState", t.TYPE_NAME AS "typeName" + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 9f1b06f..4943869 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -12,7 +12,7 @@ - ID AS id, MODEL_NAME AS modelName, DEVICE_TYPE AS deviceType, COMMUNICATION AS communication + ID AS id, MODEL_NAME AS "modelName", DEVICE_TYPE AS "deviceType", COMMUNICATION AS communication SELECT bdm.ID AS id, - bdm.MODEL_NAME AS modelName, + bdm.MODEL_NAME AS "modelName", bdm.COMMUNICATION AS communication, - bdm.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName + bdm.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName" FROM base_device_models bdm LEFT JOIN base_device_type bdt ON bdm.DEVICE_TYPE = bdt.ID @@ -40,13 +40,14 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml index fce044c..0ed47e1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml @@ -17,7 +17,8 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts @@ -31,7 +32,7 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index 44755e4..9bd5107 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -12,10 +12,11 @@ - DEVICE_ID AS deviceId, WELL_ID AS wellId, TS AS ts, VALID AS valid + DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid UPDATE bus_device_well SET WELL_ID = #{wellId} WHERE DEVICE_ID = #{deviceId} + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java index 1c0ea8e..2960e16 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java @@ -11,7 +11,7 @@ put("concencode","集中器编号"); put("simid","SIM卡号"); put("position","集中器位置"); - put("lat"," 纬度"); + put("lat","纬度"); put("lng","经度"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java deleted file mode 100644 index 4064d07..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.casic.missiles.modular.system.model; - -import lombok.Data; - -/** - * @author cz - * @date 2022-6-22 - */ -@Data -public class DeviceAddParam { - private String deviceName; - private String devcode; - private String deviceType; - private String wellCode; - private String modelId; - private String installDate; - private String concenCode; - private String installHe; -} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 21df9e4..1504adb 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -266,7 +266,7 @@ this.setWellCode(busWellInfo.getWellCode()); this.setWellName(busWellInfo.getWellName()); this.setWellType(busWellInfo.getWellType()); - this.setDeptid(busWellInfo.getDeptid()); + this.setDeptid(busWellInfo.getDeptid().toString()); this.setDeep(busWellInfo.getDeep()); this.setCoordinateX(busWellInfo.getCoordinateX()); this.setCoordinateY(busWellInfo.getCoordinateY()); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index 5b2bbff..cd3837a 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -122,7 +122,7 @@ @ExcelProperty("权属单位代码") @NotEmpty(message = "权属单位代码不能为空") @TableField("DEPTID") - private String deptid; + private Long deptid; /** * 路标图片路径集合 */ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 348c792..3a8c3f7 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -114,7 +114,7 @@ try { if(null==busWellInfo.getResponsibleDept()){ - busWellInfo.setResponsibleDept(busWellInfo.getDeptid()); + busWellInfo.setResponsibleDept(busWellInfo.getDeptid().toString()); } // List deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true); @@ -175,7 +175,7 @@ Utility.convertCoordinate(busWellInfo); if(ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())){ - busWellInfo.setResponsibleDept(busWellInfo.getDeptid()); + busWellInfo.setResponsibleDept(busWellInfo.getDeptid().toString()); } // List deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true); // if(ToolUtil.isNotEmpty(deptTopRoleUsers)){ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java index 7d606a9..89f9586 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java @@ -38,7 +38,7 @@ String getAreaId(@Param("qu") String qu, @Param("area") String area); - String getAreaPId(@Param("id") String id); + String getAreaPId(@Param("id") Long id); List getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index 82cc624..567fbca 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -29,13 +29,22 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, + COORDINATE_X AS "coordinateX", COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", + LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", LAT_GAODE AS "latGaode", AREA AS area, + POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, + WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", + DEEP AS deep, COORDINATE_X AS "coordinateX", COORDINATE_Y AS "coordinateY", + LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, + DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS "wellType", + STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, + d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + - '%' || - #{keywords} - || - '%' + '%'||#{keywords}||'%' - CONCAT - ('%', - #{keywords}, - '%' - ) + CONCAT('%',#{keywords},'%') - CONCAT - ('%', - #{keywords}, - '%' - ) + CONCAT('%',#{keywords},'%') - d - . - ID - AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate", + ONLINE_STATE AS "onlineState", t.WATCH_TYPE AS "watchType", t.id as type - SELECT w.WELL_CODE AS wellCode, w.WELL_NAME AS wellName, w.deep, w.WELL_TYPE AS wellType,w.deptid AS deptId, + SELECT w.WELL_CODE AS "wellCode", w.WELL_NAME AS "wellName", + w.deep, w.WELL_TYPE AS "wellType",w.deptid AS "deptId", w.bfzt, w.position,w.id FROM bus_well_info w WHERE 1 = 1 @@ -144,8 +142,9 @@ + + + '%'||#{area}||'%' + + + CONCAT('%',#{area},'%') + + + CONCAT('%',#{area},'%') + + - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java index c7df1cb..979e8be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java @@ -21,11 +21,12 @@ /** * 查询集中器列表 * - * @param page 分页参数 + * @param page 分页参数 * @param dataScope 数据权限 - * @param keywords 关键字 - * @param status 状态 + * @param keywords 关键字 + * @param status 状态 * @return */ - List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("status") String status); + List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, + @Param("keywords") String keywords, @Param("status") String status); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java index 798d395..9517a30 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java @@ -16,7 +16,9 @@ */ public interface BusNbDeviceMapper extends BaseMapper { List getListByDevcode(@Param("devcode") String devcode); + List getByNodeId(@Param("nodeid") String nodeid); + List getByDevcode(@Param("devcode") String devcode); boolean deleteByNbDeviceId(String nbDeviceId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java index 9a3e919..302f95e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java @@ -14,5 +14,5 @@ */ public interface DeviceConcentratorMapper extends BaseMapper { - void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId")Long concId); + void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId") Long concId); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 6b1c6bf..5918e6c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -18,17 +18,19 @@ - ID AS id, DEVICE_ID AS deviceId, FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + ID AS id, DEVICE_ID AS "deviceId", FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + - c.ID AS id, c.DEVICE_ID AS deviceId, c.FRAMECONTENT AS framecontent, + c.ID AS id, c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS framecontent, c.SENSORID AS sensorid, c.SENSORCODE AS sensorcode, c.STATUS AS status, c.ATTEMPTSMAX AS attemptsmax, c.ATTEMPTSCURRENT AS attemptscurrent, c.SENDTIME AS sendtime, c.WRITETIME AS writetime,s.id AS deptid, - s.full_name AS deptName,a.WELL_CODE AS wellCode,d.DEVCODE AS devcode, - d.DEVICE_NAME AS deviceName,d.DEVICE_TYPE AS deviceType, - t.TYPE_NAME AS deviceTypeName + s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS devcode, + d.DEVICE_NAME AS "deviceName",d.DEVICE_TYPE AS "deviceType", + t.TYPE_NAME AS "deviceTypeName" + '%' || #{keywords}|| '%' @@ -39,26 +41,18 @@ CONCAT('%',#{keywords},'%') - - #{keywords} + + ${paramStr} - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - #{sensorid} - - - CONCAT(#{sensorid}) - - - CONCAT(#{sensorid}) - - select FROM bus_config c LEFT JOIN bus_device_well b ON @@ -68,55 +62,43 @@ d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 AND c.sensorid = - + + + and d.DEVCODE like and s.ID = - + + + ORDER by writetime DESC - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml index d2d0214..c13eab4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml @@ -19,27 +19,44 @@ + + '%' || #{devcode}|| '%' + + + CONCAT('%',#{devcode},'%') + + + CONCAT('%',#{devcode},'%') + + - ID AS id, NB_DEVICE_ID AS nbDeviceId, DEVCODE AS devcode, VERIFY_CODE AS verifyCode, - NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS manufacturerId, - MANUFACTURER_NAME AS manufacturerName, DEVICE_TYPE AS deviceType, MODEL AS model, - PROTOCAL_TYPE AS protocalType, IS_SECURE AS isSecure + ID AS id, NB_DEVICE_ID AS "nbDeviceId", DEVCODE AS devcode, VERIFY_CODE AS "verifyCode", + NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS "manufacturerId", + MANUFACTURER_NAME AS "manufacturerName", DEVICE_TYPE AS "deviceType", MODEL AS model, + PROTOCAL_TYPE AS "protocalType", IS_SECURE AS "isSecure" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml index a642d1e..d0c7e1b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml @@ -15,10 +15,14 @@ - ID AS id, DEPTID AS deptid, BASE_URL AS baseUrl, APPID AS appid, APPKEY AS appkey, SUBSCRIBE_URL AS subscribeUrl, APPNAME AS appname + ID AS id, DEPTID AS deptid, BASE_URL AS "baseUrl", APPID AS appid, APPKEY AS appkey, + SUBSCRIBE_URL AS "subscribeUrl", APPNAME AS appname + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml index db0d728..f69e756 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml @@ -4,18 +4,18 @@ - - - - - - - + + + + + + + - ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS wellType, DEVICE_TYPE AS deviceType, area, MAP AS map + ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS "wellType", DEVICE_TYPE AS "deviceType", area, MAP AS map diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml index 1c84ca3..2bc0bfd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml @@ -13,7 +13,7 @@ - DEVICE_ID AS deviceId, CONCEN_ID AS concenId, STATUS AS status, ACTIVE AS active, TS AS ts + DEVICE_ID AS "deviceId", CONCEN_ID AS "concenId", STATUS AS status, ACTIVE AS active, TS AS ts diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4622bdf..e12c713 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -16,26 +16,50 @@ ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, - - as INSTALLDATE + + + + AS "INSTALLDATE" - - DATE_FORMAT - (INSTALLDATE,'%Y-%m-%d') + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') - - to_char - (INSTALLDATE,'yyyy-MM-dd') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - - ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version + + + '%' ||#{keywords}||'%' + + + CONCAT('%',#{keywords},'%') + + + + CONCAT('%',#{keywords},'%') + + + + str_to_date(${paramStr},'%Y-%m-%d %H:%i') + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - DATE_FORMAT - (UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - - '%' ||#{keywords}||'%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - #{endTime} - - - #{beginTime} - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - + - d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate", ONLINE_STATE AS "onlineState", t.TYPE_NAME AS "typeName" + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 9f1b06f..4943869 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -12,7 +12,7 @@ - ID AS id, MODEL_NAME AS modelName, DEVICE_TYPE AS deviceType, COMMUNICATION AS communication + ID AS id, MODEL_NAME AS "modelName", DEVICE_TYPE AS "deviceType", COMMUNICATION AS communication SELECT bdm.ID AS id, - bdm.MODEL_NAME AS modelName, + bdm.MODEL_NAME AS "modelName", bdm.COMMUNICATION AS communication, - bdm.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName + bdm.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName" FROM base_device_models bdm LEFT JOIN base_device_type bdt ON bdm.DEVICE_TYPE = bdt.ID @@ -40,13 +40,14 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml index fce044c..0ed47e1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml @@ -17,7 +17,8 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts @@ -31,7 +32,7 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index 44755e4..9bd5107 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -12,10 +12,11 @@ - DEVICE_ID AS deviceId, WELL_ID AS wellId, TS AS ts, VALID AS valid + DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid UPDATE bus_device_well SET WELL_ID = #{wellId} WHERE DEVICE_ID = #{deviceId} + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java index 1c0ea8e..2960e16 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java @@ -11,7 +11,7 @@ put("concencode","集中器编号"); put("simid","SIM卡号"); put("position","集中器位置"); - put("lat"," 纬度"); + put("lat","纬度"); put("lng","经度"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java deleted file mode 100644 index 4064d07..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.casic.missiles.modular.system.model; - -import lombok.Data; - -/** - * @author cz - * @date 2022-6-22 - */ -@Data -public class DeviceAddParam { - private String deviceName; - private String devcode; - private String deviceType; - private String wellCode; - private String modelId; - private String installDate; - private String concenCode; - private String installHe; -} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 21df9e4..1504adb 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -266,7 +266,7 @@ this.setWellCode(busWellInfo.getWellCode()); this.setWellName(busWellInfo.getWellName()); this.setWellType(busWellInfo.getWellType()); - this.setDeptid(busWellInfo.getDeptid()); + this.setDeptid(busWellInfo.getDeptid().toString()); this.setDeep(busWellInfo.getDeep()); this.setCoordinateX(busWellInfo.getCoordinateX()); this.setCoordinateY(busWellInfo.getCoordinateY()); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index 5b2bbff..cd3837a 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -122,7 +122,7 @@ @ExcelProperty("权属单位代码") @NotEmpty(message = "权属单位代码不能为空") @TableField("DEPTID") - private String deptid; + private Long deptid; /** * 路标图片路径集合 */ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 348c792..3a8c3f7 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -114,7 +114,7 @@ try { if(null==busWellInfo.getResponsibleDept()){ - busWellInfo.setResponsibleDept(busWellInfo.getDeptid()); + busWellInfo.setResponsibleDept(busWellInfo.getDeptid().toString()); } // List deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true); @@ -175,7 +175,7 @@ Utility.convertCoordinate(busWellInfo); if(ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())){ - busWellInfo.setResponsibleDept(busWellInfo.getDeptid()); + busWellInfo.setResponsibleDept(busWellInfo.getDeptid().toString()); } // List deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true); // if(ToolUtil.isNotEmpty(deptTopRoleUsers)){ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java index 7d606a9..89f9586 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java @@ -38,7 +38,7 @@ String getAreaId(@Param("qu") String qu, @Param("area") String area); - String getAreaPId(@Param("id") String id); + String getAreaPId(@Param("id") Long id); List getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index 82cc624..567fbca 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -29,13 +29,22 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, + COORDINATE_X AS "coordinateX", COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", + LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", LAT_GAODE AS "latGaode", AREA AS area, + POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, + WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", + DEEP AS deep, COORDINATE_X AS "coordinateX", COORDINATE_Y AS "coordinateY", + LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, + DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS "wellType", + STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, + d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + - '%' || - #{keywords} - || - '%' + '%'||#{keywords}||'%' - CONCAT - ('%', - #{keywords}, - '%' - ) + CONCAT('%',#{keywords},'%') - CONCAT - ('%', - #{keywords}, - '%' - ) + CONCAT('%',#{keywords},'%') - d - . - ID - AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate", + ONLINE_STATE AS "onlineState", t.WATCH_TYPE AS "watchType", t.id as type - SELECT w.WELL_CODE AS wellCode, w.WELL_NAME AS wellName, w.deep, w.WELL_TYPE AS wellType,w.deptid AS deptId, + SELECT w.WELL_CODE AS "wellCode", w.WELL_NAME AS "wellName", + w.deep, w.WELL_TYPE AS "wellType",w.deptid AS "deptId", w.bfzt, w.position,w.id FROM bus_well_info w WHERE 1 = 1 @@ -144,8 +142,9 @@ + + + '%'||#{area}||'%' + + + CONCAT('%',#{area},'%') + + + CONCAT('%',#{area},'%') + + - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -417,7 +412,7 @@ - + ar.id AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, @@ -469,7 +464,7 @@ - + ar.id AS "alarmId", aj.DEVCODE AS devcode, aj.WELL_CODE AS "wellCode", 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 ea71bb7..5d2e9b9 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 @@ -18,13 +18,15 @@ - ID AS id, NAME AS name, DEVICE_TYPE AS deviceType, LEVEL AS level, LOW_VALUE AS lowValue, HIGH_VALUE AS highValue, OPEN_ALARM AS openAlarm, OPEN_JOB AS openJob, TENANT_ID AS tenantId, TS AS ts + ID AS id, NAME AS name, DEVICE_TYPE AS "deviceType", LEVEL AS level, + LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", + OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts SELECT ar.ID AS id, - ar.DEVICE_ID AS deviceId, + ar.DEVICE_ID AS "deviceId", ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, + ar.WELL_CODE AS "wellCode", + ar.ALARM_TYPE AS "alarmType", + ar.ALARM_CONTENT AS "alarmContent", + ar.ALARM_VALUE AS "alarmValue", + ar.ALARM_TIME AS "alarmTime", + ar.ALARM_LEVEL AS "alarmLevel", + ar.ALARM_MSG AS "alarmMessage", ar.STATUS AS status, - ar.JOB_ID AS jobId, + ar.JOB_ID AS "jobId", bwi.DEPTID AS deptid FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE 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 bbec5ff..a7d45a7 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 @@ -28,24 +28,9 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts - - - - - - - - - - - - - - - - DATE_FORMAT( ar.TS,'%Y-%m-%d %H:%i:%s') 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 0a71551..1079e12 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 @@ -2,30 +2,13 @@ - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - - A.wellCount , - A.deptid, - SD.simplename as deptName, - SD.pid - - + A.wellCount , A.deptid, SD.simplename as "deptName", SD.pid - - - - SELECT diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml index 7a9c269..1d5bc2e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml @@ -65,7 +65,8 @@ - DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') @@ -121,12 +115,13 @@ @@ -143,7 +138,7 @@ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index a8c2fc1..ff3be2e 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -572,6 +572,9 @@ */ @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { + if (StrUtil.isEmpty(watchType)) { + return ResponseData.success("缺少监测类型参数，请重传"); + } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); return ResponseData.success(mapList); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index acf474f..f804cf0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -29,13 +29,77 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX", + COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, + NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + + + + '%' || #{keywords}|| '%' + + + CONCAT('%',#{keywords},'%') + + + CONCAT('%',#{keywords},'%') + + + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + + + + ${paramStr} + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + + + and datediff(now(),dg.UPTIME) ${paramDay} + + + + AND date_part('day',now()-dg.UPTIME) ${paramDay} + + + + and date_part(now(),dg.UPTIME) ${paramDay} + + + + '%' || #{wellCode}|| '%' + + + CONCAT('%',#{wellCode},'%') + + + CONCAT('%', #{wellCode}, '%') @@ -185,25 +253,20 @@ ORDER BY UPTIME DESC LIMIT 1 - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + - - '%' || #{keywords}|| '%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - #{beginTime} - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - - - #{endTime} - - - - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.LIQUIDDATA AS data FROM data_gasliquid_liquid glview @@ -293,11 +337,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like @@ -327,14 +376,20 @@ ( SELECT dl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dl.WELL_CODE AS wellCode, + dl.WELL_CODE AS "wellCode", dl.DESCN AS descn, dl.CELL AS cell, - DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dl.LIQUIDDATA AS liquiddata FROM data_liquid dl @@ -344,27 +399,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dl.WELL_CODE LIKE + - AND dl.UPTIME = ]]> #{beginTime} + AND dl.UPTIME = ]]> + + + - AND dl.UPTIME #{endTime} + AND dl.UPTIME + + + ) UNION ALL ( SELECT dgl.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgl.WELL_CODE AS wellCode, + dgl.WELL_CODE AS "wellCode", dgl.DESCN AS descn, dgl.CELL AS cell, - DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgl.LIQUIDDATA AS liquiddata FROM data_gasliquid_liquid dgl @@ -374,13 +442,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgl.WELL_CODE LIKE + - AND dgl.UPTIME = ]]> #{beginTime} + AND dgl.UPTIME = ]]> + + + - AND dgl.UPTIME #{endTime} + AND dgl.UPTIME + + + ) @@ -391,16 +466,22 @@ SELECT dhg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dhg.WELL_CODE AS wellCode, + dhg.WELL_CODE AS "wellCode", dhg.DESCN AS descn, - dhg.CO AS CO, - dhg.CH4 AS CH4, - dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.CO AS "CO", + dhg.CH4 AS "CH4", + dhg.H2S AS "H2S", + dhg.O2 AS "O2", dhg.SWITCH AS switch, - DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_harmful_gas dhg INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE @@ -444,13 +538,20 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dhg.WELL_CODE LIKE + - AND dhg.UPTIME = ]]> #{beginTime} + AND dhg.UPTIME = ]]> + + + - AND dhg.UPTIME #{endTime} + AND dhg.UPTIME + + + ORDER BY uptime asc @@ -473,14 +574,20 @@ ( SELECT dg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dg.WELL_CODE AS wellCode, + dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, dg.CELL AS cell, - DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dg.STRENGTH AS strength FROM data_gas dg @@ -490,27 +597,40 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dg.WELL_CODE LIKE + - AND dg.UPTIME = ]]> #{beginTime} + AND dg.UPTIME = ]]> + + + - AND dg.UPTIME #{endTime} + AND dg.UPTIME + + + ) UNION ALL ( SELECT dgg.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dgg.WELL_CODE AS wellCode, + dgg.WELL_CODE AS "wellCode", dgg.DESCN AS descn, dgg.CELL AS cell, - DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime, + + + + AS uptime, + + + + AS logtime, dgg.STRENGTH AS strength FROM data_gasliquid_gas dgg @@ -520,37 +640,38 @@ bd.VALID = '1' AND bwi.VALID = '1' - AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%') + AND dgg.WELL_CODE LIKE + - AND dgg.UPTIME = ]]> #{beginTime} + AND dgg.UPTIME = ]]> + + + - AND dgg.UPTIME #{endTime} + AND dgg.UPTIME + + + ) ) t1 ORDER BY uptime asc - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - + - - SELECT dn.DEVCODE AS devcode, - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - dn.WELL_CODE AS wellCode, + dn.WELL_CODE AS "wellCode", dn.DESCN AS descn, dn.FREQUENCY AS frequency, dn.DDATA AS ddata, dn.CELL AS cell, - DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, - DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime + + + + AS uptime, + + + + AS logtime FROM data_noise dn INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE @@ -905,11 +1119,16 @@ and bwi.DEPTID = #{deptid} - and dn.UPTIME > + and dn.UPTIME = ]]> + + + - and dn.UPTIME < - + and dn.UPTIME + + + and (dn.DEVCODE like @@ -921,8 +1140,8 @@ ORDER BY dn.UPTIME DESC - SELECT SD.simple_name AS deptname, SA.alarmDevices, @@ -946,11 +1165,16 @@ WHERE b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1' - and a.ALARM_TIME > + and a.ALARM_TIME = ]]> + + + - and a.ALARM_TIME < - + and a.ALARM_TIME + + + and d.DEVICE_TYPE = #{deviceType} @@ -977,17 +1201,24 @@ - SELECT glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, + glview.WELL_CODE AS "wellCode", glview.DESCN AS descn, glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + + + + AS uptime, + + + + AS logtime, glview.STRENGTH AS data FROM data_gasliquid_gas glview @@ -1003,11 +1234,16 @@ - and glview.UPTIME > + and glview.UPTIME = ]]> + + + - and glview.UPTIME < - + and glview.UPTIME + + + and (glview.DEVCODE like diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 3b1363c..6a8e71f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -478,7 +478,7 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength())); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { deviceDataExcelDto.setStrength("正常水位"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e77540f..9a44090 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -24,7 +24,6 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum; import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.DeviceAddParam; import com.casic.missiles.modular.system.model.DeviceModels; import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.rmi.AccessException; import java.util.*; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java index c7df1cb..979e8be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConcentratorMapper.java @@ -21,11 +21,12 @@ /** * 查询集中器列表 * - * @param page 分页参数 + * @param page 分页参数 * @param dataScope 数据权限 - * @param keywords 关键字 - * @param status 状态 + * @param keywords 关键字 + * @param status 状态 * @return */ - List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("status") String status); + List selectConcentratorPage(@Param("page") Page page, @Param("scope") DataScope dataScope, + @Param("keywords") String keywords, @Param("status") String status); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java index 798d395..9517a30 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusNbDeviceMapper.java @@ -16,7 +16,9 @@ */ public interface BusNbDeviceMapper extends BaseMapper { List getListByDevcode(@Param("devcode") String devcode); + List getByNodeId(@Param("nodeid") String nodeid); + List getByDevcode(@Param("devcode") String devcode); boolean deleteByNbDeviceId(String nbDeviceId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java index 9a3e919..302f95e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceConcentratorMapper.java @@ -14,5 +14,5 @@ */ public interface DeviceConcentratorMapper extends BaseMapper { - void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId")Long concId); + void updateByDeviceId(@Param("deviceId") Long deviceId, @Param("concId") Long concId); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 6b1c6bf..5918e6c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -18,17 +18,19 @@ - ID AS id, DEVICE_ID AS deviceId, FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + ID AS id, DEVICE_ID AS "deviceId", FRAMECONTENT AS framecontent, SENSORID AS sensorid, SENSORCODE AS sensorcode, STATUS AS status, ATTEMPTSMAX AS attemptsmax, ATTEMPTSCURRENT AS attemptscurrent, SENDTIME AS sendtime, WRITETIME AS writetime + - c.ID AS id, c.DEVICE_ID AS deviceId, c.FRAMECONTENT AS framecontent, + c.ID AS id, c.DEVICE_ID AS "deviceId", c.FRAMECONTENT AS framecontent, c.SENSORID AS sensorid, c.SENSORCODE AS sensorcode, c.STATUS AS status, c.ATTEMPTSMAX AS attemptsmax, c.ATTEMPTSCURRENT AS attemptscurrent, c.SENDTIME AS sendtime, c.WRITETIME AS writetime,s.id AS deptid, - s.full_name AS deptName,a.WELL_CODE AS wellCode,d.DEVCODE AS devcode, - d.DEVICE_NAME AS deviceName,d.DEVICE_TYPE AS deviceType, - t.TYPE_NAME AS deviceTypeName + s.full_name AS "deptName",a.WELL_CODE AS "wellCode",d.DEVCODE AS devcode, + d.DEVICE_NAME AS "deviceName",d.DEVICE_TYPE AS "deviceType", + t.TYPE_NAME AS "deviceTypeName" + '%' || #{keywords}|| '%' @@ -39,26 +41,18 @@ CONCAT('%',#{keywords},'%') - - #{keywords} + + ${paramStr} - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - CONCAT(#{deptid}) + + CONCAT(${paramStr}) - - #{sensorid} - - - CONCAT(#{sensorid}) - - - CONCAT(#{sensorid}) - - select FROM bus_config c LEFT JOIN bus_device_well b ON @@ -68,55 +62,43 @@ d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 AND c.sensorid = - + + + and d.DEVCODE like and s.ID = - + + + ORDER by writetime DESC - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - - - - #{devID} - - - CONCAT(#{devID}) - - - CONCAT(#{devID}) - diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml index d2d0214..c13eab4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml @@ -19,27 +19,44 @@ + + '%' || #{devcode}|| '%' + + + CONCAT('%',#{devcode},'%') + + + CONCAT('%',#{devcode},'%') + + - ID AS id, NB_DEVICE_ID AS nbDeviceId, DEVCODE AS devcode, VERIFY_CODE AS verifyCode, - NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS manufacturerId, - MANUFACTURER_NAME AS manufacturerName, DEVICE_TYPE AS deviceType, MODEL AS model, - PROTOCAL_TYPE AS protocalType, IS_SECURE AS isSecure + ID AS id, NB_DEVICE_ID AS "nbDeviceId", DEVCODE AS devcode, VERIFY_CODE AS "verifyCode", + NODEID AS nodeid, TIMEOUT AS timeout, NAME AS name, MANUFACTURER_ID AS "manufacturerId", + MANUFACTURER_NAME AS "manufacturerName", DEVICE_TYPE AS "deviceType", MODEL AS model, + PROTOCAL_TYPE AS "protocalType", IS_SECURE AS "isSecure" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml index a642d1e..d0c7e1b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/ConfigNbCuccMapper.xml @@ -15,10 +15,14 @@ - ID AS id, DEPTID AS deptid, BASE_URL AS baseUrl, APPID AS appid, APPKEY AS appkey, SUBSCRIBE_URL AS subscribeUrl, APPNAME AS appname + ID AS id, DEPTID AS deptid, BASE_URL AS "baseUrl", APPID AS appid, APPKEY AS appkey, + SUBSCRIBE_URL AS "subscribeUrl", APPNAME AS appname + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml index db0d728..f69e756 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionMapper.xml @@ -4,18 +4,18 @@ - - - - - - - + + + + + + + - ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS wellType, DEVICE_TYPE AS deviceType, area, MAP AS map + ID AS id, DEPTID AS deptid, COMMUNICATION AS communication, WELL_TYPE AS "wellType", DEVICE_TYPE AS "deviceType", area, MAP AS map diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml index 1c84ca3..2bc0bfd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceConcentratorMapper.xml @@ -13,7 +13,7 @@ - DEVICE_ID AS deviceId, CONCEN_ID AS concenId, STATUS AS status, ACTIVE AS active, TS AS ts + DEVICE_ID AS "deviceId", CONCEN_ID AS "concenId", STATUS AS status, ACTIVE AS active, TS AS ts diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4622bdf..e12c713 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -16,26 +16,50 @@ ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, - - as INSTALLDATE + + + + AS "INSTALLDATE" - - DATE_FORMAT - (INSTALLDATE,'%Y-%m-%d') + + + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') - - to_char - (INSTALLDATE,'yyyy-MM-dd') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s') + + + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') - - - ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version + + + '%' ||#{keywords}||'%' + + + CONCAT('%',#{keywords},'%') + + + + CONCAT('%',#{keywords},'%') + + + + str_to_date(${paramStr},'%Y-%m-%d %H:%i') + + + + TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi') + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + + - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s') - - - DATE_FORMAT - (UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - - - to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s') - - - - '%' ||#{keywords}||'%' - - - CONCAT('%',#{keywords},'%') - - - CONCAT('%',#{keywords},'%') - - - - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') - - - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') - - - #{endTime} - - - #{beginTime} - - - to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s') - - - to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s') - + - d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate", ONLINE_STATE AS "onlineState", t.TYPE_NAME AS "typeName" + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 9f1b06f..4943869 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -12,7 +12,7 @@ - ID AS id, MODEL_NAME AS modelName, DEVICE_TYPE AS deviceType, COMMUNICATION AS communication + ID AS id, MODEL_NAME AS "modelName", DEVICE_TYPE AS "deviceType", COMMUNICATION AS communication SELECT bdm.ID AS id, - bdm.MODEL_NAME AS modelName, + bdm.MODEL_NAME AS "modelName", bdm.COMMUNICATION AS communication, - bdm.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName + bdm.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName" FROM base_device_models bdm LEFT JOIN base_device_type bdt ON bdm.DEVICE_TYPE = bdt.ID @@ -40,13 +40,14 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml index fce044c..0ed47e1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml @@ -17,7 +17,8 @@ - ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts + ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, + SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts @@ -31,7 +32,7 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index 44755e4..9bd5107 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -12,10 +12,11 @@ - DEVICE_ID AS deviceId, WELL_ID AS wellId, TS AS ts, VALID AS valid + DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid UPDATE bus_device_well SET WELL_ID = #{wellId} WHERE DEVICE_ID = #{deviceId} + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java index 1c0ea8e..2960e16 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dict/ConcentDict.java @@ -11,7 +11,7 @@ put("concencode","集中器编号"); put("simid","SIM卡号"); put("position","集中器位置"); - put("lat"," 纬度"); + put("lat","纬度"); put("lng","经度"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java deleted file mode 100644 index 4064d07..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.casic.missiles.modular.system.model; - -import lombok.Data; - -/** - * @author cz - * @date 2022-6-22 - */ -@Data -public class DeviceAddParam { - private String deviceName; - private String devcode; - private String deviceType; - private String wellCode; - private String modelId; - private String installDate; - private String concenCode; - private String installHe; -} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 21df9e4..1504adb 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -266,7 +266,7 @@ this.setWellCode(busWellInfo.getWellCode()); this.setWellName(busWellInfo.getWellName()); this.setWellType(busWellInfo.getWellType()); - this.setDeptid(busWellInfo.getDeptid()); + this.setDeptid(busWellInfo.getDeptid().toString()); this.setDeep(busWellInfo.getDeep()); this.setCoordinateX(busWellInfo.getCoordinateX()); this.setCoordinateY(busWellInfo.getCoordinateY()); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index 5b2bbff..cd3837a 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -122,7 +122,7 @@ @ExcelProperty("权属单位代码") @NotEmpty(message = "权属单位代码不能为空") @TableField("DEPTID") - private String deptid; + private Long deptid; /** * 路标图片路径集合 */ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 348c792..3a8c3f7 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -114,7 +114,7 @@ try { if(null==busWellInfo.getResponsibleDept()){ - busWellInfo.setResponsibleDept(busWellInfo.getDeptid()); + busWellInfo.setResponsibleDept(busWellInfo.getDeptid().toString()); } // List deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true); @@ -175,7 +175,7 @@ Utility.convertCoordinate(busWellInfo); if(ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())){ - busWellInfo.setResponsibleDept(busWellInfo.getDeptid()); + busWellInfo.setResponsibleDept(busWellInfo.getDeptid().toString()); } // List deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true); // if(ToolUtil.isNotEmpty(deptTopRoleUsers)){ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java index 7d606a9..89f9586 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java @@ -38,7 +38,7 @@ String getAreaId(@Param("qu") String qu, @Param("area") String area); - String getAreaPId(@Param("id") String id); + String getAreaPId(@Param("id") Long id); List getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index 82cc624..567fbca 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -29,13 +29,22 @@ - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, + COORDINATE_X AS "coordinateX", COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", + LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", LAT_GAODE AS "latGaode", AREA AS area, + POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, + WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, + BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept" - ID - AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", + DEEP AS deep, COORDINATE_X AS "coordinateX", COORDINATE_Y AS "coordinateY", + LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", + LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, + DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS "wellType", + STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, + d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName" + - '%' || - #{keywords} - || - '%' + '%'||#{keywords}||'%' - CONCAT - ('%', - #{keywords}, - '%' - ) + CONCAT('%',#{keywords},'%') - CONCAT - ('%', - #{keywords}, - '%' - ) + CONCAT('%',#{keywords},'%') - d - . - ID - AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate", + ONLINE_STATE AS "onlineState", t.WATCH_TYPE AS "watchType", t.id as type - SELECT w.WELL_CODE AS wellCode, w.WELL_NAME AS wellName, w.deep, w.WELL_TYPE AS wellType,w.deptid AS deptId, + SELECT w.WELL_CODE AS "wellCode", w.WELL_NAME AS "wellName", + w.deep, w.WELL_TYPE AS "wellType",w.deptid AS "deptId", w.bfzt, w.position,w.id FROM bus_well_info w WHERE 1 = 1 @@ -144,8 +142,9 @@ + + + '%'||#{area}||'%' + + + CONCAT('%',#{area},'%') + + + CONCAT('%',#{area},'%') + +