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 a8ce29b1..7096bba5 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 @@ -9,9 +9,7 @@ import javax.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.xboe.core.SysConstant; @@ -22,7 +20,6 @@ import com.xboe.data.dto.AudienceUser; import lombok.extern.slf4j.Slf4j; @Service -@Transactional @Slf4j public class OutSideDataServiceImpl implements IOutSideDataService { @@ -67,9 +64,9 @@ public class OutSideDataServiceImpl implements IOutSideDataService { //这里应该是单独的线程去处理 for(JsonNode JsonNode :result) { AudienceUser au=new AudienceUser(); - au.setId(result.get("id").asText()); - au.setName(getNodeText(result.get("userName"))); - au.setCode(getNodeText(result.get("userNo"))); + au.setId(JsonNode.get("id").asText()); + au.setName(getNodeText(JsonNode.get("userName"))); + au.setCode(getNodeText(JsonNode.get("userNo"))); list.add(au); } } 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 e38e93dd..f561cc58 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 @@ -10,13 +10,14 @@ import javax.transaction.Transactional; import org.springframework.stereotype.Service; import com.xboe.core.orm.FieldFilters; +import com.xboe.data.dto.AudienceUser; +import com.xboe.data.outside.IOutSideDataService; import com.xboe.module.exam.dao.AloneExamAnswerDao; import com.xboe.module.exam.dao.AloneExamDao; import com.xboe.module.exam.dao.ExamUserTaskDao; import com.xboe.module.exam.dto.ExamTestDto; import com.xboe.module.exam.entity.AloneExam; import com.xboe.module.exam.entity.AloneExamAnswer; -import com.xboe.module.exam.entity.ExamPaper; import com.xboe.module.exam.entity.ExamTest; import com.xboe.module.exam.entity.ExamUserTask; import com.xboe.module.exam.service.IExamUserTaskService; @@ -41,6 +42,9 @@ public class ExamUserTaskServiceImpl implements IExamUserTaskService{ @Resource AloneExamDao aloneExamDao; + + @Resource + IOutSideDataService outSideService; @Override @Transactional @@ -57,6 +61,10 @@ public class ExamUserTaskServiceImpl implements IExamUserTaskService{ //执行推送,当前因为是固定人,所以这里直接添加处理,按受众添加到每个人中 //查询受众的信息 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())); @@ -92,6 +100,8 @@ 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()));