Commit 7c02f5db authored by hongguangwu's avatar hongguangwu

MVP1.7.9-20

parent e2a27121
...@@ -169,6 +169,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -169,6 +169,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
// 同一个户才一批次推送,因为账号密码不一样 ,不同户,则先推送一批 // 同一个户才一批次推送,因为账号密码不一样 ,不同户,则先推送一批
boolean nextFlag = false; boolean nextFlag = false;
SociaFriendYgsAddVo vo; SociaFriendYgsAddVo vo;
int i=1;
for (int index = 0 ; index < ygsAddlist.size(); index++) { for (int index = 0 ; index < ygsAddlist.size(); index++) {
vo = ygsAddlist.get(index); vo = ygsAddlist.get(index);
// 0:未到时间不动; 1:推送; 2:转人工 // 0:未到时间不动; 1:推送; 2:转人工
...@@ -193,7 +194,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -193,7 +194,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
&& !vo.getSocialHouseholdName().equals(ygsAddlist.get(index+1).getSocialHouseholdName())) { && !vo.getSocialHouseholdName().equals(ygsAddlist.get(index+1).getSocialHouseholdName())) {
nextFlag = true; nextFlag = true;
} }
if (nextFlag || index % 20 == 0 || index >= ygsAddlist.size()-1) { if (nextFlag || i % 20 == 0 || index >= ygsAddlist.size()-1) {
i=0;
nextFlag = false; nextFlag = false;
requestId = socialFriendConfig.pushFriendByInfo(restTemplate, vo, listVo, type, thisTime, backLogList); requestId = socialFriendConfig.pushFriendByInfo(restTemplate, vo, listVo, type, thisTime, backLogList);
ygsHandleStatus = CommonConstants.TWO_STRING; ygsHandleStatus = CommonConstants.TWO_STRING;
...@@ -217,6 +219,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -217,6 +219,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
socialInfoTemp = new ArrayList<>(); socialInfoTemp = new ArrayList<>();
logTemp = new ArrayList<>(); logTemp = new ArrayList<>();
} }
i++;
} catch (Exception e) { } catch (Exception e) {
remark = "提交社保士兵异常!"; remark = "提交社保士兵异常!";
} }
...@@ -279,6 +282,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -279,6 +282,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
// 同一个户才一批次推送,因为账号密码不一样 ,不同户,则先推送一批 // 同一个户才一批次推送,因为账号密码不一样 ,不同户,则先推送一批
boolean nextFlag = false; boolean nextFlag = false;
SociaFriendYgsAddVo vo; SociaFriendYgsAddVo vo;
int i=1;
for (int index = 0 ; index < ysdAddlist.size(); index++) { for (int index = 0 ; index < ysdAddlist.size(); index++) {
vo = ysdAddlist.get(index); vo = ysdAddlist.get(index);
// 0:未到时间不动; 1:推送; 2:转人工 // 0:未到时间不动; 1:推送; 2:转人工
...@@ -317,7 +321,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -317,7 +321,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
&& !vo.getSocialHouseholdName().equals(ysdAddlist.get(index+1).getSocialHouseholdName())) { && !vo.getSocialHouseholdName().equals(ysdAddlist.get(index+1).getSocialHouseholdName())) {
nextFlag = true; nextFlag = true;
} }
if (nextFlag || index % 20 == 0 || index >= ysdAddlist.size()-1) { if (nextFlag || i % 20 == 0 || index >= ysdAddlist.size()-1) {
i=0;
requestId = socialFriendConfig.pushFriendByInfo(restTemplate, vo, listVo, type, thisTime, backLogList); requestId = socialFriendConfig.pushFriendByInfo(restTemplate, vo, listVo, type, thisTime, backLogList);
ysdHandleStatus = CommonConstants.TWO_STRING; ysdHandleStatus = CommonConstants.TWO_STRING;
remark = "已推送提交任务!"; remark = "已推送提交任务!";
...@@ -340,6 +345,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -340,6 +345,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
socialInfoTemp = new ArrayList<>(); socialInfoTemp = new ArrayList<>();
logTemp = new ArrayList<>(); logTemp = new ArrayList<>();
} }
i++;
} catch (Exception e) { } catch (Exception e) {
remark = "提交社保士兵异常!"; remark = "提交社保士兵异常!";
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment