Commit 1102dd7b authored by hongguangwu's avatar hongguangwu

MVP1.7.3-shuiyou 测试提交

parent d6c11b44
......@@ -11,19 +11,9 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.http.*;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
/**
* @Author: hgw
......@@ -52,23 +42,13 @@ public class SocialFriendConfig {
@Value("${socialFriend.urlGetInfo}")
private String urlGetInfo;
// 税友——1功能列表的KEY
private final String APP_GET_MODULE_DETAIL = "APP_GET_MODULE_DETAIL";
// 税友——2可执行设备
private final String TERMINALS_BY_FUNCTION = "TERMINALS_BY_FUNCTION";
// 税友——5查看结果
private final String GET_FIVE_JOB = "GET_FIVE_JOB";
@Autowired
private RedisTemplate redisTemplate;
/**
* @Description: 4:推送任务接口
* @Author: hgw
* @Date: 2024-5-8 15:07:45
* @return: java.lang.String
**/
public String getFourAppAdd(RestTemplate restTemplate, String jobFile, String moduleDetailId, String terminalId) {
public String getFourAppAdd(RestTemplate restTemplate) {
String addId = "";
String appAddUrl = urlPre + urlPush;
HttpHeaders headers = new HttpHeaders();
......
......@@ -25,6 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.social.config.SocialConfig;
import com.yifu.cloud.plus.v1.yifu.social.config.SocialFriendConfig;
import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialDeadlineInfo;
import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo;
import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialSoldierLog;
......@@ -65,6 +66,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
private RestTemplate restTemplate = new RestTemplate();
private final SocialConfig socialConfig;
private final SocialFriendConfig socialFriendConfig;
private final TSocialInfoService tSocialInfoService;
private final TSocialSoldierShenBaoTaskService tSocialSoldierShenBaoTaskService;
private final TSocialDeadlineInfoService tSocialDeadlineInfoService;
......@@ -172,18 +174,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
public R<String> pushFriendTest(List<String> dispatchIdList) {
// 获取时间限制配置(获取 当月启用 的配置)
Map<String, TSocialDeadlineInfo> socialsetMap = tSocialDeadlineInfoService.getSocialSet();
// 社保增员、社保减员、医保增员、医保减员
// 养工失新增列表
List<SocialSoldierYgsAddVo> ygsAddlist = baseMapper.getSocialSoldierYgsAddVoList(dispatchIdList);
if (ygsAddlist != null && !ygsAddlist.isEmpty()) {
this.doPushSocialAndLogYgs(socialsetMap, ygsAddlist, "社保增员");
}
if ((ygsAddlist == null || ygsAddlist.isEmpty())) {
return R.failed("无数据,推送结束!");
}
return R.ok("推送成功!!");
String id = socialFriendConfig.getFourAppAdd(restTemplate);
return R.ok(id);
}
/**
......
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