消息修改
This commit is contained in:
+11
@@ -11,6 +11,8 @@ import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.jero.common.system.api.ISysBaseAPI;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import com.jero.common.api.vo.Result;
|
||||
@@ -67,6 +69,8 @@ public class SysAnnouncementController {
|
||||
private ISysAnnouncementSendService sysAnnouncementSendService;
|
||||
@Resource
|
||||
private WebSocket webSocket;
|
||||
@Autowired
|
||||
private ISysBaseAPI sysBaseAPI;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
@@ -313,6 +317,13 @@ public class SysAnnouncementController {
|
||||
anntMsgList = sysAnnouncementService.querySysCementPageByUserId(anntMsgList,userId,"1");//通知公告消息
|
||||
Page<SysAnnouncement> sysMsgList = new Page<SysAnnouncement>(0,5);
|
||||
sysMsgList = sysAnnouncementService.querySysCementPageByUserId(sysMsgList,userId,"2");//系统消息
|
||||
if(!CollectionUtils.isEmpty(sysMsgList.getRecords())){
|
||||
List<SysAnnouncement> list = sysMsgList.getRecords();
|
||||
list.forEach(p->{
|
||||
p.setTitile(sysBaseAPI.translateDict("notice_type",p.getTitile()));
|
||||
});
|
||||
sysMsgList.setRecords(list);
|
||||
}
|
||||
Map<String,Object> sysMsgMap = new HashMap<String, Object>();
|
||||
sysMsgMap.put("sysMsgList", sysMsgList.getRecords());
|
||||
sysMsgMap.put("sysMsgTotal", sysMsgList.getTotal());
|
||||
|
||||
Reference in New Issue
Block a user