|
|
@ -237,7 +237,7 @@ public class ClueServiceImpl implements ClueService {
|
|
|
|
// 列表中查询标签信息 和 axb请求字段
|
|
|
|
// 列表中查询标签信息 和 axb请求字段
|
|
|
|
for (ClueDto clueDto : clueDtoList) {
|
|
|
|
for (ClueDto clueDto : clueDtoList) {
|
|
|
|
String value = (String) redisUtils.get(KeyFieldConstants.TASK_NAME_KEY + clueDto.getTaskId());
|
|
|
|
String value = (String) redisUtils.get(KeyFieldConstants.TASK_NAME_KEY + clueDto.getTaskId());
|
|
|
|
if (StringUtils.isEmpty(value) || value.equals("null")) {
|
|
|
|
if (StringUtils.isEmpty(value) || "null".equals(value)) {
|
|
|
|
ResponseEntity<Map<String, Object>> response = taskClient.findRedisTask(clueDto.getTaskId(), 0);
|
|
|
|
ResponseEntity<Map<String, Object>> response = taskClient.findRedisTask(clueDto.getTaskId(), 0);
|
|
|
|
if (response.getStatusCode().value() != 200) {
|
|
|
|
if (response.getStatusCode().value() != 200) {
|
|
|
|
throw new BadRequestException("查询错误");
|
|
|
|
throw new BadRequestException("查询错误");
|
|
|
@ -276,7 +276,7 @@ public class ClueServiceImpl implements ClueService {
|
|
|
|
if (memberId != null && userNickNameMap.containsKey(memberId)) {
|
|
|
|
if (memberId != null && userNickNameMap.containsKey(memberId)) {
|
|
|
|
clueDto.setDistributeUserName(userNickNameMap.get(memberId));
|
|
|
|
clueDto.setDistributeUserName(userNickNameMap.get(memberId));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ResponseEntity<Map<String, List<String>>> response = taskClient.findTaskLabel(clueDto.getTaskId(), clueDto.getOrganizeId(),clueQueryCriteria.getMemberId());
|
|
|
|
ResponseEntity<Map<String, List<String>>> response = taskClient.findTaskLabel(clueDto.getTaskId(), clueDto.getOrganizeId(), clueQueryCriteria.getMemberId());
|
|
|
|
if (response.getStatusCode().value() != 200) {
|
|
|
|
if (response.getStatusCode().value() != 200) {
|
|
|
|
throw new BadRequestException("查询出错");
|
|
|
|
throw new BadRequestException("查询出错");
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -307,7 +307,7 @@ public class ClueServiceImpl implements ClueService {
|
|
|
|
if (clueRecordCriteria.getCreateBy() != null) {
|
|
|
|
if (clueRecordCriteria.getCreateBy() != null) {
|
|
|
|
Sort sort = Sort.by(Sort.Direction.ASC, "createTime");
|
|
|
|
Sort sort = Sort.by(Sort.Direction.ASC, "createTime");
|
|
|
|
List<ClueRecordDto> clueRecordDtos = clueRecordMapper.toDto(clueRecordRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, clueRecordCriteria, criteriaBuilder), sort));
|
|
|
|
List<ClueRecordDto> clueRecordDtos = clueRecordMapper.toDto(clueRecordRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, clueRecordCriteria, criteriaBuilder), sort));
|
|
|
|
ExportExcelUtil.downloadEasyExcel(response, ClueRecordDto.class, clueRecordDtos);
|
|
|
|
ExportExcelUtil.downloadEasyExcel(response, ClueRecordDto.class, clueRecordDtos, "export-Record");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -315,7 +315,7 @@ public class ClueServiceImpl implements ClueService {
|
|
|
|
public void exportClueList(HttpServletResponse response, ClueQueryCriteria clueQueryCriteria) {
|
|
|
|
public void exportClueList(HttpServletResponse response, ClueQueryCriteria clueQueryCriteria) {
|
|
|
|
if (clueQueryCriteria.getMemberId() != null) {
|
|
|
|
if (clueQueryCriteria.getMemberId() != null) {
|
|
|
|
List<ClueDto> clueDtoList = clueJpa.getClueList(clueQueryCriteria, null);
|
|
|
|
List<ClueDto> clueDtoList = clueJpa.getClueList(clueQueryCriteria, null);
|
|
|
|
ExportExcelUtil.downloadEasyExcel(response, ExcelClueDto.class, clueDtoList);
|
|
|
|
ExportExcelUtil.downloadEasyExcel(response, ExcelClueDto.class, clueDtoList, "export-clue");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -368,10 +368,10 @@ public class ClueServiceImpl implements ClueService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//修改微信字段
|
|
|
|
//修改微信字段
|
|
|
|
if (StringUtils.isNotEmpty(clueMiddle.getWx())){
|
|
|
|
if (StringUtils.isNotEmpty(clueMiddle.getWx())) {
|
|
|
|
clue.setWx(clueMiddle.getWx());
|
|
|
|
clue.setWx(clueMiddle.getWx());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (StringUtils.isNotEmpty(clueMiddle.getAddress())){
|
|
|
|
if (StringUtils.isNotEmpty(clueMiddle.getAddress())) {
|
|
|
|
clue.setAddress(clueMiddle.getAddress());
|
|
|
|
clue.setAddress(clueMiddle.getAddress());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (clueMiddle.getClueCallStatus() != null) {
|
|
|
|
if (clueMiddle.getClueCallStatus() != null) {
|
|
|
@ -424,7 +424,7 @@ public class ClueServiceImpl implements ClueService {
|
|
|
|
OceanEngineClueId oceanEngineClue = oceanEngineClueIdRepository.findOceanEngineClueIdByLocalClueId(clueId);
|
|
|
|
OceanEngineClueId oceanEngineClue = oceanEngineClueIdRepository.findOceanEngineClueIdByLocalClueId(clueId);
|
|
|
|
String oceanEngineClueId = oceanEngineClue.getOceanEngineClueId();
|
|
|
|
String oceanEngineClueId = oceanEngineClue.getOceanEngineClueId();
|
|
|
|
Long userId = oceanEngineClue.getUserId();
|
|
|
|
Long userId = oceanEngineClue.getUserId();
|
|
|
|
OceanEngineToken oceanEngineToken = oceanEngineClient.queryByUserIdAndStatus(userId, 1).getBody();
|
|
|
|
OceanEngineToken oceanEngineToken = oceanEngineClient.queryByUserIdAndStatus(userId, 1, SecurityConstants.FROM_IN).getBody();
|
|
|
|
if (ObjectUtil.isNotEmpty(oceanEngineToken)) {
|
|
|
|
if (ObjectUtil.isNotEmpty(oceanEngineToken)) {
|
|
|
|
Boolean aBoolean = ReqOceanEngineApi.callbackOceanEngineClue(oceanEngineClueId, stage, oceanEngineToken.getAccessToken(), oceanEngineToken.getAdvertiserIds());
|
|
|
|
Boolean aBoolean = ReqOceanEngineApi.callbackOceanEngineClue(oceanEngineClueId, stage, oceanEngineToken.getAccessToken(), oceanEngineToken.getAdvertiserIds());
|
|
|
|
if (aBoolean) {
|
|
|
|
if (aBoolean) {
|
|
|
@ -586,6 +586,9 @@ public class ClueServiceImpl implements ClueService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Set<Long> taskIds = findTaskId(taskQueryCriteria);
|
|
|
|
Set<Long> taskIds = findTaskId(taskQueryCriteria);
|
|
|
|
clueQueryCriteria.setTaskIds(taskIds);
|
|
|
|
clueQueryCriteria.setTaskIds(taskIds);
|
|
|
|
|
|
|
|
if (clueQueryCriteria.getClueType() == null) {
|
|
|
|
|
|
|
|
clueQueryCriteria.setClueTypes(Arrays.asList(ClueTypeConstants.CLUE_POOL));
|
|
|
|
|
|
|
|
}
|
|
|
|
return findClueList(clueQueryCriteria, pageable);
|
|
|
|
return findClueList(clueQueryCriteria, pageable);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
log.info("========================用户id为空============================");
|
|
|
|
log.info("========================用户id为空============================");
|
|
|
@ -648,6 +651,9 @@ public class ClueServiceImpl implements ClueService {
|
|
|
|
taskIds = findTaskId(taskQueryCriteria);
|
|
|
|
taskIds = findTaskId(taskQueryCriteria);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
clueQueryCriteria.setTaskIds(taskIds);
|
|
|
|
clueQueryCriteria.setTaskIds(taskIds);
|
|
|
|
|
|
|
|
if (clueQueryCriteria.getClueType() == null) {
|
|
|
|
|
|
|
|
clueQueryCriteria.setClueTypes(Arrays.asList(ClueTypeConstants.SCREEN_TYPE));
|
|
|
|
|
|
|
|
}
|
|
|
|
return findClueList(clueQueryCriteria, pageable);
|
|
|
|
return findClueList(clueQueryCriteria, pageable);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -970,10 +976,6 @@ public class ClueServiceImpl implements ClueService {
|
|
|
|
return PageUtil.toPage(DefaultNumberConstants.ZERO_NUMBER, DefaultNumberConstants.ZERO_NUMBER);
|
|
|
|
return PageUtil.toPage(DefaultNumberConstants.ZERO_NUMBER, DefaultNumberConstants.ZERO_NUMBER);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
clueQueryCriteria.setIsAdmin(true);
|
|
|
|
clueQueryCriteria.setIsAdmin(true);
|
|
|
|
if (clueQueryCriteria.getClueType() == null) {
|
|
|
|
|
|
|
|
//4 dmp 5拓客 是特殊的任务,单独处理
|
|
|
|
|
|
|
|
clueQueryCriteria.setClueTypes(Arrays.asList(ClueTypeConstants.SCREEN_TYPE));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
List<ClueDto> clueList = this.findClue(clueQueryCriteria, pageable);
|
|
|
|
List<ClueDto> clueList = this.findClue(clueQueryCriteria, pageable);
|
|
|
|
Long count = this.findClueCount(clueQueryCriteria);
|
|
|
|
Long count = this.findClueCount(clueQueryCriteria);
|
|
|
|
Set<Long> memberIds = clueList.stream().map(ClueDto::getMemberId).collect(Collectors.toSet());
|
|
|
|
Set<Long> memberIds = clueList.stream().map(ClueDto::getMemberId).collect(Collectors.toSet());
|
|
|
@ -1007,9 +1009,9 @@ public class ClueServiceImpl implements ClueService {
|
|
|
|
private String findTaskName(Long taskId) {
|
|
|
|
private String findTaskName(Long taskId) {
|
|
|
|
String taskNameKey = KeyFieldConstants.TASK_NAME_KEY + taskId;
|
|
|
|
String taskNameKey = KeyFieldConstants.TASK_NAME_KEY + taskId;
|
|
|
|
String str = (String) redisUtils.get(taskNameKey);
|
|
|
|
String str = (String) redisUtils.get(taskNameKey);
|
|
|
|
if (StringUtils.isEmpty(str) || str.equals("null") ) {
|
|
|
|
if (StringUtils.isEmpty(str) || "null".equals(str)) {
|
|
|
|
ResponseEntity<Task> response = taskClient.queryDetails(taskId);
|
|
|
|
ResponseEntity<Task> response = taskClient.queryDetails(taskId, SecurityConstants.FROM_IN);
|
|
|
|
if (response.getStatusCode().value() != 200){
|
|
|
|
if (response.getStatusCode().value() != 200) {
|
|
|
|
throw new BadRequestException("查询错误");
|
|
|
|
throw new BadRequestException("查询错误");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return Objects.requireNonNull(response.getBody()).getTaskName();
|
|
|
|
return Objects.requireNonNull(response.getBody()).getTaskName();
|
|
|
|