小E数字提示问题

cloud-web-manage/src/main/java/com/yizhi/application/dashboard/controller/PromptStatisticsController.java

@@ -4,6 +4,9 @@ import com.yizhi.application.vo.PromptItemVO;
 import com.yizhi.application.vo.PromptStatisticsVO;
 import com.yizhi.core.application.context.ContextHolder;
 import com.yizhi.core.application.context.RequestContext;
+import com.yizhi.exam.application.feign.MyExamClient;
+import com.yizhi.exam.application.vo.MyExamParameterVO;
+import com.yizhi.exam.application.vo.exam.MyExamPageVO;
 import com.yizhi.research.application.feign.ResearchClient;
 import com.yizhi.research.application.vo.BaseModel;
 import com.yizhi.research.application.vo.api.PageVo;
@@ -51,6 +54,9 @@ public class PromptStatisticsController {
     @Autowired
     private SystemMailboxClients systemMailboxClients;
 
+    @Autowired
+    private MyExamClient myExamClient;
+
     @ApiOperation(value = "获取提示统计信息", notes = "获取总提示数量及各类提示数量统计")
     @GetMapping("/statistics")
     public Response<PromptStatisticsVO> getPromptStatistics() {
@@ -228,18 +234,18 @@ public class PromptStatisticsController {
      */
     private Integer getTrainingTestCount(RequestContext context) {
         try {
-            // 使用考试dashboard接口获取考试统计信息
-            ExamDashboardQueryVO query = new ExamDashboardQueryVO();
-            query.setSiteId(context.getSiteId());
-            // 设置最近7天的时间范围
-            Date endDate = new Date();
-            Date startDate = new Date(endDate.getTime() - 7 * 24 * 60 * 60 * 1000L);
-            query.setStartDate(startDate);
-            query.setEndDate(endDate);
-
-            Map<Long, Integer> examData = examApiClient.getExamDashboardData(query);
-            // 返回考试数量
-            return examData != null ? examData.size() : 0;
+            // 使用我的考试接口获取未完成的考试列表
+            MyExamParameterVO param = new MyExamParameterVO();
+            param.setSiteId(context.getSiteId());
+            param.setAccountId(context.getAccountId());
+            // 设置状态为未完成(进行中)的考试
+            param.setState(1);
+            param.setPageNo(1);
+            param.setPageSize(1000); // 设置一个较大的数值以获取所有未完成的考试
+
+            MyExamPageVO examData = myExamClient.getMyExamList(param);
+            // 返回未完成考试的数量
+            return examData != null && examData.getExamVOS() != null ? examData.getExamVOS().size() : 0;
         } catch (Exception e) {
             LOGGER.error("获取培训测试数量失败", e);
             return 0;

cloud-web-student/src/main/java/com/yizhi/application/promptStatistics/PromptStatisticsController.java

@@ -14,6 +14,9 @@ import com.yizhi.training.application.vo.api.TrainingProjectMyParamVo;
 import com.yizhi.util.application.domain.Response;
 import com.yizhi.exam.application.feign.ExamApiClient;
 import com.yizhi.exam.application.vo.dashboard.ExamDashboardQueryVO;
+import com.yizhi.exam.application.feign.MyExamClient;
+import com.yizhi.exam.application.vo.MyExamParameterVO;
+import com.yizhi.exam.application.vo.exam.MyExamPageVO;
 import com.yizhi.research.application.vo.domain.ResearchVo;
 import com.yizhi.training.application.vo.api.TrainingProjectListVo;
 import io.swagger.annotations.Api;
@@ -49,6 +52,9 @@ public class PromptStatisticsController {
     private ExamApiClient examApiClient;
 
     @Autowired
+    private MyExamClient myExamClient;
+
+    @Autowired
     private SystemMailboxClients systemMailboxClients;
 
     @ApiOperation(value = "获取提示统计信息", notes = "获取总提示数量及各类提示数量统计")
@@ -229,18 +235,18 @@ public class PromptStatisticsController {
      */
     private Integer getTrainingTestCount(RequestContext context) {
         try {
-            // 使用考试dashboard接口获取考试统计信息
-            ExamDashboardQueryVO query = new ExamDashboardQueryVO();
-            query.setSiteId(context.getSiteId());
-            // 设置最近7天的时间范围
-            Date endDate = new Date();
-            Date startDate = new Date(endDate.getTime() - 7 * 24 * 60 * 60 * 1000L);
-            query.setStartDate(startDate);
-            query.setEndDate(endDate);
-
-            Map<Long, Integer> examData = examApiClient.getExamDashboardData(query);
-            // 返回考试数量
-            return examData != null ? examData.size() : 0;
+            // 使用我的考试接口获取未完成的考试列表
+            MyExamParameterVO param = new MyExamParameterVO();
+            param.setSiteId(context.getSiteId());
+            param.setAccountId(context.getAccountId());
+            // 设置状态为未完成(进行中)的考试
+            param.setState(1);
+            param.setPageNo(1);
+            param.setPageSize(1000); // 设置一个较大的数值以获取所有未完成的考试
+            
+            MyExamPageVO examData = myExamClient.getMyExamList(param);
+            // 返回未完成考试的数量
+            return examData != null && examData.getExamVOS() != null ? examData.getExamVOS().size() : 0;
         } catch (Exception e) {
             LOGGER.error("获取培训测试数量失败", e);
             return 0;