|
|
@ -4,6 +4,7 @@ import com.ruoyi.common.enums.FlagStatus;
|
|
|
|
import com.ruoyi.common.enums.LarkActiveStageEnum;
|
|
|
|
import com.ruoyi.common.enums.LarkActiveStageEnum;
|
|
|
|
import com.ruoyi.common.utils.DateUtils;
|
|
|
|
import com.ruoyi.common.utils.DateUtils;
|
|
|
|
import com.ruoyi.flyingbook.domain.LarkActive;
|
|
|
|
import com.ruoyi.flyingbook.domain.LarkActive;
|
|
|
|
|
|
|
|
import com.ruoyi.flyingbook.domain.LarkLoginLog;
|
|
|
|
import com.ruoyi.flyingbook.domain.LarkUserActiveRelatoin;
|
|
|
|
import com.ruoyi.flyingbook.domain.LarkUserActiveRelatoin;
|
|
|
|
import com.ruoyi.flyingbook.domain.edi.ResponseVo;
|
|
|
|
import com.ruoyi.flyingbook.domain.edi.ResponseVo;
|
|
|
|
import com.ruoyi.flyingbook.domain.larkactive.LarkActiveRequest;
|
|
|
|
import com.ruoyi.flyingbook.domain.larkactive.LarkActiveRequest;
|
|
|
@ -11,6 +12,7 @@ import com.ruoyi.flyingbook.domain.larkactive.LarkActiveVo;
|
|
|
|
import com.ruoyi.flyingbook.mapper.LarkActiveMapper;
|
|
|
|
import com.ruoyi.flyingbook.mapper.LarkActiveMapper;
|
|
|
|
import com.ruoyi.flyingbook.mapper.LarkUserActiveRelatoinMapper;
|
|
|
|
import com.ruoyi.flyingbook.mapper.LarkUserActiveRelatoinMapper;
|
|
|
|
import com.ruoyi.flyingbook.service.ILarkActiveService;
|
|
|
|
import com.ruoyi.flyingbook.service.ILarkActiveService;
|
|
|
|
|
|
|
|
import com.ruoyi.flyingbook.service.ILarkLoginLogService;
|
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
@ -19,6 +21,8 @@ import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 【请填写功能名称】Service业务层处理
|
|
|
|
* 【请填写功能名称】Service业务层处理
|
|
|
@ -32,6 +36,8 @@ public class LarkActiveServiceImpl implements ILarkActiveService {
|
|
|
|
private LarkActiveMapper larkActiveMapper;
|
|
|
|
private LarkActiveMapper larkActiveMapper;
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
private LarkUserActiveRelatoinMapper larkUserActiveRelatoinMapper;
|
|
|
|
private LarkUserActiveRelatoinMapper larkUserActiveRelatoinMapper;
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
|
|
|
private ILarkLoginLogService larkLoginLogService;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 查询【请填写功能名称】
|
|
|
|
* 查询【请填写功能名称】
|
|
|
@ -102,8 +108,20 @@ public class LarkActiveServiceImpl implements ILarkActiveService {
|
|
|
|
larkActive.setFlag(FlagStatus.OK.getCode());
|
|
|
|
larkActive.setFlag(FlagStatus.OK.getCode());
|
|
|
|
Integer count = larkActiveMapper.count(larkActive);
|
|
|
|
Integer count = larkActiveMapper.count(larkActive);
|
|
|
|
List<String> nameList = larkUserActiveRelatoinMapper.queryCompleteActiveUserName(count, companyName);
|
|
|
|
List<String> nameList = larkUserActiveRelatoinMapper.queryCompleteActiveUserName(count, companyName);
|
|
|
|
|
|
|
|
if (CollectionUtils.isNotEmpty(nameList)) {
|
|
|
|
|
|
|
|
Map<String, LarkLoginLog> userInfoMap = larkLoginLogService.queryByOpenId(nameList);
|
|
|
|
|
|
|
|
nameList = nameList.stream()
|
|
|
|
|
|
|
|
.filter(r -> {
|
|
|
|
|
|
|
|
return userInfoMap.containsKey(r);
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
.map(r -> {
|
|
|
|
|
|
|
|
return userInfoMap.get(r).getUserName();
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
.distinct().collect(Collectors.toList());
|
|
|
|
return String.join(",", nameList);
|
|
|
|
return String.join(",", nameList);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return "";
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public List<LarkActive> queryCompleteActiveByUserName(LarkActiveRequest larkActive) {
|
|
|
|
public List<LarkActive> queryCompleteActiveByUserName(LarkActiveRequest larkActive) {
|
|
|
|