From 6637bd8436886ea0245440a99137a72e95024429 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 1 Dec 2022 18:29:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E7=9A=84=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/outside/OutSideDataServiceImpl.java | 9 ++++- .../service/impl/ExamUserTaskServiceImpl.java | 35 +++++++++++++++---- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java index cc1f5d21..f0fd1eef 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java @@ -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 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 params = new HashMap<>(); params.put("audienceId", audienceId); String json = null; diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamUserTaskServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamUserTaskServiceImpl.java index f561cc58..0ed9e8c8 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamUserTaskServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamUserTaskServiceImpl.java @@ -58,17 +58,13 @@ public class ExamUserTaskServiceImpl implements IExamUserTaskService{ examUserTask.setTaskTime(LocalDateTime.now()); examUserTask.setStatus(ExamUserTask.STATUS_FINISH); dao.save(examUserTask); + // 下面的代码应该调用rePushTask //执行推送，当前因为是固定人，所以这里直接添加处理，按受众添加到每个人中 //查询受众的信息 List items = ugroupDao.findList("groupId", task.getGroupId()); - - //调用用户服务的接口 - //List sudienceUsers=outSideService.getUsersByAudienceId(task.getGroupId()); - if(items.size()>0) { //防止加入两条的问题，应该是先查询，再添加 Map 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 items = ugroupDao.findList("groupId", task.getGroupId()); - - if(items.size()>0) { //防止加入两条的问题，应该是先查询，再添加 Map amap= aloneExamDao.findMap("aid", "name",FieldFilters.eq("testId", task.getTestId())); @@ -125,6 +119,33 @@ public class ExamUserTaskServiceImpl implements IExamUserTaskService{ aloneExamDao.save(aloneExam); } } + + //调用用户服务的接口,在启用下面的代码前，需要 +// List sudienceUsers=outSideService.getUsersByAudienceId(task.getGroupId()); +// if(sudienceUsers.size()>0) { +// //防止加入两条的问题，应该是先查询，再添加 +// Map 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);