调大波动判断时间，波动数据物理删除改逻辑删除

src/main/java/com/hb/proj/oil/service/OilService.java

@@ -25,13 +25,14 @@ public class OilService {
 	
 	
 	/**
-	 * 删除已入库的杂波数据
+	 * 删除已入库的杂波数据（2022.6.13 改为标记删除）
 	 * @param dtuNum
 	 * @param startTime
 	 * @param endTime
 	 */
 	public void deleteWave(String dtuNum,Date startTime,Date endTime){
-		String sql="delete from t_oil_history_2 where dtu_num=? and data_time between ? and ?";
+		//String sql="delete from t_oil_history_2 where dtu_num=? and data_time between ? and ?";
+		String sql="update t_oil_history_2 set noise_if=1 where dtu_num=? and data_time between ? and ?";
 		dao.getJdbcTemplate().update(sql,dtuNum,startTime,endTime);
 	}
 	

src/main/java/com/hb/proj/server/OilDetecter.java

@@ -11,7 +11,7 @@ import java.util.Date;
 public class OilDetecter {
 
 	
-	public static long repairWait=600000; //修复最大等待时间毫秒 ,3分钟,2022.3.22调整为10分钟
+	public static long repairWait=1800000; //修复最大等待时间毫秒 ,3分钟,2022.6.13调整为30分钟 
 	
 	public static final int WAVE=0;