报警查询修改

alarm-web/src/main/java/com/gyee/alarm/service/AlarmHistoryService.java

@@ -115,7 +115,10 @@ public class AlarmHistoryService   {
         {
             components=null;
         }
-        vos = alarmTsMapper.selectByWtLimit(begin,end,modelId,superTableName, alarmType, stationid, deviceid, description,deviceType,components, pageNum*pageSize, (pageNum*pageSize+pageSize));
+        int limit = (pageNum - 1) * pageSize;
+        int offset = pageSize;
+        vos = alarmTsMapper.selectByWtLimit(begin, end, modelId, superTableName, alarmType, stationid, deviceid, description, deviceType, components, limit, offset);
+//        vos = alarmTsMapper.selectByWtLimit(begin,end,modelId,superTableName, alarmType, stationid, deviceid, description,deviceType,components, pageNum*pageSize, (pageNum*pageSize+pageSize));
         map.put("ls",vos);
         int total=alarmTsMapper.selectByWtCount(begin,end,modelId,superTableName, alarmType, stationid, deviceid, description,deviceType,components);
         map.put("total",total);
@@ -135,6 +138,11 @@ public class AlarmHistoryService   {
             Date endDate = new Date();
             Date beginDate = DateUtils.addHours(endDate,-1);
 
+//            Calendar calendar = Calendar.getInstance();
+//            calendar.setTime(endDate);
+//            calendar.set(Calendar.MONTH, Calendar.AUGUST);
+//            calendar.set(Calendar.DAY_OF_MONTH, 18);
+//            Date beginDate = calendar.getTime();
             if(type.equals(AlarmTypeValue.BT.getCode()))
             {
                vos = alarmTsMapper.selectByWtLimit(beginDate.getTime(),endDate.getTime(),null,AlarmSuperTalbeType.BT.getCode(), AlarmTypeValue.BT.getCode(), null, null, null,null,null, 0, home_pagep_size);