Skip to content

Y
yifu-mvp
Commit a2691322 authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

推送优化

parent 8a1616b8
Show whitespace changes
Inline Side-by-side
Showing with 192 additions and 50 deletions
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TPaymentInfoMapper.java
View file @ a2691322
...@@ -169,31 +169,66 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> { ...@@ -169,31 +169,66 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
* @param searchVo 缴费库 * @param searchVo 缴费库
* @return * @return
*/ */
List<TPaymentInfo> getTPaymentSocialPushInfo(@Param("tPaymentInfo") TPaymentInfoSearchVo searchVo); List<TPaymentInfo> getTPaymentSocialPushInfo(@Param("tPaymentInfo") TPaymentInfoSearchVo searchVo,
@Param("userId") String userId);
/** /**
* 缴费库公积金推送查询 * 缴费库公积金推送查询
* @param searchVo 缴费库 * @param searchVo 缴费库
* @return * @return
*/ */
List<TPaymentInfo> getTPaymentFundPushInfo(@Param("tPaymentInfo") TPaymentInfoSearchVo searchVo); List<TPaymentInfo> getTPaymentFundPushInfo(@Param("tPaymentInfo") TPaymentInfoSearchVo searchVo,
@Param("userId") String userId);
/** /**
* 缴费库社保收入推送查询 * 缴费库社保收入推送查询
* @param searchVo 缴费库 * @param searchVo 缴费库
* @return * @return
*/ */
List<TPaymentInfo> getTPaymentSocialIncomeInfo(@Param("tPaymentInfo") TPaymentInfoSearchVo searchVo); List<TPaymentInfo> getTPaymentSocialIncomeInfo(@Param("tPaymentInfo") TPaymentInfoSearchVo searchVo,
@Param("userId") String userId);
/** /**
* 缴费库公积金收入推送查询 * 缴费库公积金收入推送查询
* @param searchVo 缴费库 * @param searchVo 缴费库
* @return * @return
*/ */
List<TPaymentInfo> getTPaymentFundIncomeInfo(@Param("tPaymentInfo") TPaymentInfoSearchVo searchVo); List<TPaymentInfo> getTPaymentFundIncomeInfo(@Param("tPaymentInfo") TPaymentInfoSearchVo searchVo,
@Param("userId") String userId);
void updateBySocialPayment(@Param("id")String id); void updateBySocialPayment(@Param("id")String id);
void updateBySocialIncomePayment(@Param("id")String id); void updateBySocialIncomePayment(@Param("id")String id);
/**
* 缴费库社保推送查询
* @param searchVo 缴费库
* @return
*/
long getTPaymentSocialPushCount(@Param("tPaymentInfo") TPaymentInfoSearchVo searchVo,
@Param("userId") String userId);
/**
* 缴费库公积金推送查询
* @param searchVo 缴费库
* @return
*/
long getTPaymentFundPushCount(@Param("tPaymentInfo") TPaymentInfoSearchVo searchVo,
@Param("userId") String userId);
/**
* 缴费库社保收入推送查询
* @param searchVo 缴费库
* @return
*/
long getTPaymentSocialIncomeCount(@Param("tPaymentInfo") TPaymentInfoSearchVo searchVo,
@Param("userId") String userId);
/**
* 缴费库公积金收入推送查询
* @param searchVo 缴费库
* @return
*/
long getTPaymentFundIncomeCount(@Param("tPaymentInfo") TPaymentInfoSearchVo searchVo,
@Param("userId") String userId);
} }
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @ a2691322
...@@ -2537,16 +2537,28 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -2537,16 +2537,28 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
@Override @Override
public void createPaymentFundInfo() { public void createPaymentFundInfo() {
//获取所有未推送的公积金实缴明细数据 long count = baseMapper.selectCount(Wrappers.<TPaymentInfo>query().lambda()
List<TPaymentInfo> unPushInfo = baseMapper.selectList(Wrappers.<TPaymentInfo>query().lambda()
.eq(TPaymentInfo::getPushStatus, CommonConstants.ONE_STRING) .eq(TPaymentInfo::getPushStatus, CommonConstants.ONE_STRING)
.eq(TPaymentInfo::getLockStatus, CommonConstants.ONE_STRING) .eq(TPaymentInfo::getLockStatus, CommonConstants.ONE_STRING)
.isNotNull(TPaymentInfo::getFundId)); .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)) { if (Common.isNotNull(unPushInfo)) {
//推送数据封装并推送 //推送数据封装并推送
initEkpPushFundParam(unPushInfo); initEkpPushFundParam(unPushInfo);
} }
} }
}
}
}
@Override @Override
public void pushPaymentSocialFundInfo(TPaymentInfoSearchVo searchVo) { public void pushPaymentSocialFundInfo(TPaymentInfoSearchVo searchVo) {
...@@ -2586,75 +2598,123 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -2586,75 +2598,123 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
@Override @Override
public void createPaymentInfoIncome() { public void createPaymentInfoIncome() {
//判断缴费库中社保合计和本次导入合计相加是否为0，为0则不生成收入 long count = baseMapper.selectCount(Wrappers.<TPaymentInfo>query().lambda()
List<TPaymentInfo> sumList = baseMapper.selectList(Wrappers.<TPaymentInfo>query().lambda()
.eq(TPaymentInfo::getIncomeStatus,CommonConstants.ONE_STRING) .eq(TPaymentInfo::getIncomeStatus,CommonConstants.ONE_STRING)
.eq(TPaymentInfo::getLockStatus,CommonConstants.ONE_STRING) .eq(TPaymentInfo::getLockStatus,CommonConstants.ONE_STRING)
.isNotNull(TPaymentInfo::getSocialId)); .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)) { if (Common.isNotNull(sumList)) {
//生成收入 //生成收入
createIncomeInfo(sumList, CommonConstants.ONE_STRING); createIncomeInfo(sumList, CommonConstants.ONE_STRING);
} }
} }
}
}
}
@Override @Override
public void createPaymentFundIncome() { 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::getIncomeStatus,CommonConstants.ONE_STRING)
.eq(TPaymentInfo::getLockStatus,CommonConstants.ONE_STRING) .eq(TPaymentInfo::getLockStatus,CommonConstants.ONE_STRING)
.isNotNull(TPaymentInfo::getFundId)); .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)) { if (Common.isNotNull(sumList)) {
//生成公积金收入 //生成公积金收入
createIncomeInfo(sumList, CommonConstants.TWO_STRING); createIncomeInfo(sumList, CommonConstants.TWO_STRING);
} }
} }
}
}
}
public void createPaymentSocialInfoReal(YifuUser user,TPaymentInfoSearchVo searchVo) { public void createPaymentSocialInfoReal(YifuUser user,TPaymentInfoSearchVo searchVo) {
//获取所有未推送的社保实缴明细数据 //获取所有未推送的社保实缴明细数据
List<TPaymentInfo> unPushInfo = baseMapper.getTPaymentSocialPushInfo(searchVo); searchVo.setLockStatus(CommonConstants.ONE_STRING);
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, user.getId());
synchronized (this) {
if (Common.isNotNull(unPushInfo)) { if (Common.isNotNull(unPushInfo)) {
List<TPaymentInfo> list = unPushInfo.stream().filter(e -> findList(e, user)).collect(Collectors.toList());
unPushInfo.clear();
if (Common.isNotNull(list)) {
//推送数据封装并推送 //推送数据封装并推送
initEkpPushSocialParam(list); initEkpPushSocialParam(unPushInfo);
}
}
} }
} }
} }
public void createPaymentFundInfoReal(YifuUser user,TPaymentInfoSearchVo searchVo) { public void createPaymentFundInfoReal(YifuUser user,TPaymentInfoSearchVo searchVo) {
//获取所有未推送的公积金实缴明细数据 //获取所有未推送的公积金实缴明细数据
List<TPaymentInfo> unPushInfo = baseMapper.getTPaymentFundPushInfo(searchVo); searchVo.setLockStatus(CommonConstants.ONE_STRING);
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, user.getId());
synchronized (this) {
if (Common.isNotNull(unPushInfo)) { if (Common.isNotNull(unPushInfo)) {
List<TPaymentInfo> list = unPushInfo.stream().filter(e -> findList(e, user)).collect(Collectors.toList());
unPushInfo.clear();
if (Common.isNotNull(list)) {
//推送数据封装并推送 //推送数据封装并推送
initEkpPushFundParam(list); initEkpPushFundParam(unPushInfo);
}
}
} }
} }
} }
public void createPaymentInfoIncomeReal(YifuUser user,TPaymentInfoSearchVo searchVo) { public void createPaymentInfoIncomeReal(YifuUser user,TPaymentInfoSearchVo searchVo) {
List<TPaymentInfo> sumList = baseMapper.getTPaymentSocialIncomeInfo(searchVo); searchVo.setLockStatus(CommonConstants.ONE_STRING);
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, user.getId());
synchronized (this) {
if (Common.isNotNull(sumList)) { if (Common.isNotNull(sumList)) {
List<TPaymentInfo> list = sumList.stream().filter(e -> findList(e, user)).collect(Collectors.toList());
sumList.clear();
if (Common.isNotNull(list)) {
//生成收入 //生成收入
createIncomeInfo(list, CommonConstants.ONE_STRING); createIncomeInfo(sumList, CommonConstants.ONE_STRING);
}
}
} }
} }
} }
public void createPaymentFundIncomeReal(YifuUser user,TPaymentInfoSearchVo searchVo) { public void createPaymentFundIncomeReal(YifuUser user,TPaymentInfoSearchVo searchVo) {
List<TPaymentInfo> sumList = baseMapper.getTPaymentFundIncomeInfo(searchVo); searchVo.setLockStatus(CommonConstants.ONE_STRING);
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, user.getId());
synchronized (this) {
if (Common.isNotNull(sumList)) { if (Common.isNotNull(sumList)) {
List<TPaymentInfo> list = sumList.stream().filter(e -> findList(e, user)).collect(Collectors.toList());
sumList.clear();
if (Common.isNotNull(list)) {
//生成公积金收入 //生成公积金收入
createIncomeInfo(list, CommonConstants.TWO_STRING); createIncomeInfo(sumList, CommonConstants.TWO_STRING);
}
}
} }
} }
} }
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @ a2691322
...@@ -1242,9 +1242,10 @@ ...@@ -1242,9 +1242,10 @@
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
FROM t_payment_info a FROM t_payment_info a
<where> <where>
a.PUSH_STATUS = '1' AND a.SOCIAL_ID IS NOT NULL a.PUSH_STATUS = '1' AND a.SOCIAL_ID IS NOT NULL AND a.CREATE_BY = #{userId}
<include refid="tPaymentInfo_export_where"/> <include refid="tPaymentInfo_export_where"/>
</where> </where>
limit 0,10000
</select> </select>
<!--tPaymentInfo公积金推送查询--> <!--tPaymentInfo公积金推送查询-->
...@@ -1253,9 +1254,10 @@ ...@@ -1253,9 +1254,10 @@
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
FROM t_payment_info a FROM t_payment_info a
<where> <where>
a.PUSH_STATUS = '1' AND a.FUND_ID IS NOT NULL a.PUSH_STATUS = '1' AND a.FUND_ID IS NOT NULL AND a.CREATE_BY = #{userId}
<include refid="tPaymentInfo_export_where"/> <include refid="tPaymentInfo_export_where"/>
</where> </where>
limit 0,10000
</select> </select>
<!--tPaymentInfo社保收入推送查询--> <!--tPaymentInfo社保收入推送查询-->
...@@ -1264,9 +1266,10 @@ ...@@ -1264,9 +1266,10 @@
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
FROM t_payment_info a FROM t_payment_info a
<where> <where>
a.INCOME_STATUS = '1' AND a.SOCIAL_ID IS NOT NULL a.INCOME_STATUS = '1' AND a.SOCIAL_ID IS NOT NULL AND a.CREATE_BY = #{userId}
<include refid="tPaymentInfo_export_where"/> <include refid="tPaymentInfo_export_where"/>
</where> </where>
limit 0,10000
</select> </select>
<!--tPaymentInfo公积金收入推送查询--> <!--tPaymentInfo公积金收入推送查询-->
...@@ -1275,9 +1278,10 @@ ...@@ -1275,9 +1278,10 @@
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
FROM t_payment_info a FROM t_payment_info a
<where> <where>
a.INCOME_STATUS = '1' AND a.FUND_ID IS NOT NULL a.INCOME_STATUS = '1' AND a.FUND_ID IS NOT NULL AND a.CREATE_BY = #{userId}
<include refid="tPaymentInfo_export_where"/> <include refid="tPaymentInfo_export_where"/>
</where> </where>
limit 0,10000
</select> </select>
<!-- 更改社保公积金推送状态 --> <!-- 更改社保公积金推送状态 -->
...@@ -1295,4 +1299,47 @@ ...@@ -1295,4 +1299,47 @@
where where
ID = #{id} ID = #{id}
</update> </update>
<select id="getTPaymentSocialPushCount" resultType="java.lang.Long">
SELECT
count(1)
FROM t_payment_info a
<where>
a.PUSH_STATUS = '1' AND a.SOCIAL_ID IS NOT NULL AND a.CREATE_BY = #{userId}
<include refid="tPaymentInfo_export_where"/>
</where>
</select>
<!--tPaymentInfo公积金推送查询-->
<select id="getTPaymentFundPushCount" resultType="java.lang.Long">
SELECT
count(1)
FROM t_payment_info a
<where>
a.PUSH_STATUS = '1' AND a.FUND_ID IS NOT NULL AND a.CREATE_BY = #{userId}
<include refid="tPaymentInfo_export_where"/>
</where>
</select>
<!--tPaymentInfo社保收入推送查询-->
<select id="getTPaymentSocialIncomeCount" resultType="java.lang.Long">
SELECT
count(1)
FROM t_payment_info a
<where>
a.INCOME_STATUS = '1' AND a.SOCIAL_ID IS NOT NULL AND a.CREATE_BY = #{userId}
<include refid="tPaymentInfo_export_where"/>
</where>
</select>
<!--tPaymentInfo公积金收入推送查询-->
<select id="getTPaymentFundIncomeCount" resultType="java.lang.Long">
SELECT
count(1)
FROM t_payment_info a
<where>
a.INCOME_STATUS = '1' AND a.FUND_ID IS NOT NULL AND a.CREATE_BY = #{userId}
<include refid="tPaymentInfo_export_where"/>
</where>
</select>
</mapper> </mapper>
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