项目联调

src/main/java/com/gyee/frame/service/WeatherfhService.java

@@ -1,16 +1,5 @@
 package com.gyee.frame.service;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Arrays;
-
-import com.gyee.frame.model.auto.Weatherfd;
-import com.gyee.frame.model.auto.WeatherfdExample;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.base.BaseService;
@@ -22,7 +11,14 @@ import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.model.enumeration.Messagetype;
 import com.gyee.frame.netty.websocket.util.SocketToolService;
 import com.gyee.frame.util.DateUtils;
-import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 
 /**
  *  WeatherfhService
@@ -34,14 +30,12 @@ import com.gyee.frame.util.SnowflakeIdWorker;
  **/
 @Service
 public class WeatherfhService extends SocketToolService implements BaseService<Weatherfh, WeatherfhExample>{
-	@Autowired
+	@Resource
 	private WeatherfhMapper weatherfhMapper;
 	
       	   	      	      	      	      	      	      	      	      	      	
 	/**
 	 * 分页查询
-	 * @param pageNum
-	 * @param pageSize
 	 * @param windpowerstationid
 	 * @return
 	 */
@@ -80,7 +74,7 @@ public class WeatherfhService extends SocketToolService implements BaseService<W
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH");
 			String name =  sdf.format(DateUtils.getNowDate());
 			Date recodedate = sdf.parse(name);
-			Date recodedateend = DateUtils.addHours(recodedate, 16);
+			Date recodedateend = DateUtils.addHours(recodedate, 4);
 			WeatherfhExample testExample=new WeatherfhExample();
 			testExample.setOrderByClause("id ASC");
 			if(name!=null&&!"".equals(name)){