diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index e1dd314..56caa96 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -200,7 +200,7 @@ /** * 报警井排名 */ - @RequestMapping("/alarmtype/count") + @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); @@ -210,7 +210,7 @@ /** * 报警情况统计 */ - @RequestMapping("/alarmtype/alarmStaticsByStatus") + @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index e1dd314..56caa96 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -200,7 +200,7 @@ /** * 报警井排名 */ - @RequestMapping("/alarmtype/count") + @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); @@ -210,7 +210,7 @@ /** * 报警情况统计 */ - @RequestMapping("/alarmtype/alarmStaticsByStatus") + @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); 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 f1336d9..5437b1d 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 @@ -25,15 +25,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index e1dd314..56caa96 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -200,7 +200,7 @@ /** * 报警井排名 */ - @RequestMapping("/alarmtype/count") + @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); @@ -210,7 +210,7 @@ /** * 报警情况统计 */ - @RequestMapping("/alarmtype/alarmStaticsByStatus") + @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); 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 f1336d9..5437b1d 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 @@ -25,15 +25,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 6d45309..902a7fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -29,16 +29,29 @@ + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index e1dd314..56caa96 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -200,7 +200,7 @@ /** * 报警井排名 */ - @RequestMapping("/alarmtype/count") + @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); @@ -210,7 +210,7 @@ /** * 报警情况统计 */ - @RequestMapping("/alarmtype/alarmStaticsByStatus") + @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); 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 f1336d9..5437b1d 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 @@ -25,15 +25,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 6d45309..902a7fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -29,16 +29,29 @@ + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index e1dd314..56caa96 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -200,7 +200,7 @@ /** * 报警井排名 */ - @RequestMapping("/alarmtype/count") + @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); @@ -210,7 +210,7 @@ /** * 报警情况统计 */ - @RequestMapping("/alarmtype/alarmStaticsByStatus") + @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); 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 f1336d9..5437b1d 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 @@ -25,15 +25,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 6d45309..902a7fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -29,16 +29,29 @@ + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index 0646d41..e99c9b6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index 0646d41..e99c9b6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - str_to_date(${paramStr},'%Y-%m-%d %H:%i') + str_to_date(${paramStr},'%Y-%m-%d %H:%i:%s') @@ -288,7 +288,7 @@ GROUP BY ALARM_CONTENT,deptid - ORDER BY alarmCount DESC + ORDER BY "alarmCount" DESC \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index e1dd314..56caa96 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -200,7 +200,7 @@ /** * 报警井排名 */ - @RequestMapping("/alarmtype/count") + @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); @@ -210,7 +210,7 @@ /** * 报警情况统计 */ - @RequestMapping("/alarmtype/alarmStaticsByStatus") + @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); 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 f1336d9..5437b1d 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 @@ -25,15 +25,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 6d45309..902a7fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -29,16 +29,29 @@ + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index 0646d41..e99c9b6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - str_to_date(${paramStr},'%Y-%m-%d %H:%i') + str_to_date(${paramStr},'%Y-%m-%d %H:%i:%s') @@ -288,7 +288,7 @@ GROUP BY ALARM_CONTENT,deptid - ORDER BY alarmCount DESC + ORDER BY "alarmCount" DESC \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 68c2cab..2515d4f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -165,7 +165,7 @@ try { List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) ); responseData.setCode(200); responseData.setMessage("查询成功"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index e1dd314..56caa96 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -200,7 +200,7 @@ /** * 报警井排名 */ - @RequestMapping("/alarmtype/count") + @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); @@ -210,7 +210,7 @@ /** * 报警情况统计 */ - @RequestMapping("/alarmtype/alarmStaticsByStatus") + @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); 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 f1336d9..5437b1d 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 @@ -25,15 +25,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 6d45309..902a7fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -29,16 +29,29 @@ + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index 0646d41..e99c9b6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - str_to_date(${paramStr},'%Y-%m-%d %H:%i') + str_to_date(${paramStr},'%Y-%m-%d %H:%i:%s') @@ -288,7 +288,7 @@ GROUP BY ALARM_CONTENT,deptid - ORDER BY alarmCount DESC + ORDER BY "alarmCount" DESC \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 68c2cab..2515d4f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -165,7 +165,7 @@ try { List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) ); responseData.setCode(200); responseData.setMessage("查询成功"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index 5e38071..c1e4ead 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -83,4 +83,12 @@ } } + /** + * 上传数据总记录数 + */ + @RequestMapping("/dataStatics/upLoadCountByTime") + public Object countThirdPartyData(String endTime, String beginTime) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index e1dd314..56caa96 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -200,7 +200,7 @@ /** * 报警井排名 */ - @RequestMapping("/alarmtype/count") + @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); @@ -210,7 +210,7 @@ /** * 报警情况统计 */ - @RequestMapping("/alarmtype/alarmStaticsByStatus") + @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); 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 f1336d9..5437b1d 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 @@ -25,15 +25,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 6d45309..902a7fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -29,16 +29,29 @@ + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index 0646d41..e99c9b6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - str_to_date(${paramStr},'%Y-%m-%d %H:%i') + str_to_date(${paramStr},'%Y-%m-%d %H:%i:%s') @@ -288,7 +288,7 @@ GROUP BY ALARM_CONTENT,deptid - ORDER BY alarmCount DESC + ORDER BY "alarmCount" DESC \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 68c2cab..2515d4f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -165,7 +165,7 @@ try { List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) ); responseData.setCode(200); responseData.setMessage("查询成功"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index 5e38071..c1e4ead 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -83,4 +83,12 @@ } } + /** + * 上传数据总记录数 + */ + @RequestMapping("/dataStatics/upLoadCountByTime") + public Object countThirdPartyData(String endTime, String beginTime) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime); + } } 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 8c6c326..4e30ef8 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 @@ -67,15 +67,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index e1dd314..56caa96 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -200,7 +200,7 @@ /** * 报警井排名 */ - @RequestMapping("/alarmtype/count") + @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); @@ -210,7 +210,7 @@ /** * 报警情况统计 */ - @RequestMapping("/alarmtype/alarmStaticsByStatus") + @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); 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 f1336d9..5437b1d 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 @@ -25,15 +25,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 6d45309..902a7fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -29,16 +29,29 @@ + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index 0646d41..e99c9b6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - str_to_date(${paramStr},'%Y-%m-%d %H:%i') + str_to_date(${paramStr},'%Y-%m-%d %H:%i:%s') @@ -288,7 +288,7 @@ GROUP BY ALARM_CONTENT,deptid - ORDER BY alarmCount DESC + ORDER BY "alarmCount" DESC \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 68c2cab..2515d4f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -165,7 +165,7 @@ try { List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) ); responseData.setCode(200); responseData.setMessage("查询成功"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index 5e38071..c1e4ead 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -83,4 +83,12 @@ } } + /** + * 上传数据总记录数 + */ + @RequestMapping("/dataStatics/upLoadCountByTime") + public Object countThirdPartyData(String endTime, String beginTime) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime); + } } 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 8c6c326..4e30ef8 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 @@ -67,15 +67,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java index ed397eb..74edbb4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.GasDectorDataDto; import com.casic.missiles.modular.system.model.PantiltDataDto; +import org.omg.CORBA.Object; public interface ThirdPartyDataService { @@ -13,4 +14,6 @@ ResponseData getPantiltDataListPage(Page page, DataScope dataScope, String deptid, String endTime, String beginTime, String keyWords); + + ResponseData countThirdPartyData(DataScope dataScope,String endTime,String beginTime); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index e1dd314..56caa96 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -200,7 +200,7 @@ /** * 报警井排名 */ - @RequestMapping("/alarmtype/count") + @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); @@ -210,7 +210,7 @@ /** * 报警情况统计 */ - @RequestMapping("/alarmtype/alarmStaticsByStatus") + @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); 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 f1336d9..5437b1d 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 @@ -25,15 +25,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 6d45309..902a7fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -29,16 +29,29 @@ + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index 0646d41..e99c9b6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - str_to_date(${paramStr},'%Y-%m-%d %H:%i') + str_to_date(${paramStr},'%Y-%m-%d %H:%i:%s') @@ -288,7 +288,7 @@ GROUP BY ALARM_CONTENT,deptid - ORDER BY alarmCount DESC + ORDER BY "alarmCount" DESC \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 68c2cab..2515d4f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -165,7 +165,7 @@ try { List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) ); responseData.setCode(200); responseData.setMessage("查询成功"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index 5e38071..c1e4ead 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -83,4 +83,12 @@ } } + /** + * 上传数据总记录数 + */ + @RequestMapping("/dataStatics/upLoadCountByTime") + public Object countThirdPartyData(String endTime, String beginTime) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime); + } } 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 8c6c326..4e30ef8 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 @@ -67,15 +67,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java index ed397eb..74edbb4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.GasDectorDataDto; import com.casic.missiles.modular.system.model.PantiltDataDto; +import org.omg.CORBA.Object; public interface ThirdPartyDataService { @@ -13,4 +14,6 @@ ResponseData getPantiltDataListPage(Page page, DataScope dataScope, String deptid, String endTime, String beginTime, String keyWords); + + ResponseData countThirdPartyData(DataScope dataScope,String endTime,String beginTime); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 182c9d4..eae1c72 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -65,4 +65,20 @@ return responseData; } + + public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { + ResponseData responseData = new ResponseData(); + try { +// List pantiltDtoList = thirdPartyMapper.countThirdPartyData(dataScope,endTime,beginTime); + responseData.setMessage("查询成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex); + responseData.setMessage("查询异常"); + responseData.setCode(500); + } + return responseData; + } + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index e1dd314..56caa96 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -200,7 +200,7 @@ /** * 报警井排名 */ - @RequestMapping("/alarmtype/count") + @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); @@ -210,7 +210,7 @@ /** * 报警情况统计 */ - @RequestMapping("/alarmtype/alarmStaticsByStatus") + @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); 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 f1336d9..5437b1d 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 @@ -25,15 +25,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 6d45309..902a7fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -29,16 +29,29 @@ + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index 0646d41..e99c9b6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - str_to_date(${paramStr},'%Y-%m-%d %H:%i') + str_to_date(${paramStr},'%Y-%m-%d %H:%i:%s') @@ -288,7 +288,7 @@ GROUP BY ALARM_CONTENT,deptid - ORDER BY alarmCount DESC + ORDER BY "alarmCount" DESC \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 68c2cab..2515d4f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -165,7 +165,7 @@ try { List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) ); responseData.setCode(200); responseData.setMessage("查询成功"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index 5e38071..c1e4ead 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -83,4 +83,12 @@ } } + /** + * 上传数据总记录数 + */ + @RequestMapping("/dataStatics/upLoadCountByTime") + public Object countThirdPartyData(String endTime, String beginTime) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime); + } } 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 8c6c326..4e30ef8 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 @@ -67,15 +67,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java index ed397eb..74edbb4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.GasDectorDataDto; import com.casic.missiles.modular.system.model.PantiltDataDto; +import org.omg.CORBA.Object; public interface ThirdPartyDataService { @@ -13,4 +14,6 @@ ResponseData getPantiltDataListPage(Page page, DataScope dataScope, String deptid, String endTime, String beginTime, String keyWords); + + ResponseData countThirdPartyData(DataScope dataScope,String endTime,String beginTime); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 182c9d4..eae1c72 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -65,4 +65,20 @@ return responseData; } + + public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { + ResponseData responseData = new ResponseData(); + try { +// List pantiltDtoList = thirdPartyMapper.countThirdPartyData(dataScope,endTime,beginTime); + responseData.setMessage("查询成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex); + responseData.setMessage("查询异常"); + responseData.setCode(500); + } + return responseData; + } + + } 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 73ccbd8..0199778 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 @@ -262,13 +262,15 @@ /** * 离线设备列表 */ - @RequestMapping(value = "/offline/listpage") + @RequestMapping(value = "/offlineListPage") @ResponseBody @BussinessLog(value = "离线设备列表") - public Object offlineListPage(String deviceCode,String deviceType) { + public Object offlineListPage(String deviceCode, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); Page> page = PageFactory.defaultPage(); - return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + ResponseData responseData = deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index e1dd314..56caa96 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -200,7 +200,7 @@ /** * 报警井排名 */ - @RequestMapping("/alarmtype/count") + @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); @@ -210,7 +210,7 @@ /** * 报警情况统计 */ - @RequestMapping("/alarmtype/alarmStaticsByStatus") + @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); 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 f1336d9..5437b1d 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 @@ -25,15 +25,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 6d45309..902a7fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -29,16 +29,29 @@ + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index 0646d41..e99c9b6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - str_to_date(${paramStr},'%Y-%m-%d %H:%i') + str_to_date(${paramStr},'%Y-%m-%d %H:%i:%s') @@ -288,7 +288,7 @@ GROUP BY ALARM_CONTENT,deptid - ORDER BY alarmCount DESC + ORDER BY "alarmCount" DESC \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 68c2cab..2515d4f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -165,7 +165,7 @@ try { List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) ); responseData.setCode(200); responseData.setMessage("查询成功"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index 5e38071..c1e4ead 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -83,4 +83,12 @@ } } + /** + * 上传数据总记录数 + */ + @RequestMapping("/dataStatics/upLoadCountByTime") + public Object countThirdPartyData(String endTime, String beginTime) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime); + } } 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 8c6c326..4e30ef8 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 @@ -67,15 +67,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java index ed397eb..74edbb4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.GasDectorDataDto; import com.casic.missiles.modular.system.model.PantiltDataDto; +import org.omg.CORBA.Object; public interface ThirdPartyDataService { @@ -13,4 +14,6 @@ ResponseData getPantiltDataListPage(Page page, DataScope dataScope, String deptid, String endTime, String beginTime, String keyWords); + + ResponseData countThirdPartyData(DataScope dataScope,String endTime,String beginTime); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 182c9d4..eae1c72 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -65,4 +65,20 @@ return responseData; } + + public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { + ResponseData responseData = new ResponseData(); + try { +// List pantiltDtoList = thirdPartyMapper.countThirdPartyData(dataScope,endTime,beginTime); + responseData.setMessage("查询成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex); + responseData.setMessage("查询异常"); + responseData.setCode(500); + } + return responseData; + } + + } 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 73ccbd8..0199778 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 @@ -262,13 +262,15 @@ /** * 离线设备列表 */ - @RequestMapping(value = "/offline/listpage") + @RequestMapping(value = "/offlineListPage") @ResponseBody @BussinessLog(value = "离线设备列表") - public Object offlineListPage(String deviceCode,String deviceType) { + public Object offlineListPage(String deviceCode, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); Page> page = PageFactory.defaultPage(); - return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + ResponseData responseData = deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 61e20d5..ee4c880 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -34,7 +34,7 @@ @RequestMapping(value = "/listPage") public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 - Page page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); responseData.setData(super.packForBT(page)); return responseData; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index e1dd314..56caa96 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -200,7 +200,7 @@ /** * 报警井排名 */ - @RequestMapping("/alarmtype/count") + @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); @@ -210,7 +210,7 @@ /** * 报警情况统计 */ - @RequestMapping("/alarmtype/alarmStaticsByStatus") + @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); 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 f1336d9..5437b1d 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 @@ -25,15 +25,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 6d45309..902a7fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -29,16 +29,29 @@ + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index 0646d41..e99c9b6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - str_to_date(${paramStr},'%Y-%m-%d %H:%i') + str_to_date(${paramStr},'%Y-%m-%d %H:%i:%s') @@ -288,7 +288,7 @@ GROUP BY ALARM_CONTENT,deptid - ORDER BY alarmCount DESC + ORDER BY "alarmCount" DESC \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 68c2cab..2515d4f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -165,7 +165,7 @@ try { List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) ); responseData.setCode(200); responseData.setMessage("查询成功"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index 5e38071..c1e4ead 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -83,4 +83,12 @@ } } + /** + * 上传数据总记录数 + */ + @RequestMapping("/dataStatics/upLoadCountByTime") + public Object countThirdPartyData(String endTime, String beginTime) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime); + } } 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 8c6c326..4e30ef8 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 @@ -67,15 +67,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java index ed397eb..74edbb4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.GasDectorDataDto; import com.casic.missiles.modular.system.model.PantiltDataDto; +import org.omg.CORBA.Object; public interface ThirdPartyDataService { @@ -13,4 +14,6 @@ ResponseData getPantiltDataListPage(Page page, DataScope dataScope, String deptid, String endTime, String beginTime, String keyWords); + + ResponseData countThirdPartyData(DataScope dataScope,String endTime,String beginTime); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 182c9d4..eae1c72 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -65,4 +65,20 @@ return responseData; } + + public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { + ResponseData responseData = new ResponseData(); + try { +// List pantiltDtoList = thirdPartyMapper.countThirdPartyData(dataScope,endTime,beginTime); + responseData.setMessage("查询成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex); + responseData.setMessage("查询异常"); + responseData.setCode(500); + } + return responseData; + } + + } 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 73ccbd8..0199778 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 @@ -262,13 +262,15 @@ /** * 离线设备列表 */ - @RequestMapping(value = "/offline/listpage") + @RequestMapping(value = "/offlineListPage") @ResponseBody @BussinessLog(value = "离线设备列表") - public Object offlineListPage(String deviceCode,String deviceType) { + public Object offlineListPage(String deviceCode, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); Page> page = PageFactory.defaultPage(); - return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + ResponseData responseData = deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 61e20d5..ee4c880 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -34,7 +34,7 @@ @RequestMapping(value = "/listPage") public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 - Page page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); responseData.setData(super.packForBT(page)); return responseData; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index bf06228..53c1775 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -32,21 +32,14 @@ @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { + private final IDeviceModelsService deviceModelsService; - @Autowired - private IDeviceModelsService deviceModelsService; + private final IDeviceTypeService deviceTypeService; -// /** -// * 获取列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(Long deviceType) { -// return deviceModelsService.selectList(deviceType); -// } - - @Autowired - private IDeviceTypeService deviceTypeService; + public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { + this.deviceTypeService = deviceTypeService; + this.deviceModelsService = deviceModelsService; + } /** * 获取分页列表 @@ -60,7 +53,7 @@ .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().stream().forEach( + page.getRecords().forEach( deviceModels -> { deviceModels.setDeviceTypeName(deviceTypeService.getById(deviceModels.getDeviceType()).getTypeName()); String[] d = deviceModels.getCommunication().split(","); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index e1dd314..56caa96 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -200,7 +200,7 @@ /** * 报警井排名 */ - @RequestMapping("/alarmtype/count") + @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); @@ -210,7 +210,7 @@ /** * 报警情况统计 */ - @RequestMapping("/alarmtype/alarmStaticsByStatus") + @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); 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 f1336d9..5437b1d 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 @@ -25,15 +25,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 6d45309..902a7fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -29,16 +29,29 @@ + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index 0646d41..e99c9b6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - str_to_date(${paramStr},'%Y-%m-%d %H:%i') + str_to_date(${paramStr},'%Y-%m-%d %H:%i:%s') @@ -288,7 +288,7 @@ GROUP BY ALARM_CONTENT,deptid - ORDER BY alarmCount DESC + ORDER BY "alarmCount" DESC \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 68c2cab..2515d4f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -165,7 +165,7 @@ try { List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) ); responseData.setCode(200); responseData.setMessage("查询成功"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index 5e38071..c1e4ead 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -83,4 +83,12 @@ } } + /** + * 上传数据总记录数 + */ + @RequestMapping("/dataStatics/upLoadCountByTime") + public Object countThirdPartyData(String endTime, String beginTime) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime); + } } 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 8c6c326..4e30ef8 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 @@ -67,15 +67,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java index ed397eb..74edbb4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.GasDectorDataDto; import com.casic.missiles.modular.system.model.PantiltDataDto; +import org.omg.CORBA.Object; public interface ThirdPartyDataService { @@ -13,4 +14,6 @@ ResponseData getPantiltDataListPage(Page page, DataScope dataScope, String deptid, String endTime, String beginTime, String keyWords); + + ResponseData countThirdPartyData(DataScope dataScope,String endTime,String beginTime); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 182c9d4..eae1c72 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -65,4 +65,20 @@ return responseData; } + + public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { + ResponseData responseData = new ResponseData(); + try { +// List pantiltDtoList = thirdPartyMapper.countThirdPartyData(dataScope,endTime,beginTime); + responseData.setMessage("查询成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex); + responseData.setMessage("查询异常"); + responseData.setCode(500); + } + return responseData; + } + + } 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 73ccbd8..0199778 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 @@ -262,13 +262,15 @@ /** * 离线设备列表 */ - @RequestMapping(value = "/offline/listpage") + @RequestMapping(value = "/offlineListPage") @ResponseBody @BussinessLog(value = "离线设备列表") - public Object offlineListPage(String deviceCode,String deviceType) { + public Object offlineListPage(String deviceCode, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); Page> page = PageFactory.defaultPage(); - return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + ResponseData responseData = deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 61e20d5..ee4c880 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -34,7 +34,7 @@ @RequestMapping(value = "/listPage") public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 - Page page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); responseData.setData(super.packForBT(page)); return responseData; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index bf06228..53c1775 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -32,21 +32,14 @@ @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { + private final IDeviceModelsService deviceModelsService; - @Autowired - private IDeviceModelsService deviceModelsService; + private final IDeviceTypeService deviceTypeService; -// /** -// * 获取列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(Long deviceType) { -// return deviceModelsService.selectList(deviceType); -// } - - @Autowired - private IDeviceTypeService deviceTypeService; + public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { + this.deviceTypeService = deviceTypeService; + this.deviceModelsService = deviceModelsService; + } /** * 获取分页列表 @@ -60,7 +53,7 @@ .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().stream().forEach( + page.getRecords().forEach( deviceModels -> { deviceModels.setDeviceTypeName(deviceTypeService.getById(deviceModels.getDeviceType()).getTypeName()); String[] d = deviceModels.getCommunication().split(","); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java index 136d858..1f6ddae 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java @@ -8,11 +8,12 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; @Mapper public interface DeviceImeiMapper extends BaseMapper { - List getImeiListPage(@Param("page") Page page, - @Param("devcode") String devcode); + List> getImeiListPage(@Param("page") Page> page, + @Param("devcode") String devcode); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index e1dd314..56caa96 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -200,7 +200,7 @@ /** * 报警井排名 */ - @RequestMapping("/alarmtype/count") + @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); @@ -210,7 +210,7 @@ /** * 报警情况统计 */ - @RequestMapping("/alarmtype/alarmStaticsByStatus") + @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); 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 f1336d9..5437b1d 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 @@ -25,15 +25,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 6d45309..902a7fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -29,16 +29,29 @@ + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index 0646d41..e99c9b6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - str_to_date(${paramStr},'%Y-%m-%d %H:%i') + str_to_date(${paramStr},'%Y-%m-%d %H:%i:%s') @@ -288,7 +288,7 @@ GROUP BY ALARM_CONTENT,deptid - ORDER BY alarmCount DESC + ORDER BY "alarmCount" DESC \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 68c2cab..2515d4f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -165,7 +165,7 @@ try { List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) ); responseData.setCode(200); responseData.setMessage("查询成功"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index 5e38071..c1e4ead 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -83,4 +83,12 @@ } } + /** + * 上传数据总记录数 + */ + @RequestMapping("/dataStatics/upLoadCountByTime") + public Object countThirdPartyData(String endTime, String beginTime) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime); + } } 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 8c6c326..4e30ef8 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 @@ -67,15 +67,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java index ed397eb..74edbb4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.GasDectorDataDto; import com.casic.missiles.modular.system.model.PantiltDataDto; +import org.omg.CORBA.Object; public interface ThirdPartyDataService { @@ -13,4 +14,6 @@ ResponseData getPantiltDataListPage(Page page, DataScope dataScope, String deptid, String endTime, String beginTime, String keyWords); + + ResponseData countThirdPartyData(DataScope dataScope,String endTime,String beginTime); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 182c9d4..eae1c72 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -65,4 +65,20 @@ return responseData; } + + public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { + ResponseData responseData = new ResponseData(); + try { +// List pantiltDtoList = thirdPartyMapper.countThirdPartyData(dataScope,endTime,beginTime); + responseData.setMessage("查询成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex); + responseData.setMessage("查询异常"); + responseData.setCode(500); + } + return responseData; + } + + } 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 73ccbd8..0199778 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 @@ -262,13 +262,15 @@ /** * 离线设备列表 */ - @RequestMapping(value = "/offline/listpage") + @RequestMapping(value = "/offlineListPage") @ResponseBody @BussinessLog(value = "离线设备列表") - public Object offlineListPage(String deviceCode,String deviceType) { + public Object offlineListPage(String deviceCode, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); Page> page = PageFactory.defaultPage(); - return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + ResponseData responseData = deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 61e20d5..ee4c880 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -34,7 +34,7 @@ @RequestMapping(value = "/listPage") public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 - Page page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); responseData.setData(super.packForBT(page)); return responseData; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index bf06228..53c1775 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -32,21 +32,14 @@ @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { + private final IDeviceModelsService deviceModelsService; - @Autowired - private IDeviceModelsService deviceModelsService; + private final IDeviceTypeService deviceTypeService; -// /** -// * 获取列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(Long deviceType) { -// return deviceModelsService.selectList(deviceType); -// } - - @Autowired - private IDeviceTypeService deviceTypeService; + public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { + this.deviceTypeService = deviceTypeService; + this.deviceModelsService = deviceModelsService; + } /** * 获取分页列表 @@ -60,7 +53,7 @@ .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().stream().forEach( + page.getRecords().forEach( deviceModels -> { deviceModels.setDeviceTypeName(deviceTypeService.getById(deviceModels.getDeviceType()).getTypeName()); String[] d = deviceModels.getCommunication().split(","); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java index 136d858..1f6ddae 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java @@ -8,11 +8,12 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; @Mapper public interface DeviceImeiMapper extends BaseMapper { - List getImeiListPage(@Param("page") Page page, - @Param("devcode") String devcode); + List> getImeiListPage(@Param("page") Page> page, + @Param("devcode") String devcode); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index a47b0c7..9e5b366 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -12,18 +12,18 @@ - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - SELECT id,devcode,imei,iccid, - + AS logtime FROM bus_imei_iccid WHERE 1=1 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index e1dd314..56caa96 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -200,7 +200,7 @@ /** * 报警井排名 */ - @RequestMapping("/alarmtype/count") + @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); @@ -210,7 +210,7 @@ /** * 报警情况统计 */ - @RequestMapping("/alarmtype/alarmStaticsByStatus") + @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); 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 f1336d9..5437b1d 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 @@ -25,15 +25,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 6d45309..902a7fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -29,16 +29,29 @@ + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index 0646d41..e99c9b6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - str_to_date(${paramStr},'%Y-%m-%d %H:%i') + str_to_date(${paramStr},'%Y-%m-%d %H:%i:%s') @@ -288,7 +288,7 @@ GROUP BY ALARM_CONTENT,deptid - ORDER BY alarmCount DESC + ORDER BY "alarmCount" DESC \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 68c2cab..2515d4f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -165,7 +165,7 @@ try { List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) ); responseData.setCode(200); responseData.setMessage("查询成功"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index 5e38071..c1e4ead 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -83,4 +83,12 @@ } } + /** + * 上传数据总记录数 + */ + @RequestMapping("/dataStatics/upLoadCountByTime") + public Object countThirdPartyData(String endTime, String beginTime) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime); + } } 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 8c6c326..4e30ef8 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 @@ -67,15 +67,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java index ed397eb..74edbb4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.GasDectorDataDto; import com.casic.missiles.modular.system.model.PantiltDataDto; +import org.omg.CORBA.Object; public interface ThirdPartyDataService { @@ -13,4 +14,6 @@ ResponseData getPantiltDataListPage(Page page, DataScope dataScope, String deptid, String endTime, String beginTime, String keyWords); + + ResponseData countThirdPartyData(DataScope dataScope,String endTime,String beginTime); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 182c9d4..eae1c72 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -65,4 +65,20 @@ return responseData; } + + public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { + ResponseData responseData = new ResponseData(); + try { +// List pantiltDtoList = thirdPartyMapper.countThirdPartyData(dataScope,endTime,beginTime); + responseData.setMessage("查询成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex); + responseData.setMessage("查询异常"); + responseData.setCode(500); + } + return responseData; + } + + } 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 73ccbd8..0199778 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 @@ -262,13 +262,15 @@ /** * 离线设备列表 */ - @RequestMapping(value = "/offline/listpage") + @RequestMapping(value = "/offlineListPage") @ResponseBody @BussinessLog(value = "离线设备列表") - public Object offlineListPage(String deviceCode,String deviceType) { + public Object offlineListPage(String deviceCode, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); Page> page = PageFactory.defaultPage(); - return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + ResponseData responseData = deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 61e20d5..ee4c880 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -34,7 +34,7 @@ @RequestMapping(value = "/listPage") public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 - Page page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); responseData.setData(super.packForBT(page)); return responseData; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index bf06228..53c1775 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -32,21 +32,14 @@ @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { + private final IDeviceModelsService deviceModelsService; - @Autowired - private IDeviceModelsService deviceModelsService; + private final IDeviceTypeService deviceTypeService; -// /** -// * 获取列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(Long deviceType) { -// return deviceModelsService.selectList(deviceType); -// } - - @Autowired - private IDeviceTypeService deviceTypeService; + public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { + this.deviceTypeService = deviceTypeService; + this.deviceModelsService = deviceModelsService; + } /** * 获取分页列表 @@ -60,7 +53,7 @@ .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().stream().forEach( + page.getRecords().forEach( deviceModels -> { deviceModels.setDeviceTypeName(deviceTypeService.getById(deviceModels.getDeviceType()).getTypeName()); String[] d = deviceModels.getCommunication().split(","); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java index 136d858..1f6ddae 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java @@ -8,11 +8,12 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; @Mapper public interface DeviceImeiMapper extends BaseMapper { - List getImeiListPage(@Param("page") Page page, - @Param("devcode") String devcode); + List> getImeiListPage(@Param("page") Page> page, + @Param("devcode") String devcode); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index a47b0c7..9e5b366 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -12,18 +12,18 @@ - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - SELECT id,devcode,imei,iccid, - + AS logtime FROM bus_imei_iccid WHERE 1=1 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 7de589e..8de6875 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 @@ -35,15 +35,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index e1dd314..56caa96 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -200,7 +200,7 @@ /** * 报警井排名 */ - @RequestMapping("/alarmtype/count") + @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); @@ -210,7 +210,7 @@ /** * 报警情况统计 */ - @RequestMapping("/alarmtype/alarmStaticsByStatus") + @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); 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 f1336d9..5437b1d 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 @@ -25,15 +25,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 6d45309..902a7fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -29,16 +29,29 @@ + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index 0646d41..e99c9b6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - str_to_date(${paramStr},'%Y-%m-%d %H:%i') + str_to_date(${paramStr},'%Y-%m-%d %H:%i:%s') @@ -288,7 +288,7 @@ GROUP BY ALARM_CONTENT,deptid - ORDER BY alarmCount DESC + ORDER BY "alarmCount" DESC \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 68c2cab..2515d4f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -165,7 +165,7 @@ try { List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) ); responseData.setCode(200); responseData.setMessage("查询成功"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index 5e38071..c1e4ead 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -83,4 +83,12 @@ } } + /** + * 上传数据总记录数 + */ + @RequestMapping("/dataStatics/upLoadCountByTime") + public Object countThirdPartyData(String endTime, String beginTime) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime); + } } 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 8c6c326..4e30ef8 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 @@ -67,15 +67,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java index ed397eb..74edbb4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.GasDectorDataDto; import com.casic.missiles.modular.system.model.PantiltDataDto; +import org.omg.CORBA.Object; public interface ThirdPartyDataService { @@ -13,4 +14,6 @@ ResponseData getPantiltDataListPage(Page page, DataScope dataScope, String deptid, String endTime, String beginTime, String keyWords); + + ResponseData countThirdPartyData(DataScope dataScope,String endTime,String beginTime); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 182c9d4..eae1c72 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -65,4 +65,20 @@ return responseData; } + + public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { + ResponseData responseData = new ResponseData(); + try { +// List pantiltDtoList = thirdPartyMapper.countThirdPartyData(dataScope,endTime,beginTime); + responseData.setMessage("查询成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex); + responseData.setMessage("查询异常"); + responseData.setCode(500); + } + return responseData; + } + + } 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 73ccbd8..0199778 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 @@ -262,13 +262,15 @@ /** * 离线设备列表 */ - @RequestMapping(value = "/offline/listpage") + @RequestMapping(value = "/offlineListPage") @ResponseBody @BussinessLog(value = "离线设备列表") - public Object offlineListPage(String deviceCode,String deviceType) { + public Object offlineListPage(String deviceCode, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); Page> page = PageFactory.defaultPage(); - return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + ResponseData responseData = deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 61e20d5..ee4c880 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -34,7 +34,7 @@ @RequestMapping(value = "/listPage") public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 - Page page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); responseData.setData(super.packForBT(page)); return responseData; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index bf06228..53c1775 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -32,21 +32,14 @@ @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { + private final IDeviceModelsService deviceModelsService; - @Autowired - private IDeviceModelsService deviceModelsService; + private final IDeviceTypeService deviceTypeService; -// /** -// * 获取列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(Long deviceType) { -// return deviceModelsService.selectList(deviceType); -// } - - @Autowired - private IDeviceTypeService deviceTypeService; + public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { + this.deviceTypeService = deviceTypeService; + this.deviceModelsService = deviceModelsService; + } /** * 获取分页列表 @@ -60,7 +53,7 @@ .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().stream().forEach( + page.getRecords().forEach( deviceModels -> { deviceModels.setDeviceTypeName(deviceTypeService.getById(deviceModels.getDeviceType()).getTypeName()); String[] d = deviceModels.getCommunication().split(","); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java index 136d858..1f6ddae 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java @@ -8,11 +8,12 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; @Mapper public interface DeviceImeiMapper extends BaseMapper { - List getImeiListPage(@Param("page") Page page, - @Param("devcode") String devcode); + List> getImeiListPage(@Param("page") Page> page, + @Param("devcode") String devcode); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index a47b0c7..9e5b366 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -12,18 +12,18 @@ - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - SELECT id,devcode,imei,iccid, - + AS logtime FROM bus_imei_iccid WHERE 1=1 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 7de589e..8de6875 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 @@ -35,15 +35,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml index 2367d94..5e6c88d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml @@ -27,15 +27,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index 0646d41..e99c9b6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - str_to_date(${paramStr},'%Y-%m-%d %H:%i') + str_to_date(${paramStr},'%Y-%m-%d %H:%i:%s') @@ -288,7 +288,7 @@ GROUP BY ALARM_CONTENT,deptid - ORDER BY alarmCount DESC + ORDER BY "alarmCount" DESC \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 68c2cab..2515d4f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -165,7 +165,7 @@ try { List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) ); responseData.setCode(200); responseData.setMessage("查询成功"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index 5e38071..c1e4ead 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -83,4 +83,12 @@ } } + /** + * 上传数据总记录数 + */ + @RequestMapping("/dataStatics/upLoadCountByTime") + public Object countThirdPartyData(String endTime, String beginTime) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime); + } } 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 8c6c326..4e30ef8 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 @@ -67,15 +67,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java index ed397eb..74edbb4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.GasDectorDataDto; import com.casic.missiles.modular.system.model.PantiltDataDto; +import org.omg.CORBA.Object; public interface ThirdPartyDataService { @@ -13,4 +14,6 @@ ResponseData getPantiltDataListPage(Page page, DataScope dataScope, String deptid, String endTime, String beginTime, String keyWords); + + ResponseData countThirdPartyData(DataScope dataScope,String endTime,String beginTime); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 182c9d4..eae1c72 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -65,4 +65,20 @@ return responseData; } + + public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { + ResponseData responseData = new ResponseData(); + try { +// List pantiltDtoList = thirdPartyMapper.countThirdPartyData(dataScope,endTime,beginTime); + responseData.setMessage("查询成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex); + responseData.setMessage("查询异常"); + responseData.setCode(500); + } + return responseData; + } + + } 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 73ccbd8..0199778 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 @@ -262,13 +262,15 @@ /** * 离线设备列表 */ - @RequestMapping(value = "/offline/listpage") + @RequestMapping(value = "/offlineListPage") @ResponseBody @BussinessLog(value = "离线设备列表") - public Object offlineListPage(String deviceCode,String deviceType) { + public Object offlineListPage(String deviceCode, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); Page> page = PageFactory.defaultPage(); - return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + ResponseData responseData = deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 61e20d5..ee4c880 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -34,7 +34,7 @@ @RequestMapping(value = "/listPage") public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 - Page page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); responseData.setData(super.packForBT(page)); return responseData; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index bf06228..53c1775 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -32,21 +32,14 @@ @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { + private final IDeviceModelsService deviceModelsService; - @Autowired - private IDeviceModelsService deviceModelsService; + private final IDeviceTypeService deviceTypeService; -// /** -// * 获取列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(Long deviceType) { -// return deviceModelsService.selectList(deviceType); -// } - - @Autowired - private IDeviceTypeService deviceTypeService; + public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { + this.deviceTypeService = deviceTypeService; + this.deviceModelsService = deviceModelsService; + } /** * 获取分页列表 @@ -60,7 +53,7 @@ .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().stream().forEach( + page.getRecords().forEach( deviceModels -> { deviceModels.setDeviceTypeName(deviceTypeService.getById(deviceModels.getDeviceType()).getTypeName()); String[] d = deviceModels.getCommunication().split(","); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java index 136d858..1f6ddae 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java @@ -8,11 +8,12 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; @Mapper public interface DeviceImeiMapper extends BaseMapper { - List getImeiListPage(@Param("page") Page page, - @Param("devcode") String devcode); + List> getImeiListPage(@Param("page") Page> page, + @Param("devcode") String devcode); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index a47b0c7..9e5b366 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -12,18 +12,18 @@ - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - SELECT id,devcode,imei,iccid, - + AS logtime FROM bus_imei_iccid WHERE 1=1 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 7de589e..8de6875 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 @@ -35,15 +35,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml index 2367d94..5e6c88d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml @@ -27,15 +27,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index 0646d41..e99c9b6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - str_to_date(${paramStr},'%Y-%m-%d %H:%i') + str_to_date(${paramStr},'%Y-%m-%d %H:%i:%s') @@ -288,7 +288,7 @@ GROUP BY ALARM_CONTENT,deptid - ORDER BY alarmCount DESC + ORDER BY "alarmCount" DESC \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 68c2cab..2515d4f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -165,7 +165,7 @@ try { List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) ); responseData.setCode(200); responseData.setMessage("查询成功"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index 5e38071..c1e4ead 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -83,4 +83,12 @@ } } + /** + * 上传数据总记录数 + */ + @RequestMapping("/dataStatics/upLoadCountByTime") + public Object countThirdPartyData(String endTime, String beginTime) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime); + } } 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 8c6c326..4e30ef8 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 @@ -67,15 +67,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java index ed397eb..74edbb4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.GasDectorDataDto; import com.casic.missiles.modular.system.model.PantiltDataDto; +import org.omg.CORBA.Object; public interface ThirdPartyDataService { @@ -13,4 +14,6 @@ ResponseData getPantiltDataListPage(Page page, DataScope dataScope, String deptid, String endTime, String beginTime, String keyWords); + + ResponseData countThirdPartyData(DataScope dataScope,String endTime,String beginTime); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 182c9d4..eae1c72 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -65,4 +65,20 @@ return responseData; } + + public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { + ResponseData responseData = new ResponseData(); + try { +// List pantiltDtoList = thirdPartyMapper.countThirdPartyData(dataScope,endTime,beginTime); + responseData.setMessage("查询成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex); + responseData.setMessage("查询异常"); + responseData.setCode(500); + } + return responseData; + } + + } 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 73ccbd8..0199778 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 @@ -262,13 +262,15 @@ /** * 离线设备列表 */ - @RequestMapping(value = "/offline/listpage") + @RequestMapping(value = "/offlineListPage") @ResponseBody @BussinessLog(value = "离线设备列表") - public Object offlineListPage(String deviceCode,String deviceType) { + public Object offlineListPage(String deviceCode, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); Page> page = PageFactory.defaultPage(); - return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + ResponseData responseData = deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 61e20d5..ee4c880 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -34,7 +34,7 @@ @RequestMapping(value = "/listPage") public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 - Page page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); responseData.setData(super.packForBT(page)); return responseData; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index bf06228..53c1775 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -32,21 +32,14 @@ @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { + private final IDeviceModelsService deviceModelsService; - @Autowired - private IDeviceModelsService deviceModelsService; + private final IDeviceTypeService deviceTypeService; -// /** -// * 获取列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(Long deviceType) { -// return deviceModelsService.selectList(deviceType); -// } - - @Autowired - private IDeviceTypeService deviceTypeService; + public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { + this.deviceTypeService = deviceTypeService; + this.deviceModelsService = deviceModelsService; + } /** * 获取分页列表 @@ -60,7 +53,7 @@ .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().stream().forEach( + page.getRecords().forEach( deviceModels -> { deviceModels.setDeviceTypeName(deviceTypeService.getById(deviceModels.getDeviceType()).getTypeName()); String[] d = deviceModels.getCommunication().split(","); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java index 136d858..1f6ddae 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java @@ -8,11 +8,12 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; @Mapper public interface DeviceImeiMapper extends BaseMapper { - List getImeiListPage(@Param("page") Page page, - @Param("devcode") String devcode); + List> getImeiListPage(@Param("page") Page> page, + @Param("devcode") String devcode); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index a47b0c7..9e5b366 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -12,18 +12,18 @@ - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - SELECT id,devcode,imei,iccid, - + AS logtime FROM bus_imei_iccid WHERE 1=1 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 7de589e..8de6875 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 @@ -35,15 +35,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml index 2367d94..5e6c88d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml @@ -27,15 +27,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index 0646d41..e99c9b6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - str_to_date(${paramStr},'%Y-%m-%d %H:%i') + str_to_date(${paramStr},'%Y-%m-%d %H:%i:%s') @@ -288,7 +288,7 @@ GROUP BY ALARM_CONTENT,deptid - ORDER BY alarmCount DESC + ORDER BY "alarmCount" DESC \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 68c2cab..2515d4f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -165,7 +165,7 @@ try { List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) ); responseData.setCode(200); responseData.setMessage("查询成功"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index 5e38071..c1e4ead 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -83,4 +83,12 @@ } } + /** + * 上传数据总记录数 + */ + @RequestMapping("/dataStatics/upLoadCountByTime") + public Object countThirdPartyData(String endTime, String beginTime) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime); + } } 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 8c6c326..4e30ef8 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 @@ -67,15 +67,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java index ed397eb..74edbb4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.GasDectorDataDto; import com.casic.missiles.modular.system.model.PantiltDataDto; +import org.omg.CORBA.Object; public interface ThirdPartyDataService { @@ -13,4 +14,6 @@ ResponseData getPantiltDataListPage(Page page, DataScope dataScope, String deptid, String endTime, String beginTime, String keyWords); + + ResponseData countThirdPartyData(DataScope dataScope,String endTime,String beginTime); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 182c9d4..eae1c72 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -65,4 +65,20 @@ return responseData; } + + public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { + ResponseData responseData = new ResponseData(); + try { +// List pantiltDtoList = thirdPartyMapper.countThirdPartyData(dataScope,endTime,beginTime); + responseData.setMessage("查询成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex); + responseData.setMessage("查询异常"); + responseData.setCode(500); + } + return responseData; + } + + } 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 73ccbd8..0199778 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 @@ -262,13 +262,15 @@ /** * 离线设备列表 */ - @RequestMapping(value = "/offline/listpage") + @RequestMapping(value = "/offlineListPage") @ResponseBody @BussinessLog(value = "离线设备列表") - public Object offlineListPage(String deviceCode,String deviceType) { + public Object offlineListPage(String deviceCode, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); Page> page = PageFactory.defaultPage(); - return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + ResponseData responseData = deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 61e20d5..ee4c880 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -34,7 +34,7 @@ @RequestMapping(value = "/listPage") public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 - Page page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); responseData.setData(super.packForBT(page)); return responseData; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index bf06228..53c1775 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -32,21 +32,14 @@ @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { + private final IDeviceModelsService deviceModelsService; - @Autowired - private IDeviceModelsService deviceModelsService; + private final IDeviceTypeService deviceTypeService; -// /** -// * 获取列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(Long deviceType) { -// return deviceModelsService.selectList(deviceType); -// } - - @Autowired - private IDeviceTypeService deviceTypeService; + public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { + this.deviceTypeService = deviceTypeService; + this.deviceModelsService = deviceModelsService; + } /** * 获取分页列表 @@ -60,7 +53,7 @@ .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().stream().forEach( + page.getRecords().forEach( deviceModels -> { deviceModels.setDeviceTypeName(deviceTypeService.getById(deviceModels.getDeviceType()).getTypeName()); String[] d = deviceModels.getCommunication().split(","); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java index 136d858..1f6ddae 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java @@ -8,11 +8,12 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; @Mapper public interface DeviceImeiMapper extends BaseMapper { - List getImeiListPage(@Param("page") Page page, - @Param("devcode") String devcode); + List> getImeiListPage(@Param("page") Page> page, + @Param("devcode") String devcode); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index a47b0c7..9e5b366 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -12,18 +12,18 @@ - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - SELECT id,devcode,imei,iccid, - + AS logtime FROM bus_imei_iccid WHERE 1=1 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 7de589e..8de6875 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 @@ -35,15 +35,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml index 2367d94..5e6c88d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml @@ -27,15 +27,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index 0646d41..e99c9b6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - str_to_date(${paramStr},'%Y-%m-%d %H:%i') + str_to_date(${paramStr},'%Y-%m-%d %H:%i:%s') @@ -288,7 +288,7 @@ GROUP BY ALARM_CONTENT,deptid - ORDER BY alarmCount DESC + ORDER BY "alarmCount" DESC \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 68c2cab..2515d4f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -165,7 +165,7 @@ try { List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) ); responseData.setCode(200); responseData.setMessage("查询成功"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index 5e38071..c1e4ead 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -83,4 +83,12 @@ } } + /** + * 上传数据总记录数 + */ + @RequestMapping("/dataStatics/upLoadCountByTime") + public Object countThirdPartyData(String endTime, String beginTime) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime); + } } 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 8c6c326..4e30ef8 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 @@ -67,15 +67,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java index ed397eb..74edbb4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.GasDectorDataDto; import com.casic.missiles.modular.system.model.PantiltDataDto; +import org.omg.CORBA.Object; public interface ThirdPartyDataService { @@ -13,4 +14,6 @@ ResponseData getPantiltDataListPage(Page page, DataScope dataScope, String deptid, String endTime, String beginTime, String keyWords); + + ResponseData countThirdPartyData(DataScope dataScope,String endTime,String beginTime); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 182c9d4..eae1c72 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -65,4 +65,20 @@ return responseData; } + + public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { + ResponseData responseData = new ResponseData(); + try { +// List pantiltDtoList = thirdPartyMapper.countThirdPartyData(dataScope,endTime,beginTime); + responseData.setMessage("查询成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex); + responseData.setMessage("查询异常"); + responseData.setCode(500); + } + return responseData; + } + + } 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 73ccbd8..0199778 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 @@ -262,13 +262,15 @@ /** * 离线设备列表 */ - @RequestMapping(value = "/offline/listpage") + @RequestMapping(value = "/offlineListPage") @ResponseBody @BussinessLog(value = "离线设备列表") - public Object offlineListPage(String deviceCode,String deviceType) { + public Object offlineListPage(String deviceCode, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); Page> page = PageFactory.defaultPage(); - return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + ResponseData responseData = deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 61e20d5..ee4c880 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -34,7 +34,7 @@ @RequestMapping(value = "/listPage") public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 - Page page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); responseData.setData(super.packForBT(page)); return responseData; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index bf06228..53c1775 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -32,21 +32,14 @@ @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { + private final IDeviceModelsService deviceModelsService; - @Autowired - private IDeviceModelsService deviceModelsService; + private final IDeviceTypeService deviceTypeService; -// /** -// * 获取列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(Long deviceType) { -// return deviceModelsService.selectList(deviceType); -// } - - @Autowired - private IDeviceTypeService deviceTypeService; + public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { + this.deviceTypeService = deviceTypeService; + this.deviceModelsService = deviceModelsService; + } /** * 获取分页列表 @@ -60,7 +53,7 @@ .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().stream().forEach( + page.getRecords().forEach( deviceModels -> { deviceModels.setDeviceTypeName(deviceTypeService.getById(deviceModels.getDeviceType()).getTypeName()); String[] d = deviceModels.getCommunication().split(","); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java index 136d858..1f6ddae 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java @@ -8,11 +8,12 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; @Mapper public interface DeviceImeiMapper extends BaseMapper { - List getImeiListPage(@Param("page") Page page, - @Param("devcode") String devcode); + List> getImeiListPage(@Param("page") Page> page, + @Param("devcode") String devcode); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index a47b0c7..9e5b366 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -12,18 +12,18 @@ - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - SELECT id,devcode,imei,iccid, - + AS logtime FROM bus_imei_iccid WHERE 1=1 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 7de589e..8de6875 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 @@ -35,15 +35,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml index 2367d94..5e6c88d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml @@ -27,15 +27,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index 0646d41..e99c9b6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - str_to_date(${paramStr},'%Y-%m-%d %H:%i') + str_to_date(${paramStr},'%Y-%m-%d %H:%i:%s') @@ -288,7 +288,7 @@ GROUP BY ALARM_CONTENT,deptid - ORDER BY alarmCount DESC + ORDER BY "alarmCount" DESC \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 68c2cab..2515d4f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -165,7 +165,7 @@ try { List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) ); responseData.setCode(200); responseData.setMessage("查询成功"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index 5e38071..c1e4ead 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -83,4 +83,12 @@ } } + /** + * 上传数据总记录数 + */ + @RequestMapping("/dataStatics/upLoadCountByTime") + public Object countThirdPartyData(String endTime, String beginTime) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime); + } } 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 8c6c326..4e30ef8 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 @@ -67,15 +67,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java index ed397eb..74edbb4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.GasDectorDataDto; import com.casic.missiles.modular.system.model.PantiltDataDto; +import org.omg.CORBA.Object; public interface ThirdPartyDataService { @@ -13,4 +14,6 @@ ResponseData getPantiltDataListPage(Page page, DataScope dataScope, String deptid, String endTime, String beginTime, String keyWords); + + ResponseData countThirdPartyData(DataScope dataScope,String endTime,String beginTime); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 182c9d4..eae1c72 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -65,4 +65,20 @@ return responseData; } + + public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { + ResponseData responseData = new ResponseData(); + try { +// List pantiltDtoList = thirdPartyMapper.countThirdPartyData(dataScope,endTime,beginTime); + responseData.setMessage("查询成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex); + responseData.setMessage("查询异常"); + responseData.setCode(500); + } + return responseData; + } + + } 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 73ccbd8..0199778 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 @@ -262,13 +262,15 @@ /** * 离线设备列表 */ - @RequestMapping(value = "/offline/listpage") + @RequestMapping(value = "/offlineListPage") @ResponseBody @BussinessLog(value = "离线设备列表") - public Object offlineListPage(String deviceCode,String deviceType) { + public Object offlineListPage(String deviceCode, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); Page> page = PageFactory.defaultPage(); - return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + ResponseData responseData = deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 61e20d5..ee4c880 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -34,7 +34,7 @@ @RequestMapping(value = "/listPage") public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 - Page page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); responseData.setData(super.packForBT(page)); return responseData; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index bf06228..53c1775 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -32,21 +32,14 @@ @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { + private final IDeviceModelsService deviceModelsService; - @Autowired - private IDeviceModelsService deviceModelsService; + private final IDeviceTypeService deviceTypeService; -// /** -// * 获取列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(Long deviceType) { -// return deviceModelsService.selectList(deviceType); -// } - - @Autowired - private IDeviceTypeService deviceTypeService; + public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { + this.deviceTypeService = deviceTypeService; + this.deviceModelsService = deviceModelsService; + } /** * 获取分页列表 @@ -60,7 +53,7 @@ .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().stream().forEach( + page.getRecords().forEach( deviceModels -> { deviceModels.setDeviceTypeName(deviceTypeService.getById(deviceModels.getDeviceType()).getTypeName()); String[] d = deviceModels.getCommunication().split(","); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java index 136d858..1f6ddae 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java @@ -8,11 +8,12 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; @Mapper public interface DeviceImeiMapper extends BaseMapper { - List getImeiListPage(@Param("page") Page page, - @Param("devcode") String devcode); + List> getImeiListPage(@Param("page") Page> page, + @Param("devcode") String devcode); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index a47b0c7..9e5b366 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -12,18 +12,18 @@ - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - SELECT id,devcode,imei,iccid, - + AS logtime FROM bus_imei_iccid WHERE 1=1 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 7de589e..8de6875 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 @@ -35,15 +35,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml index 2367d94..5e6c88d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml @@ -27,15 +27,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index 0646d41..e99c9b6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - str_to_date(${paramStr},'%Y-%m-%d %H:%i') + str_to_date(${paramStr},'%Y-%m-%d %H:%i:%s') @@ -288,7 +288,7 @@ GROUP BY ALARM_CONTENT,deptid - ORDER BY alarmCount DESC + ORDER BY "alarmCount" DESC \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 68c2cab..2515d4f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -165,7 +165,7 @@ try { List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) ); responseData.setCode(200); responseData.setMessage("查询成功"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index 5e38071..c1e4ead 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -83,4 +83,12 @@ } } + /** + * 上传数据总记录数 + */ + @RequestMapping("/dataStatics/upLoadCountByTime") + public Object countThirdPartyData(String endTime, String beginTime) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime); + } } 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 8c6c326..4e30ef8 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 @@ -67,15 +67,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java index ed397eb..74edbb4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.GasDectorDataDto; import com.casic.missiles.modular.system.model.PantiltDataDto; +import org.omg.CORBA.Object; public interface ThirdPartyDataService { @@ -13,4 +14,6 @@ ResponseData getPantiltDataListPage(Page page, DataScope dataScope, String deptid, String endTime, String beginTime, String keyWords); + + ResponseData countThirdPartyData(DataScope dataScope,String endTime,String beginTime); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 182c9d4..eae1c72 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -65,4 +65,20 @@ return responseData; } + + public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { + ResponseData responseData = new ResponseData(); + try { +// List pantiltDtoList = thirdPartyMapper.countThirdPartyData(dataScope,endTime,beginTime); + responseData.setMessage("查询成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex); + responseData.setMessage("查询异常"); + responseData.setCode(500); + } + return responseData; + } + + } 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 73ccbd8..0199778 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 @@ -262,13 +262,15 @@ /** * 离线设备列表 */ - @RequestMapping(value = "/offline/listpage") + @RequestMapping(value = "/offlineListPage") @ResponseBody @BussinessLog(value = "离线设备列表") - public Object offlineListPage(String deviceCode,String deviceType) { + public Object offlineListPage(String deviceCode, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); Page> page = PageFactory.defaultPage(); - return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + ResponseData responseData = deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 61e20d5..ee4c880 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -34,7 +34,7 @@ @RequestMapping(value = "/listPage") public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 - Page page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); responseData.setData(super.packForBT(page)); return responseData; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index bf06228..53c1775 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -32,21 +32,14 @@ @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { + private final IDeviceModelsService deviceModelsService; - @Autowired - private IDeviceModelsService deviceModelsService; + private final IDeviceTypeService deviceTypeService; -// /** -// * 获取列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(Long deviceType) { -// return deviceModelsService.selectList(deviceType); -// } - - @Autowired - private IDeviceTypeService deviceTypeService; + public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { + this.deviceTypeService = deviceTypeService; + this.deviceModelsService = deviceModelsService; + } /** * 获取分页列表 @@ -60,7 +53,7 @@ .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().stream().forEach( + page.getRecords().forEach( deviceModels -> { deviceModels.setDeviceTypeName(deviceTypeService.getById(deviceModels.getDeviceType()).getTypeName()); String[] d = deviceModels.getCommunication().split(","); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java index 136d858..1f6ddae 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java @@ -8,11 +8,12 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; @Mapper public interface DeviceImeiMapper extends BaseMapper { - List getImeiListPage(@Param("page") Page page, - @Param("devcode") String devcode); + List> getImeiListPage(@Param("page") Page> page, + @Param("devcode") String devcode); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index a47b0c7..9e5b366 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -12,18 +12,18 @@ - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - SELECT id,devcode,imei,iccid, - + AS logtime FROM bus_imei_iccid WHERE 1=1 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 7de589e..8de6875 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 @@ -35,15 +35,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml index 2367d94..5e6c88d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml @@ -27,15 +27,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index 0646d41..e99c9b6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - str_to_date(${paramStr},'%Y-%m-%d %H:%i') + str_to_date(${paramStr},'%Y-%m-%d %H:%i:%s') @@ -288,7 +288,7 @@ GROUP BY ALARM_CONTENT,deptid - ORDER BY alarmCount DESC + ORDER BY "alarmCount" DESC \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 68c2cab..2515d4f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -165,7 +165,7 @@ try { List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) ); responseData.setCode(200); responseData.setMessage("查询成功"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index 5e38071..c1e4ead 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -83,4 +83,12 @@ } } + /** + * 上传数据总记录数 + */ + @RequestMapping("/dataStatics/upLoadCountByTime") + public Object countThirdPartyData(String endTime, String beginTime) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime); + } } 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 8c6c326..4e30ef8 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 @@ -67,15 +67,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java index ed397eb..74edbb4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.GasDectorDataDto; import com.casic.missiles.modular.system.model.PantiltDataDto; +import org.omg.CORBA.Object; public interface ThirdPartyDataService { @@ -13,4 +14,6 @@ ResponseData getPantiltDataListPage(Page page, DataScope dataScope, String deptid, String endTime, String beginTime, String keyWords); + + ResponseData countThirdPartyData(DataScope dataScope,String endTime,String beginTime); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 182c9d4..eae1c72 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -65,4 +65,20 @@ return responseData; } + + public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { + ResponseData responseData = new ResponseData(); + try { +// List pantiltDtoList = thirdPartyMapper.countThirdPartyData(dataScope,endTime,beginTime); + responseData.setMessage("查询成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex); + responseData.setMessage("查询异常"); + responseData.setCode(500); + } + return responseData; + } + + } 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 73ccbd8..0199778 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 @@ -262,13 +262,15 @@ /** * 离线设备列表 */ - @RequestMapping(value = "/offline/listpage") + @RequestMapping(value = "/offlineListPage") @ResponseBody @BussinessLog(value = "离线设备列表") - public Object offlineListPage(String deviceCode,String deviceType) { + public Object offlineListPage(String deviceCode, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); Page> page = PageFactory.defaultPage(); - return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + ResponseData responseData = deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 61e20d5..ee4c880 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -34,7 +34,7 @@ @RequestMapping(value = "/listPage") public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 - Page page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); responseData.setData(super.packForBT(page)); return responseData; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index bf06228..53c1775 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -32,21 +32,14 @@ @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { + private final IDeviceModelsService deviceModelsService; - @Autowired - private IDeviceModelsService deviceModelsService; + private final IDeviceTypeService deviceTypeService; -// /** -// * 获取列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(Long deviceType) { -// return deviceModelsService.selectList(deviceType); -// } - - @Autowired - private IDeviceTypeService deviceTypeService; + public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { + this.deviceTypeService = deviceTypeService; + this.deviceModelsService = deviceModelsService; + } /** * 获取分页列表 @@ -60,7 +53,7 @@ .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().stream().forEach( + page.getRecords().forEach( deviceModels -> { deviceModels.setDeviceTypeName(deviceTypeService.getById(deviceModels.getDeviceType()).getTypeName()); String[] d = deviceModels.getCommunication().split(","); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java index 136d858..1f6ddae 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java @@ -8,11 +8,12 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; @Mapper public interface DeviceImeiMapper extends BaseMapper { - List getImeiListPage(@Param("page") Page page, - @Param("devcode") String devcode); + List> getImeiListPage(@Param("page") Page> page, + @Param("devcode") String devcode); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index a47b0c7..9e5b366 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -12,18 +12,18 @@ - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - SELECT id,devcode,imei,iccid, - + AS logtime FROM bus_imei_iccid WHERE 1=1 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 7de589e..8de6875 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 @@ -35,15 +35,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml index 2367d94..5e6c88d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml @@ -27,15 +27,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index 0646d41..e99c9b6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - str_to_date(${paramStr},'%Y-%m-%d %H:%i') + str_to_date(${paramStr},'%Y-%m-%d %H:%i:%s') @@ -288,7 +288,7 @@ GROUP BY ALARM_CONTENT,deptid - ORDER BY alarmCount DESC + ORDER BY "alarmCount" DESC \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 68c2cab..2515d4f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -165,7 +165,7 @@ try { List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) ); responseData.setCode(200); responseData.setMessage("查询成功"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index 5e38071..c1e4ead 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -83,4 +83,12 @@ } } + /** + * 上传数据总记录数 + */ + @RequestMapping("/dataStatics/upLoadCountByTime") + public Object countThirdPartyData(String endTime, String beginTime) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime); + } } 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 8c6c326..4e30ef8 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 @@ -67,15 +67,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java index ed397eb..74edbb4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.GasDectorDataDto; import com.casic.missiles.modular.system.model.PantiltDataDto; +import org.omg.CORBA.Object; public interface ThirdPartyDataService { @@ -13,4 +14,6 @@ ResponseData getPantiltDataListPage(Page page, DataScope dataScope, String deptid, String endTime, String beginTime, String keyWords); + + ResponseData countThirdPartyData(DataScope dataScope,String endTime,String beginTime); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 182c9d4..eae1c72 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -65,4 +65,20 @@ return responseData; } + + public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { + ResponseData responseData = new ResponseData(); + try { +// List pantiltDtoList = thirdPartyMapper.countThirdPartyData(dataScope,endTime,beginTime); + responseData.setMessage("查询成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex); + responseData.setMessage("查询异常"); + responseData.setCode(500); + } + return responseData; + } + + } 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 73ccbd8..0199778 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 @@ -262,13 +262,15 @@ /** * 离线设备列表 */ - @RequestMapping(value = "/offline/listpage") + @RequestMapping(value = "/offlineListPage") @ResponseBody @BussinessLog(value = "离线设备列表") - public Object offlineListPage(String deviceCode,String deviceType) { + public Object offlineListPage(String deviceCode, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); Page> page = PageFactory.defaultPage(); - return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + ResponseData responseData = deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 61e20d5..ee4c880 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -34,7 +34,7 @@ @RequestMapping(value = "/listPage") public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 - Page page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); responseData.setData(super.packForBT(page)); return responseData; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index bf06228..53c1775 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -32,21 +32,14 @@ @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { + private final IDeviceModelsService deviceModelsService; - @Autowired - private IDeviceModelsService deviceModelsService; + private final IDeviceTypeService deviceTypeService; -// /** -// * 获取列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(Long deviceType) { -// return deviceModelsService.selectList(deviceType); -// } - - @Autowired - private IDeviceTypeService deviceTypeService; + public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { + this.deviceTypeService = deviceTypeService; + this.deviceModelsService = deviceModelsService; + } /** * 获取分页列表 @@ -60,7 +53,7 @@ .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().stream().forEach( + page.getRecords().forEach( deviceModels -> { deviceModels.setDeviceTypeName(deviceTypeService.getById(deviceModels.getDeviceType()).getTypeName()); String[] d = deviceModels.getCommunication().split(","); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java index 136d858..1f6ddae 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java @@ -8,11 +8,12 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; @Mapper public interface DeviceImeiMapper extends BaseMapper { - List getImeiListPage(@Param("page") Page page, - @Param("devcode") String devcode); + List> getImeiListPage(@Param("page") Page> page, + @Param("devcode") String devcode); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index a47b0c7..9e5b366 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -12,18 +12,18 @@ - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - SELECT id,devcode,imei,iccid, - + AS logtime FROM bus_imei_iccid WHERE 1=1 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 7de589e..8de6875 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 @@ -35,15 +35,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml index 2367d94..5e6c88d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml @@ -27,15 +27,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - SELECT ID FROM sys_dict - WHERE code="sluicewellType" + WHERE code='sluicewellType' + + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i:%s') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + + TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi:ss') + + + - DATE_FORMAT(alarmTimeDate,'%Y-%m-%d %H:%i') + DATE_FORMAT(alarmTimeDate,'%Y-%m-%d') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - TO_CHAR(alarmTimeDate,'yyyy-mm-dd hh24:mi') + TO_CHAR(alarmTimeDate,'yyyy-mm-dd') @@ -53,7 +66,7 @@ FROM ( SELECT wellId, - + AS alarmTimeDate FROM alarm_now_view WHERE alarmTimeDate ]]> #{beginTime} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 91e3d13..2aa5880 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -51,7 +51,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i') + DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -69,7 +69,7 @@ ar.ID as id, ar.WELL_CODE as wellCode, ar.ALARM_CONTENT as alarmContentName, - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS alarmTime, ar.DEVICE_ID as deviceId, ar.STATUS as status, @@ -89,7 +89,7 @@ ar.WELL_CODE as "wellCode", ar.ALARM_CONTENT as "alarmContentName", ar.DEVICE_ID as "deviceId", - TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.ALARM_TIME,,'yyyy-mm-dd hh24:mi:ss') AS "alarmTime", ar.STATUS as "status", ar.alarm_type as "alarmType", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml index 0646d41..e99c9b6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml @@ -37,11 +37,11 @@ - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(ar.TS,'yyyy-mm-dd hh24:mi') + TO_CHAR(ar.TS,,'yyyy-mm-dd hh24:mi:ss') - str_to_date(${paramStr},'%Y-%m-%d %H:%i') + str_to_date(${paramStr},'%Y-%m-%d %H:%i:%s') @@ -288,7 +288,7 @@ GROUP BY ALARM_CONTENT,deptid - ORDER BY alarmCount DESC + ORDER BY "alarmCount" DESC \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 68c2cab..2515d4f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -165,7 +165,7 @@ try { List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) ); responseData.setCode(200); responseData.setMessage("查询成功"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index 5e38071..c1e4ead 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -83,4 +83,12 @@ } } + /** + * 上传数据总记录数 + */ + @RequestMapping("/dataStatics/upLoadCountByTime") + public Object countThirdPartyData(String endTime, String beginTime) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime); + } } 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 8c6c326..4e30ef8 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 @@ -67,15 +67,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java index ed397eb..74edbb4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.GasDectorDataDto; import com.casic.missiles.modular.system.model.PantiltDataDto; +import org.omg.CORBA.Object; public interface ThirdPartyDataService { @@ -13,4 +14,6 @@ ResponseData getPantiltDataListPage(Page page, DataScope dataScope, String deptid, String endTime, String beginTime, String keyWords); + + ResponseData countThirdPartyData(DataScope dataScope,String endTime,String beginTime); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 182c9d4..eae1c72 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -65,4 +65,20 @@ return responseData; } + + public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { + ResponseData responseData = new ResponseData(); + try { +// List pantiltDtoList = thirdPartyMapper.countThirdPartyData(dataScope,endTime,beginTime); + responseData.setMessage("查询成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex); + responseData.setMessage("查询异常"); + responseData.setCode(500); + } + return responseData; + } + + } 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 73ccbd8..0199778 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 @@ -262,13 +262,15 @@ /** * 离线设备列表 */ - @RequestMapping(value = "/offline/listpage") + @RequestMapping(value = "/offlineListPage") @ResponseBody @BussinessLog(value = "离线设备列表") - public Object offlineListPage(String deviceCode,String deviceType) { + public Object offlineListPage(String deviceCode, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); Page> page = PageFactory.defaultPage(); - return deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + ResponseData responseData = deviceService.offlineListPage(dataScope, page, deviceCode, deviceType); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 61e20d5..ee4c880 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -34,7 +34,7 @@ @RequestMapping(value = "/listPage") public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 - Page page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); responseData.setData(super.packForBT(page)); return responseData; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index bf06228..53c1775 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -32,21 +32,14 @@ @RequestMapping("/deviceModels") public class DeviceModelsController extends BaseController { + private final IDeviceModelsService deviceModelsService; - @Autowired - private IDeviceModelsService deviceModelsService; + private final IDeviceTypeService deviceTypeService; -// /** -// * 获取列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(Long deviceType) { -// return deviceModelsService.selectList(deviceType); -// } - - @Autowired - private IDeviceTypeService deviceTypeService; + public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { + this.deviceTypeService = deviceTypeService; + this.deviceModelsService = deviceModelsService; + } /** * 获取分页列表 @@ -60,7 +53,7 @@ .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().stream().forEach( + page.getRecords().forEach( deviceModels -> { deviceModels.setDeviceTypeName(deviceTypeService.getById(deviceModels.getDeviceType()).getTypeName()); String[] d = deviceModels.getCommunication().split(","); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java index 136d858..1f6ddae 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java @@ -8,11 +8,12 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; @Mapper public interface DeviceImeiMapper extends BaseMapper { - List getImeiListPage(@Param("page") Page page, - @Param("devcode") String devcode); + List> getImeiListPage(@Param("page") Page> page, + @Param("devcode") String devcode); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index a47b0c7..9e5b366 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -12,18 +12,18 @@ - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - SELECT id,devcode,imei,iccid, - + AS logtime FROM bus_imei_iccid WHERE 1=1 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 7de589e..8de6875 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 @@ -35,15 +35,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml index 2367d94..5e6c88d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml @@ -27,15 +27,15 @@ - DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i') + DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi') + TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss') - SELECT ID FROM sys_dict - WHERE code="sluicewellType" + WHERE code='sluicewellType'