update 发送更新数据和绑定时间不准问题

src/main/java/com/hdp/pi/repository/kolon/KolonMemberRepository.java

@@ -8,6 +8,8 @@ import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import com.hdp.pi.domain.kolon.KolonMember;
@@ -50,4 +52,24 @@ public interface KolonMemberRepository extends JpaRepository<KolonMember, Long>,
 	 * @return
 	 */
 	List<KolonMember> findByJoinTimeGreaterThanOrUpdateTimeGreaterThan(Date joinTime, Date updateTime);
+	
+	
+	/**
+	 * 获取dataSource 2 的 更新数据
+	 * @param dataSource
+	 * @param updateTime
+	 * @return
+	 */
+	@Query("from KolonMember m where m.dataSource = :dataSource and m.updateTime > :updateTime and m.updateTime > m.joinTime")
+	List<KolonMember> findByDataSource2(@Param("dataSource") Integer dataSource, @Param("updateTime") Date updateTime);
+	
+	/**
+	 * 获取dataSource 1 的注册/更新数据
+	 * @param dataSource
+	 * @param joinTime
+	 * @param updateTime
+	 * @return
+	 */
+	@Query("from KolonMember m where m.dataSource = :dataSource and (m.joinTime > :updateTime or m.updateTime > :updateTime)")
+	List<KolonMember> findByDataSource1(@Param("dataSource") Integer dataSource, @Param("updateTime") Date updateTime);
 }

src/main/java/com/hdp/pi/service/kolon/KolonMemberServiceImpl.java

@@ -349,8 +349,14 @@ public class KolonMemberServiceImpl implements KolonMemberService {
 		LOGGER.info("kolon发送数据 最后更新时间【" + time.toString() + "】");
 		Date lastSendDate = time;
 		Date tempSendDate = time;
-		//获取记录
-		List<KolonMember> kolonMembers = kolonMemberRepository.findByJoinTimeGreaterThanOrUpdateTimeGreaterThan(time, time);
+		
+		//kolonMembers2
+		List<KolonMember> kolonMembers = kolonMemberRepository.findByDataSource2(2, time);
+		//kolonMembers2
+		List<KolonMember> kolonMembers2 = kolonMemberRepository.findByDataSource1(1, time);
+		
+		kolonMembers.addAll(kolonMembers2);
+		
 		List<String[]> addData = getDataList();
 		List<String[]> updateData = getDataList();
 		for(KolonMember km : kolonMembers){

src/main/java/com/hdp/pi/utils/kolon/Util.java

@@ -58,6 +58,6 @@ public class Util {
 		if(date == null){
 			return null;
 		}
-		return dateFormat.format(new Date());
+		return dateFormat.format(date);
 	}
 }