手动推送优化

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java

@@ -2537,16 +2537,28 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 
 	@Override
 	public void createPaymentFundInfo() {
-		//获取所有未推送的公积金实缴明细数据
-		List<TPaymentInfo> unPushInfo = baseMapper.selectList(Wrappers.<TPaymentInfo>query().lambda()
+		long count = baseMapper.selectCount(Wrappers.<TPaymentInfo>query().lambda()
 				.eq(TPaymentInfo::getPushStatus, CommonConstants.ONE_STRING)
 				.eq(TPaymentInfo::getLockStatus, CommonConstants.ONE_STRING)
 				.isNotNull(TPaymentInfo::getFundId));
+		if (count > 0) {
+			List<TPaymentInfo> unPushInfo;
+			int i = (int) Math.ceil((double) count / CommonConstants.TEN_THOUSAND_INT);
+			for (int j = 0; j < i; j++) {
+				//获取所有未推送的公积金实缴明细数据
+				unPushInfo = baseMapper.selectList(Wrappers.<TPaymentInfo>query().lambda()
+						.eq(TPaymentInfo::getPushStatus, CommonConstants.ONE_STRING)
+						.eq(TPaymentInfo::getLockStatus, CommonConstants.ONE_STRING)
+						.isNotNull(TPaymentInfo::getFundId).last(" limit 0,10000"));
+				synchronized (this) {
 					if (Common.isNotNull(unPushInfo)) {
 						//推送数据封装并推送
 						initEkpPushFundParam(unPushInfo);
 					}
 				}
+			}
+		}
+	}
 
 	@Override
 	public void pushPaymentSocialFundInfo(TPaymentInfoSearchVo searchVo) {
@@ -2586,39 +2598,62 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 
 	@Override
 	public void createPaymentInfoIncome() {
-		//判断缴费库中社保合计和本次导入合计相加是否为0，为0则不生成收入
-		List<TPaymentInfo> sumList = baseMapper.selectList(Wrappers.<TPaymentInfo>query().lambda()
+		long count = baseMapper.selectCount(Wrappers.<TPaymentInfo>query().lambda()
 						.eq(TPaymentInfo::getIncomeStatus,CommonConstants.ONE_STRING)
 						.eq(TPaymentInfo::getLockStatus,CommonConstants.ONE_STRING)
 						.isNotNull(TPaymentInfo::getSocialId));
+		if (count > 0) {
+			List<TPaymentInfo> sumList;
+			int i = (int) Math.ceil((double) count / CommonConstants.TEN_THOUSAND_INT);
+			for (int j = 0; j < i; j++) {
+				//判断缴费库中社保合计和本次导入合计相加是否为0，为0则不生成收入
+				sumList = baseMapper.selectList(Wrappers.<TPaymentInfo>query().lambda()
+						.eq(TPaymentInfo::getIncomeStatus, CommonConstants.ONE_STRING)
+						.eq(TPaymentInfo::getLockStatus, CommonConstants.ONE_STRING)
+						.isNotNull(TPaymentInfo::getSocialId).last(" limit 0,10000"));
+				synchronized (this) {
 					if (Common.isNotNull(sumList)) {
 						//生成收入
 						createIncomeInfo(sumList, CommonConstants.ONE_STRING);
 					}
 				}
+			}
+		}
+	}
 
 	@Override
 	public void createPaymentFundIncome() {
-		List<TPaymentInfo> sumList = baseMapper.selectList(Wrappers.<TPaymentInfo>query().lambda()
+		long count = baseMapper.selectCount(Wrappers.<TPaymentInfo>query().lambda()
 				.eq(TPaymentInfo::getIncomeStatus,CommonConstants.ONE_STRING)
 				.eq(TPaymentInfo::getLockStatus,CommonConstants.ONE_STRING)
 				.isNotNull(TPaymentInfo::getFundId));
+		if (count > 0) {
+			List<TPaymentInfo> sumList;
+			int i = (int) Math.ceil((double) count / CommonConstants.TEN_THOUSAND_INT);
+			for (int j = 0; j < i; j++) {
+				sumList = baseMapper.selectList(Wrappers.<TPaymentInfo>query().lambda()
+						.eq(TPaymentInfo::getIncomeStatus, CommonConstants.ONE_STRING)
+						.eq(TPaymentInfo::getLockStatus, CommonConstants.ONE_STRING)
+						.isNotNull(TPaymentInfo::getFundId).last(" limit 0,10000"));
+				synchronized (this) {
 					if (Common.isNotNull(sumList)) {
 						//生成公积金收入
 						createIncomeInfo(sumList, CommonConstants.TWO_STRING);
 					}
 				}
+			}
+		}
+	}
 
 	public void createPaymentSocialInfoReal(YifuUser user,TPaymentInfoSearchVo searchVo) {
 		//获取所有未推送的社保实缴明细数据
 		searchVo.setLockStatus(CommonConstants.ONE_STRING);
-		String userId = user.getId();
-		long count = baseMapper.getTPaymentSocialPushCount(searchVo,userId);
+		long count = baseMapper.getTPaymentSocialPushCount(searchVo,user.getId());
 		if (count > 0) {
 			List<TPaymentInfo> unPushInfo;
 			int i = (int) Math.ceil((double) count / CommonConstants.TEN_THOUSAND_INT);
 			for (int j = 0; j < i; j++) {
-				unPushInfo = baseMapper.getTPaymentSocialPushInfo(searchVo, userId);
+				unPushInfo = baseMapper.getTPaymentSocialPushInfo(searchVo, user.getId());
 				synchronized (this) {
 					if (Common.isNotNull(unPushInfo)) {
 						//推送数据封装并推送
@@ -2632,13 +2667,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 	public void createPaymentFundInfoReal(YifuUser user,TPaymentInfoSearchVo searchVo) {
 		//获取所有未推送的公积金实缴明细数据
 		searchVo.setLockStatus(CommonConstants.ONE_STRING);
-		String userId = user.getId();
-		long count = baseMapper.getTPaymentFundPushCount(searchVo,userId);
+		long count = baseMapper.getTPaymentFundPushCount(searchVo,user.getId());
 		if (count > 0) {
 			List<TPaymentInfo> unPushInfo;
 			int i = (int) Math.ceil((double) count / CommonConstants.TEN_THOUSAND_INT);
 			for (int j = 0; j < i; j++) {
-				unPushInfo = baseMapper.getTPaymentFundPushInfo(searchVo, userId);
+				unPushInfo = baseMapper.getTPaymentFundPushInfo(searchVo, user.getId());
 				synchronized (this) {
 					if (Common.isNotNull(unPushInfo)) {
 						//推送数据封装并推送
@@ -2651,13 +2685,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 
 	public void createPaymentInfoIncomeReal(YifuUser user,TPaymentInfoSearchVo searchVo) {
 		searchVo.setLockStatus(CommonConstants.ONE_STRING);
-		String userId = user.getId();
-		long count = baseMapper.getTPaymentSocialIncomeCount(searchVo,userId);
+		long count = baseMapper.getTPaymentSocialIncomeCount(searchVo,user.getId());
 		if (count > 0) {
 			List<TPaymentInfo> sumList;
 			int i = (int) Math.ceil((double) count / CommonConstants.TEN_THOUSAND_INT);
 			for (int j = 0; j < i; j++) {
-				sumList = baseMapper.getTPaymentSocialIncomeInfo(searchVo, userId);
+				sumList = baseMapper.getTPaymentSocialIncomeInfo(searchVo, user.getId());
 				synchronized (this) {
 					if (Common.isNotNull(sumList)) {
 						//生成收入
@@ -2670,13 +2703,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 
 	public void createPaymentFundIncomeReal(YifuUser user,TPaymentInfoSearchVo searchVo) {
 		searchVo.setLockStatus(CommonConstants.ONE_STRING);
-		String userId = user.getId();
-		long count = baseMapper.getTPaymentFundIncomeCount(searchVo,userId);
+		long count = baseMapper.getTPaymentFundIncomeCount(searchVo,user.getId());
 		if (count > 0) {
 			List<TPaymentInfo> sumList;
 			int i = (int) Math.ceil((double) count / CommonConstants.TEN_THOUSAND_INT);
 			for (int j = 0; j < i; j++) {
-				sumList = baseMapper.getTPaymentFundIncomeInfo(searchVo, userId);
+				sumList = baseMapper.getTPaymentFundIncomeInfo(searchVo, user.getId());
 				synchronized (this) {
 					if (Common.isNotNull(sumList)) {
 						//生成公积金收入

yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml

@@ -1245,6 +1245,7 @@
 			a.PUSH_STATUS = '1' AND a.SOCIAL_ID IS NOT NULL AND a.CREATE_BY = #{userId}
 			<include refid="tPaymentInfo_export_where"/>
 		</where>
+		limit 0,10000
 	</select>
 
 	<!--tPaymentInfo公积金推送查询-->
@@ -1256,6 +1257,7 @@
 			a.PUSH_STATUS = '1' AND a.FUND_ID IS NOT NULL AND a.CREATE_BY = #{userId}
 			<include refid="tPaymentInfo_export_where"/>
 		</where>
+		limit 0,10000
 	</select>
 
 	<!--tPaymentInfo社保收入推送查询-->
@@ -1267,6 +1269,7 @@
 			a.INCOME_STATUS = '1' AND a.SOCIAL_ID IS NOT NULL AND a.CREATE_BY = #{userId}
 			<include refid="tPaymentInfo_export_where"/>
 		</where>
+		limit 0,10000
 	</select>
 
 	<!--tPaymentInfo公积金收入推送查询-->
@@ -1278,6 +1281,7 @@
 			a.INCOME_STATUS = '1' AND a.FUND_ID IS NOT NULL AND a.CREATE_BY = #{userId}
 			<include refid="tPaymentInfo_export_where"/>
 		</where>
+		limit 0,10000
 	</select>
 
 	<!-- 更改社保公积金推送状态 -->