From bf63730afe106fc0c3938e1a1ca6f29469386b02 Mon Sep 17 00:00:00 2001
From: zhiqiang feng <fengzhq@it2000.com.cn>
Date: Thu, 22 Feb 2024 01:17:45 +0000
Subject: [PATCH] Add CminmsgHstDao to CminmsgsHisScheduled

---
 .../scheduled/CminmsgsHisScheduled.java       | 63 ++++++++++---------
 1 file changed, 34 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/scheduled/CminmsgsHisScheduled.java b/src/main/java/com/gzzn/omms/msgexchangeapi/scheduled/CminmsgsHisScheduled.java
index 960d8af2..907f6d9c 100644
--- a/src/main/java/com/gzzn/omms/msgexchangeapi/scheduled/CminmsgsHisScheduled.java
+++ b/src/main/java/com/gzzn/omms/msgexchangeapi/scheduled/CminmsgsHisScheduled.java
@@ -16,6 +16,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
 import com.gzzn.omms.msgexchangeapi.dao.CminmsgDao;
+import com.gzzn.omms.msgexchangeapi.dao.CminmsgHstDao;
 import com.gzzn.omms.msgexchangeapi.entity.Cminmsg;
 import com.gzzn.omms.msgexchangeapi.entity.CminmsgHst;
 import com.gzzn.omms.msgexchangeapi.service.ICminmsgHstService;
@@ -35,45 +36,49 @@ public class CminmsgsHisScheduled {
 	@Autowired
 	CminmsgDao cminmsgDao;
 
+	@Autowired
+	private CminmsgHstDao cminmsgHstdDao;
+
 	private static  Logger logger = LoggerFactory.getLogger(CminmsgsHisScheduled.class);
 	 
 	@Scheduled(cron = "${scheduled.cminmsgHisCron}")
     public void scheduled()
     {
 		logger.info("开始cminmsgs消息转历史..");
+		cminmsgHstdDao.moveToHistory();
 		
-		List<Cminmsg> lsCminmsg = null;
-		do
-		{
-			Date dateNow = new Date();
-			lsCminmsg = cminmsgDao.findByCminmsgsDateProcessedIsNotNullAndCminmsgsDateReceivedBefore
-	                   (
-	                		dateNow,new PageRequest(0,300)
-	                   ); 
-			if(CollectionUtils.isEmpty(lsCminmsg))
-			{
-				continue;
-			}
+		// List<Cminmsg> lsCminmsg = null;
+		// do
+		// {
+		// 	Date dateNow = new Date();
+		// 	lsCminmsg = cminmsgDao.findByCminmsgsDateProcessedIsNotNullAndCminmsgsDateReceivedBefore
+	    //                (
+	    //             		dateNow,new PageRequest(0,300)
+	    //                ); 
+		// 	if(CollectionUtils.isEmpty(lsCminmsg))
+		// 	{
+		// 		continue;
+		// 	}
 			
-			List<CminmsgHst> successLs = cminmsgHstService.insert(
-					 cminmsgHstService.toCminmsgHstLs(lsCminmsg)
-					 );
+		// 	List<CminmsgHst> successLs = cminmsgHstService.insert(
+		// 			 cminmsgHstService.toCminmsgHstLs(lsCminmsg)
+		// 			 );
 			
-			//从原始表删除成功列表
-			if(!CollectionUtils.isEmpty(successLs))
-			{
-				List<Cminmsg> waitDeleteLs = successLs.stream()
-						                     .map(node->{
-						                    	 Cminmsg cminmsg = new Cminmsg();
-						                    	 BeanUtils.copyProperties(node, cminmsg);
-						                    	 return cminmsg;
-				                             })
-						                     .collect(Collectors.toList());
+		// 	//从原始表删除成功列表
+		// 	if(!CollectionUtils.isEmpty(successLs))
+		// 	{
+		// 		List<Cminmsg> waitDeleteLs = successLs.stream()
+		// 				                     .map(node->{
+		// 				                    	 Cminmsg cminmsg = new Cminmsg();
+		// 				                    	 BeanUtils.copyProperties(node, cminmsg);
+		// 				                    	 return cminmsg;
+		// 		                             })
+		// 				                     .collect(Collectors.toList());
 				
-				cminmsgDao.delete(waitDeleteLs);
-			}
-		}
-		while(!CollectionUtils.isEmpty(lsCminmsg));
+		// 		cminmsgDao.delete(waitDeleteLs);
+		// 	}
+		// }
+		// while(!CollectionUtils.isEmpty(lsCminmsg));
 		
 		logger.info("结束本次cminmsgs消息转历史..");
     }//end shceduled