调度历史消息，使用有索引的字段进行查询

娄高锋
1 parent 51aaebc0
Showing 2 changed files with 10 additions and 10 deletions
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -47,15 +47,15 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	List<Map<String, Object>> dailyInfo(String line,String date);
 	@Query(value="select d.device_id,d.sender,d.txt_content,d.timestamp,d.line_code from "
-			+ " bsth_v_directive_60 d  where d.line_code=?1 and d.timestamp >=?2 and  "
-			+ "d.timestamp <=?3 and d.device_id like %?4% ",nativeQuery=true)
-	List<Object[]> historyMessage(String line,long d,long t,String code);
+			+ " bsth_v_directive_60 d  where d.rq = ?1 and d.line_code = ?2 "
+			+ " and d.device_id like %?4% ",nativeQuery=true)
+	List<Object[]> historyMessage(String rq, String line, String code);
 	//带指令类型字段
 	@Query(value="select d.device_id,d.sender,d.txt_content,d.timestamp,d.line_code from "
-			+ " bsth_v_directive_60 d  where d.line_code=?1 and d.timestamp >=?2 and  "
-			+ "d.timestamp <=?3 and d.device_id like %?4% and d.dispatch_instruct =?5 ",nativeQuery=true)
-	List<Object[]> historyMessage(String line,long d,long t,String code,short dispatchInstruct);
+			+ " bsth_v_directive_60 d  where d.rq = ?1 and d.line_code = ?2 "
+			+ " and d.device_id like %?4% and d.dispatch_instruct =?5 ",nativeQuery=true)
+	List<Object[]> historyMessage(String rq, String line, String code, short dispatchInstruct);
 	@Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,count(*) as cs "
 			+ " FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 d "
@@ -1286,9 +1286,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<Object[]> list0 = new ArrayList<Object[]>();
         if(instructType > -1){
-        	list0 = scheduleRealInfoRepository.historyMessage(line, d, t, device, instructType);
+        	list0 = scheduleRealInfoRepository.historyMessage(date, line, device, instructType);
         } else {
-        	list0 = scheduleRealInfoRepository.historyMessage(line, d, t, device);
+        	list0 = scheduleRealInfoRepository.historyMessage(date, line, device);
         }
         for (Object[] obj : list0) {
             if (obj != null) {
@@ -1325,9 +1325,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         if(!device2.equals("")){
         	List<Object[]> list1 = new ArrayList<Object[]>();
         	if(instructType > -1){
-        		list1 =scheduleRealInfoRepository.historyMessage(line, d, t, device2, instructType);
+        		list1 =scheduleRealInfoRepository.historyMessage(date, line, device2, instructType);
         	} else {
-        		list1 =scheduleRealInfoRepository.historyMessage(line, d, t, device2);
+        		list1 =scheduleRealInfoRepository.historyMessage(date, line, device2);
         	}
             for (Object[] obj : list1) {
                 if (obj != null) {