Skip to content

C
cloud-web
Commit 206fa1c0 by wangxin
Options

首页滚动提示

parent bfe4d3a9
Showing with 390 additions and 5 deletions
cloud-web-manage/src/main/java/com/yizhi/application/dashboard/controller/PromptStatisticsController.java
......@@ -2,29 +2,39 @@ package com.yizhi.application.dashboard.controller;
import com.yizhi.application.vo.PromptItemVO;
import com.yizhi.application.vo.PromptStatisticsVO;
import com.yizhi.application.vo.ScrollPromptItemVO;
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.MyExamVO;
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;
import com.yizhi.site.application.feign.api.SystemMailboxClients;
import com.yizhi.site.application.vo.domain.SystemMailboxParamVo;
import com.yizhi.training.application.feign.LeaveWordClient;
import com.yizhi.training.application.feign.TrainingProjectClient;
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.research.application.vo.domain.ResearchVo;
import com.yizhi.training.application.vo.api.TrainingProjectListVo;
import com.yizhi.site.application.feign.PublicationManageFeignClients;
import com.yizhi.site.application.vo.site.PublicationParamVO;
import com.yizhi.site.application.vo.domain.PublicationVo;
import com.yizhi.system.application.system.remote.AccountClient;
import com.yizhi.system.application.vo.AccountVO;
import com.yizhi.system.application.vo.UserInfoVO;
import com.yizhi.system.application.vo.domain.Account;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
......@@ -32,12 +42,15 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.HashSet;
import java.util.HashMap;
import com.baomidou.mybatisplus.plugins.Page;
@Api(tags = "提示统计接口")
@RestController
@RequestMapping("/api/prompt")
@RequestMapping("/manage/prompt")
public class PromptStatisticsController {
private static final Logger LOGGER = LoggerFactory.getLogger(PromptStatisticsController.class);
......@@ -57,6 +70,15 @@ public class PromptStatisticsController {
@Autowired
private MyExamClient myExamClient;
@Autowired
private LeaveWordClient leaveWordClient;
@Autowired
private PublicationManageFeignClients publicationManageFeignClients;
@Autowired
private AccountClient accountClient;
@ApiOperation(value = "获取提示统计信息", notes = "获取总提示数量及各类提示数量统计")
@GetMapping("/statistics")
public Response<PromptStatisticsVO> getPromptStatistics() {
......@@ -95,6 +117,7 @@ public class PromptStatisticsController {
return Response.fail("500", "获取提示统计信息失败");
}
}
@ApiOperation(value = "获取提示统计信息列表", notes = "获取提示统计信息列表，返回类型和数量的映射")
@GetMapping("/statistics/list")
public Response<List<PromptItemVO>> getPromptStatisticsList() {
......@@ -133,6 +156,327 @@ public class PromptStatisticsController {
}
/**
* 获取滚动提示数据
* @return
*/
@ApiOperation(value = "获取滚动提示数据", notes = "获取滚动提示数据，包括活动管理、考试列表、投票管理、投稿管理、信箱管理、留言管理等数据")
@PostMapping("/scroll/data")
public Response<Map<String, List<ScrollPromptItemVO>>> getScrollPromptData() {
try {
RequestContext context = ContextHolder.get();
Map<String, List<ScrollPromptItemVO>> resultMap = new java.util.HashMap<>();
// 1. 活动管理（4天内创建且已上架的数据）
List<TrainingProjectListVo> activityList = getActivityManagementData(context);
// 2. 考试列表（4天内创建且已上架的数据）
List<MyExamVO> examList = getExamListData(context);
// 3. 投票管理（4天内创建且已上架的数据）
List<ResearchVo> voteList = getVoteManagementData(context);
// 4. 投稿管理（4天内创建且已上架的数据）
List<PublicationVo> articleList = getContributionManagementData(context);
// 5. 信箱管理（4天内创建且已上架的数据）
List<SystemMailboxParamVo> mailboxList = getMailboxManagementData(context);
// 6. 留言管理（4天内创建且已上架的数据）
List<com.yizhi.training.application.vo.domain.LeaveWordVo> messageList = getMessageManagementData(context);
// 收集所有用户名
List<Long> userIds = new ArrayList<>();
// 收集活动管理的用户名
if (activityList != null) {
for (TrainingProjectListVo vo : activityList) {
if (vo.getCreatebyId() != null) {
userIds.add(vo.getCreatebyId());
}
}
}
// 收集考试列表的用户名
if (examList != null) {
for (MyExamVO vo : examList) {
if (vo.getCreateById() != null ) {
userIds.add(vo.getCreateById());
}
}
}
// 收集投票管理的用户名
if (voteList != null) {
for (ResearchVo vo : voteList) {
if (vo.getCreateById() != null ) {
userIds.add(vo.getCreateById());
}
}
}
// 收集投稿管理的用户名
if (articleList != null) {
for (PublicationVo vo : articleList) {
if (vo.getCreateById() != null) {
userIds.add(vo.getCreateById());
}
}
}
// 批量查询用户真实姓名
Map<Long, String> realNameMap = new HashMap<>();
if (!userIds.isEmpty()) {
try {
List<Account> accountList = accountClient.accountList(context.getCompanyId(),userIds);
if (accountList != null) {
for (Account account : accountList) {
if (account.getName() != null && account.getFullName() != null && !account.getFullName().trim().isEmpty()) {
realNameMap.put(account.getId(), account.getFullName());
}
}
}
} catch (Exception e) {
LOGGER.error("批量查询用户真实姓名失败", e);
}
}
// 1. 活动管理（4天内创建且已上架的数据）
List<ScrollPromptItemVO> activityItems = new ArrayList<>();
if (activityList != null) {
for (TrainingProjectListVo vo : activityList) {
String realName = realNameMap.getOrDefault(vo.getCreatebyId(), vo.getCreatebyName());
activityItems.add(new ScrollPromptItemVO(vo.getName(), realName, vo.getCreateTime()));
}
}
resultMap.put("activityManagement", activityItems);
// 2. 考试列表（4天内创建且已上架的数据）
List<ScrollPromptItemVO> examItems = new ArrayList<>();
if (examList != null) {
for (MyExamVO vo : examList) {
String realName = realNameMap.getOrDefault(vo.getCreateById(), vo.getCreateByName());
examItems.add(new ScrollPromptItemVO(vo.getName(), realName, vo.getCreateTime()));
}
}
resultMap.put("examList", examItems);
// 3. 投票管理（4天内创建且已上架的数据）
List<ScrollPromptItemVO> voteItems = new ArrayList<>();
if (voteList != null) {
for (ResearchVo vo : voteList) {
String realName = realNameMap.getOrDefault(vo.getCreateById(), vo.getCreateByName());
voteItems.add(new ScrollPromptItemVO(vo.getName(), realName, vo.getCreateTime()));
}
}
resultMap.put("voteManagement", voteItems);
// 4. 投稿管理（4天内创建且已上架的数据）
List<ScrollPromptItemVO> articleItems = new ArrayList<>();
if (articleList != null) {
for (PublicationVo vo : articleList) {
String realName = realNameMap.getOrDefault(vo.getCreateById(), vo.getAuthor());
articleItems.add(new ScrollPromptItemVO(vo.getFileName(), realName, vo.getCreateTime()));
}
}
resultMap.put("submissionManagement", articleItems);
// 5. 信箱管理（4天内创建且已上架的数据）
List<ScrollPromptItemVO> mailboxItems = new ArrayList<>();
if (mailboxList != null) {
for (SystemMailboxParamVo vo : mailboxList) {
mailboxItems.add(new ScrollPromptItemVO(vo.getFileName(), vo.getContactName(), vo.getSubmitTime()));
}
}
resultMap.put("mailboxManagement", mailboxItems);
// 6. 留言管理（4天内创建且已上架的数据）
List<ScrollPromptItemVO> messageItems = new ArrayList<>();
if (messageList != null) {
for (com.yizhi.training.application.vo.domain.LeaveWordVo vo : messageList) {
messageItems.add(new ScrollPromptItemVO(vo.getName(), vo.getFullName(), vo.getCreateTime()));
}
}
resultMap.put("messageManagement", messageItems);
return Response.ok(resultMap);
} catch (Exception e) {
LOGGER.error("获取滚动提示数据失败", e);
return Response.fail("500", "获取滚动提示数据失败");
}
}
/**
* 获取活动管理数据（4天内创建且已上架的数据）
* @param context
* @return
*/
private List<TrainingProjectListVo> getActivityManagementData(RequestContext context) {
try {
TrainingProjectMyParamVo paramVo = new TrainingProjectMyParamVo();
com.yizhi.training.application.model.BaseModel<TrainingProjectMyParamVo> model =
new com.yizhi.training.application.model.BaseModel<>();
model.setContext(context);
model.setDate(new Date());
model.setObj(paramVo);
// 使用新的接口方法获取4天内创建的活动管理数据
List<TrainingProjectListVo> response = trainingProjectClient.apiActivityManagementForScroll(model);
if (response != null ) {
return response;
}
return new ArrayList<>();
} catch (Exception e) {
LOGGER.error("获取活动管理数据失败", e);
return new ArrayList<>();
}
}
/**
* 获取考试列表数据（4天内创建且已上架的数据）
* @param context
* @return
*/
private List<MyExamVO> getExamListData(RequestContext context) {
try {
// 使用我的考试接口获取未完成的考试列表
MyExamParameterVO param = new MyExamParameterVO();
param.setSiteId(context.getSiteId());
param.setAccountId(context.getAccountId());
// 设置状态为未完成(进行中)的考试
param.setState(1);
List<Long> ids = context.getRelationIds();
if (null != ids) {
param.setIds(ids);
} else {
ids = new ArrayList<Long>();
ids.add(context.getAccountId());
param.setIds(ids);
}
List<MyExamVO> examData = myExamClient.getMyExamListFour(param);
if (examData != null ) {
return examData;
}
return new ArrayList<>();
} catch (Exception e) {
LOGGER.error("获取考试列表数据失败", e);
return new ArrayList<>();
}
}
/**
* 获取投票管理数据（4天内创建且已上架的数据）
* @param context
* @return
*/
private List<ResearchVo> getVoteManagementData(RequestContext context) {
try {
PageVo pageVo = new PageVo();
pageVo.setAccountId(context.getAccountId());
pageVo.setDate(new Date());
pageVo.setBizType(2); // 投票类型
pageVo.setState(1); // 已上架状态
com.yizhi.research.application.vo.BaseModel<PageVo> model = new com.yizhi.research.application.vo.BaseModel<>();
model.setContext(context);
model.setDate(new Date());
model.setObj(pageVo);
// 使用新的接口方法获取4天内创建的投票管理数据
List<ResearchVo> response = researchClient.apiVoteManagementForScroll(model);
if (response != null) {
return response;
}
return new ArrayList<>();
} catch (Exception e) {
LOGGER.error("获取投票管理数据失败", e);
return new ArrayList<>();
}
}
/**
* 获取投稿管理数据（待审核的数据）
* @param context
* @return
*/
private List<PublicationVo> getContributionManagementData(RequestContext context) {
try {
// 使用新的接口方法获取4天内创建的投稿管理数据
List<PublicationVo> response = publicationManageFeignClients.selectContributionManagementForScroll();
if (response != null) {
return response;
}
return new ArrayList<>();
} catch (Exception e) {
LOGGER.error("获取投稿管理数据失败", e);
return new ArrayList<>();
}
}
/**
* 获取信箱管理数据（未查看的信箱数据，需要考虑权限）
* @param context
* @return
*/
private List<SystemMailboxParamVo> getMailboxManagementData(RequestContext context) {
try {
// 检查用户是否有权限查看信箱
if (!hasMailboxPermission()) {
return new ArrayList<>();
}
List<SystemMailboxParamVo> dataList = systemMailboxClients.selectMailboxManagementForScroll();
return dataList != null ? dataList : new ArrayList<>();
} catch (Exception e) {
LOGGER.error("获取信箱管理数据失败", e);
return new ArrayList<>();
}
}
/**
* 获取留言管理数据（待接收的留言数据）
* @param context
* @return
*/
private List<com.yizhi.training.application.vo.domain.LeaveWordVo> getMessageManagementData(RequestContext context) {
try {
com.yizhi.training.application.vo.domain.LeaveWordParamVo paramVo = new com.yizhi.training.application.vo.domain.LeaveWordParamVo();
paramVo.setPageNo(1);
paramVo.setPageSize(Integer.MAX_VALUE);
paramVo.setState(1);
// 获取留言数据
Page<com.yizhi.training.application.vo.domain.LeaveWordVo> response = leaveWordClient.page(paramVo);
if (response != null && response.getRecords() != null) {
return response.getRecords();
}
return new ArrayList<>();
} catch (Exception e) {
LOGGER.error("获取留言管理数据失败", e);
return new ArrayList<>();
}
}
/**
* 获取工作任务数量
* @param context
* @return
......@@ -242,8 +586,15 @@ public class PromptStatisticsController {
param.setState(1);
param.setPageNo(1);
param.setPageSize(1); // 设置一个较大的数值以获取所有未完成的考试
MyExamPageVO examData = myExamClient.getMyExamList(param);
List<Long> ids = context.getRelationIds();
if (null != ids) {
param.setIds(ids);
} else {
ids = new ArrayList<Long>();
ids.add(context.getAccountId());
param.setIds(ids);
}
MyExamPageVO examData = myExamClient.getMyExamListNew(param);
// 返回未完成考试的数量
return examData != null ? examData.getPageTotal() : 0;
} catch (Exception e) {
......@@ -283,4 +634,5 @@ public class PromptStatisticsController {
return false;
}
}
}
\ No newline at end of file
cloud-web-manage/src/main/java/com/yizhi/application/vo/ScrollPromptItemVO.java 0 → 100644
package com.yizhi.application.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* 滚动提示数据统一返回VO
*/
@Data
@ApiModel(value = "滚动提示数据统一返回VO")
public class ScrollPromptItemVO {
@ApiModelProperty(value = "名称")
private String name;
@ApiModelProperty(value = "创建人")
private String createByName;
@ApiModelProperty(value = "创建时间")
private Date createTime;
public ScrollPromptItemVO() {}
public ScrollPromptItemVO(String name, String createByName, Date createTime) {
this.name = name;
this.createByName = createByName;
this.createTime = createTime;
}
}
\ No newline at end of file
cloud-web-student/src/main/java/com/yizhi/application/promptStatistics/PromptStatisticsController.java
......@@ -252,7 +252,7 @@ public class PromptStatisticsController {
param.setPageNo(1);
param.setPageSize(1); // 设置一个较大的数值以获取所有未完成的考试
MyExamPageVO examData = myExamClient.getMyExamList(param);
MyExamPageVO examData = myExamClient.getMyExamListNew(param);
// 返回未完成考试的数量
return examData != null ? examData.getPageTotal() : 0;
} catch (Exception e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment