hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-09 02:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

增加用户服务的基础配置

Browse Source
This commit is contained in:
daihh
2022-12-01 18:29:42 +08:00
parent 7d5c34ee35
commit 6637bd8436
2 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java
View File

@@ -7,6 +7,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -43,10 +44,16 @@ public class OutSideDataServiceImpl implements IOutSideDataService {
@Override
public List<AudienceUser> getUsersByAudienceId(String audienceId){
String baseUrl=SysConstant.getConfigValue("xboe.server.userbasic.url");
if(StringUtils.isBlank(baseUrl)) {
log.error("获取受众用户错误，未配置用户服务的地址【xboe.server.userbasic.url】");
throw new RuntimeException("获取受众用户错误，未配置用户服务的地址");
}
String token = TokenProxy.getToken(request);
String type="application/json";
String[] headers=new String[] {"token",token,"Content-Type",type};
String url= SysConstant.getConfigValue("xboe.old.base.url")+"/userbasic/audience/memberList";
String url= baseUrl+"/audience/memberList";
Map<String, String> params = new HashMap<>();
params.put("audienceId", audienceId);
String json = null;

35
servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamUserTaskServiceImpl.java
View File

@@ -58,17 +58,13 @@ public class ExamUserTaskServiceImpl implements IExamUserTaskService{
examUserTask.setTaskTime(LocalDateTime.now());
examUserTask.setStatus(ExamUserTask.STATUS_FINISH);
dao.save(examUserTask);
// 下面的代码应该调用rePushTask
//执行推送，当前因为是固定人，所以这里直接添加处理，按受众添加到每个人中
//查询受众的信息
List<UserGroupItem> items = ugroupDao.findList("groupId", task.getGroupId());
//调用用户服务的接口
//List<AudienceUser> sudienceUsers=outSideService.getUsersByAudienceId(task.getGroupId());
if(items.size()>0) {
//防止加入两条的问题，应该是先查询，再添加
Map<String,Object> amap= aloneExamDao.findMap("aid", "name",FieldFilters.eq("testId", task.getTestId()));
//这里应该是单独的线程去处理
for(UserGroupItem item :items) {
if(amap.containsKey(item.getAid())) {
@@ -100,8 +96,6 @@ public class ExamUserTaskServiceImpl implements IExamUserTaskService{
//执行推送，当前因为是固定人，所以这里直接添加处理，按受众添加到每个人中
//查询受众的信息，2022、11、30 这个的返回需要从接口获取人员信息，然后推送
List<UserGroupItem> items = ugroupDao.findList("groupId", task.getGroupId());
if(items.size()>0) {
//防止加入两条的问题，应该是先查询，再添加
Map<String,Object> amap= aloneExamDao.findMap("aid", "name",FieldFilters.eq("testId", task.getTestId()));
@@ -125,6 +119,33 @@ public class ExamUserTaskServiceImpl implements IExamUserTaskService{
aloneExamDao.save(aloneExam);
}
}
//调用用户服务的接口,在启用下面的代码前，需要
// List<AudienceUser> sudienceUsers=outSideService.getUsersByAudienceId(task.getGroupId());
// if(sudienceUsers.size()>0) {
// //防止加入两条的问题，应该是先查询，再添加
// Map<String,Object> amap= aloneExamDao.findMap("aid", "name",FieldFilters.eq("testId", task.getTestId()));
// //这里应该是单独的线程去处理
// for(AudienceUser item :sudienceUsers) {
// if(amap.containsKey(item.getId())) {
// continue;
// }
// //检查是否存在
// AloneExam aloneExam = new AloneExam();
// aloneExam.setAid(item.getId());
// aloneExam.setTestId(task.getTestId());
// aloneExam.setTestName(task.getTestName());
// aloneExam.setName(item.getName());
// aloneExam.setUcode(item.getCode());
// aloneExam.setTestDuration(task.getDuration());
// aloneExam.setTaskTime(LocalDateTime.now());
// aloneExam.setStartTime(task.getStartTime());
// aloneExam.setStatus(AloneExamAnswer.STATUS_NONE);//未考试过
// aloneExam.setScore(0f);
// aloneExamDao.save(aloneExam);
// }
// }
//examUserTask.setStatus(ExamUserTask.STATUS_FINISH);
//dao.update(examUserTask);