org.jeecg.modules.system.entity.SysAnnouncement Java Examples

/**
  *  编辑
 * @param sysAnnouncement
 * @return
 */
@RequestMapping(value = "/edit", method = RequestMethod.PUT)
public Result<SysAnnouncement> eidt(@RequestBody SysAnnouncement sysAnnouncement) {
	Result<SysAnnouncement> result = new Result<SysAnnouncement>();
	SysAnnouncement sysAnnouncementEntity = sysAnnouncementService.getById(sysAnnouncement.getId());
	if(sysAnnouncementEntity==null) {
		result.error500("未找到对应实体");
	}else {
		boolean ok = sysAnnouncementService.upDateAnnouncement(sysAnnouncement);
		//TODO 返回false说明什么？
		if(ok) {
			result.success("修改成功!");
		}
	}

	return result;
}
 

/**
 * 导出excel
 *
 * @param request
 */
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(SysAnnouncement sysAnnouncement,HttpServletRequest request) {
    // Step.1 组装查询条件
    QueryWrapper<SysAnnouncement> queryWrapper = QueryGenerator.initQueryWrapper(sysAnnouncement, request.getParameterMap());
    //Step.2 AutoPoi 导出Excel
    ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
    List<SysAnnouncement> pageList = sysAnnouncementService.list(queryWrapper);
    //导出文件名称
    mv.addObject(NormalExcelConstants.FILE_NAME, "系统通告列表");
    mv.addObject(NormalExcelConstants.CLASS, SysAnnouncement.class);
    LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
    mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("系统通告列表数据", "导出人:"+user.getRealname(), "导出信息"));
    mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
    return mv;
}
 

/**
 * 导出excel
 *
 * @param request
 */
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(SysAnnouncement sysAnnouncement,HttpServletRequest request) {
    // Step.1 组装查询条件
    QueryWrapper<SysAnnouncement> queryWrapper = QueryGenerator.initQueryWrapper(sysAnnouncement, request.getParameterMap());
    //Step.2 AutoPoi 导出Excel
    ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
    List<SysAnnouncement> pageList = sysAnnouncementService.list(queryWrapper);
    //导出文件名称
    mv.addObject(NormalExcelConstants.FILE_NAME, "系统通告列表");
    mv.addObject(NormalExcelConstants.CLASS, SysAnnouncement.class);
    LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
    mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("系统通告列表数据", "导出人:"+user.getRealname(), "导出信息"));
    mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
    return mv;
}
 

@Transactional
@Override
public void saveAnnouncement(SysAnnouncement sysAnnouncement) {
	if(sysAnnouncement.getMsgType().equals(CommonConstant.MSG_TYPE_ALL)) {
		sysAnnouncementMapper.insert(sysAnnouncement);
	}else {
		// 1.插入通告表记录
		sysAnnouncementMapper.insert(sysAnnouncement);
		// 2.插入用户通告阅读标记表记录
		String userId = sysAnnouncement.getUserIds();
		String[] userIds = userId.substring(0, (userId.length()-1)).split(",");
		String anntId = sysAnnouncement.getId();
		Date refDate = new Date();
		for(int i=0;i<userIds.length;i++) {
			SysAnnouncementSend announcementSend = new SysAnnouncementSend();
			announcementSend.setAnntId(anntId);
			announcementSend.setUserId(userIds[i]);
			announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG);
			announcementSend.setReadTime(refDate);
			sysAnnouncementSendMapper.insert(announcementSend);
		}
	}
}
 

/**
 *	 更新撤销操作
 * @param id
 * @return
 */
@RequestMapping(value = "/doReovkeData", method = RequestMethod.GET)
public Result<SysAnnouncement> doReovkeData(@RequestParam(name="id",required=true) String id, HttpServletRequest request) {
	Result<SysAnnouncement> result = new Result<SysAnnouncement>();
	SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
	if(sysAnnouncement==null) {
		result.error500("未找到对应实体");
	}else {
		sysAnnouncement.setSendStatus(CommonSendStatus.REVOKE_STATUS_2);//撤销发布
		sysAnnouncement.setCancelTime(new Date());
		boolean ok = sysAnnouncementService.updateById(sysAnnouncement);
		if(ok) {
			result.success("该系统通知撤销成功");
		}
	}

	return result;
}
 

/**
  *  批量删除
 * @param ids
 * @return
 */
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
public Result<SysAnnouncement> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
	Result<SysAnnouncement> result = new Result<SysAnnouncement>();
	if(ids==null || "".equals(ids.trim())) {
		result.error500("参数不识别！");
	}else {
		String[] id = ids.split(",");
		for(int i=0;i<id.length;i++) {
			SysAnnouncement announcement = sysAnnouncementService.getById(id[i]);
			announcement.setDelFlag(CommonConstant.DEL_FLAG_1.toString());
			sysAnnouncementService.updateById(announcement);
		}
		result.success("删除成功!");
	}
	return result;
}
 

/**
  *   通过id删除
 * @param id
 * @return
 */
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
public Result<SysAnnouncement> delete(@RequestParam(name="id",required=true) String id) {
	Result<SysAnnouncement> result = new Result<SysAnnouncement>();
	SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
	if(sysAnnouncement==null) {
		result.error500("未找到对应实体");
	}else {
		sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_1.toString());
		boolean ok = sysAnnouncementService.updateById(sysAnnouncement);
		if(ok) {
			result.success("删除成功!");
		}
	}

	return result;
}
 

/**
  *  编辑
 * @param sysAnnouncement
 * @return
 */
@RequestMapping(value = "/edit", method = RequestMethod.PUT)
public Result<SysAnnouncement> eidt(@RequestBody SysAnnouncement sysAnnouncement) {
	Result<SysAnnouncement> result = new Result<SysAnnouncement>();
	SysAnnouncement sysAnnouncementEntity = sysAnnouncementService.getById(sysAnnouncement.getId());
	if(sysAnnouncementEntity==null) {
		result.error500("未找到对应实体");
	}else {
		boolean ok = sysAnnouncementService.upDateAnnouncement(sysAnnouncement);
		//TODO 返回false说明什么？
		if(ok) {
			result.success("修改成功!");
		}
	}

	return result;
}
 

/**
 *	 更新撤销操作
 * @param id
 * @return
 */
@RequestMapping(value = "/doReovkeData", method = RequestMethod.GET)
public Result<SysAnnouncement> doReovkeData(@RequestParam(name="id",required=true) String id, HttpServletRequest request) {
	Result<SysAnnouncement> result = new Result<SysAnnouncement>();
	SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
	if(sysAnnouncement==null) {
		result.error500("未找到对应实体");
	}else {
		sysAnnouncement.setSendStatus(CommonSendStatus.REVOKE_STATUS_2);//撤销发布
		sysAnnouncement.setCancelTime(new Date());
		boolean ok = sysAnnouncementService.updateById(sysAnnouncement);
		if(ok) {
			result.success("该系统通知撤销成功");
		}
	}

	return result;
}
 

@Transactional
@Override
public void saveAnnouncement(SysAnnouncement sysAnnouncement) {
	if(sysAnnouncement.getMsgType().equals(CommonConstant.MSG_TYPE_ALL)) {
		sysAnnouncementMapper.insert(sysAnnouncement);
	}else {
		// 1.插入通告表记录
		sysAnnouncementMapper.insert(sysAnnouncement);
		// 2.插入用户通告阅读标记表记录
		String userId = sysAnnouncement.getUserIds();
		String[] userIds = userId.substring(0, (userId.length()-1)).split(",");
		String anntId = sysAnnouncement.getId();
		Date refDate = new Date();
		for(int i=0;i<userIds.length;i++) {
			SysAnnouncementSend announcementSend = new SysAnnouncementSend();
			announcementSend.setAnntId(anntId);
			announcementSend.setUserId(userIds[i]);
			announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG);
			announcementSend.setReadTime(refDate);
			sysAnnouncementSendMapper.insert(announcementSend);
		}
	}
}
 

/**
  *  编辑
 * @param sysAnnouncement
 * @return
 */
@RequestMapping(value = "/edit", method = RequestMethod.PUT)
public Result<SysAnnouncement> eidt(@RequestBody SysAnnouncement sysAnnouncement) {
	Result<SysAnnouncement> result = new Result<SysAnnouncement>();
	SysAnnouncement sysAnnouncementEntity = sysAnnouncementService.getById(sysAnnouncement.getId());
	if(sysAnnouncementEntity==null) {
		result.error500("未找到对应实体");
	}else {
		boolean ok = sysAnnouncementService.upDateAnnouncement(sysAnnouncement);
		//TODO 返回false说明什么？
		if(ok) {
			result.success("修改成功!");
		}
	}

	return result;
}
 

/**
  *   通过id删除
 * @param id
 * @return
 */
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
public Result<SysAnnouncement> delete(@RequestParam(name="id",required=true) String id) {
	Result<SysAnnouncement> result = new Result<SysAnnouncement>();
	SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
	if(sysAnnouncement==null) {
		result.error500("未找到对应实体");
	}else {
		sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_1.toString());
		boolean ok = sysAnnouncementService.updateById(sysAnnouncement);
		if(ok) {
			result.success("删除成功!");
		}
	}

	return result;
}
 

/**
  *  批量删除
 * @param ids
 * @return
 */
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
public Result<SysAnnouncement> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
	Result<SysAnnouncement> result = new Result<SysAnnouncement>();
	if(ids==null || "".equals(ids.trim())) {
		result.error500("参数不识别！");
	}else {
		String[] id = ids.split(",");
		for(int i=0;i<id.length;i++) {
			SysAnnouncement announcement = sysAnnouncementService.getById(id[i]);
			announcement.setDelFlag(CommonConstant.DEL_FLAG_1.toString());
			sysAnnouncementService.updateById(announcement);
		}
		result.success("删除成功!");
	}
	return result;
}
 

@Transactional
@Override
public void saveAnnouncement(SysAnnouncement sysAnnouncement) {
	if(sysAnnouncement.getMsgType().equals(CommonConstant.MSG_TYPE_ALL)) {
		sysAnnouncementMapper.insert(sysAnnouncement);
	}else {
		// 1.插入通告表记录
		sysAnnouncementMapper.insert(sysAnnouncement);
		// 2.插入用户通告阅读标记表记录
		String userId = sysAnnouncement.getUserIds();
		String[] userIds = userId.substring(0, (userId.length()-1)).split(",");
		String anntId = sysAnnouncement.getId();
		Date refDate = new Date();
		for(int i=0;i<userIds.length;i++) {
			SysAnnouncementSend announcementSend = new SysAnnouncementSend();
			announcementSend.setAnntId(anntId);
			announcementSend.setUserId(userIds[i]);
			announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG);
			announcementSend.setReadTime(refDate);
			sysAnnouncementSendMapper.insert(announcementSend);
		}
	}
}
 

/**
 *	 更新撤销操作
 * @param id
 * @return
 */
@RequestMapping(value = "/doReovkeData", method = RequestMethod.GET)
public Result<SysAnnouncement> doReovkeData(@RequestParam(name="id",required=true) String id, HttpServletRequest request) {
	Result<SysAnnouncement> result = new Result<SysAnnouncement>();
	SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
	if(sysAnnouncement==null) {
		result.error500("未找到对应实体");
	}else {
		sysAnnouncement.setSendStatus(CommonSendStatus.REVOKE_STATUS_2);//撤销发布
		sysAnnouncement.setCancelTime(new Date());
		boolean ok = sysAnnouncementService.updateById(sysAnnouncement);
		if(ok) {
			result.success("该系统通知撤销成功");
		}
	}

	return result;
}
 

/**
  *  批量删除
 * @param ids
 * @return
 */
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
public Result<SysAnnouncement> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
	Result<SysAnnouncement> result = new Result<SysAnnouncement>();
	if(ids==null || "".equals(ids.trim())) {
		result.error500("参数不识别！");
	}else {
		String[] id = ids.split(",");
		for(int i=0;i<id.length;i++) {
			SysAnnouncement announcement = sysAnnouncementService.getById(id[i]);
			announcement.setDelFlag(CommonConstant.DEL_FLAG_1.toString());
			sysAnnouncementService.updateById(announcement);
		}
		result.success("删除成功!");
	}
	return result;
}
 

/**
 * 导出excel
 *
 * @param request
 */
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(SysAnnouncement sysAnnouncement,HttpServletRequest request) {
    // Step.1 组装查询条件
    QueryWrapper<SysAnnouncement> queryWrapper = QueryGenerator.initQueryWrapper(sysAnnouncement, request.getParameterMap());
    //Step.2 AutoPoi 导出Excel
    ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
    List<SysAnnouncement> pageList = sysAnnouncementService.list(queryWrapper);
    //导出文件名称
    mv.addObject(NormalExcelConstants.FILE_NAME, "系统通告列表");
    mv.addObject(NormalExcelConstants.CLASS, SysAnnouncement.class);
    LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
    mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("系统通告列表数据", "导出人:"+user.getRealname(), "导出信息"));
    mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
    return mv;
}
 

/**
 * 导出excel
 *
 * @param request
 */
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(SysAnnouncement sysAnnouncement,HttpServletRequest request) {
    // Step.1 组装查询条件
    QueryWrapper<SysAnnouncement> queryWrapper = QueryGenerator.initQueryWrapper(sysAnnouncement, request.getParameterMap());
    //Step.2 AutoPoi 导出Excel
    ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
    List<SysAnnouncement> pageList = sysAnnouncementService.list(queryWrapper);
    //导出文件名称
    mv.addObject(NormalExcelConstants.FILE_NAME, "系统通告列表");
    mv.addObject(NormalExcelConstants.CLASS, SysAnnouncement.class);
    LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
    mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("系统通告列表数据", "导出人:"+user.getRealname(), "导出信息"));
    mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
    return mv;
}
 

/**
  *   通过id删除
 * @param id
 * @return
 */
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
public Result<SysAnnouncement> delete(@RequestParam(name="id",required=true) String id) {
	Result<SysAnnouncement> result = new Result<SysAnnouncement>();
	SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
	if(sysAnnouncement==null) {
		result.error500("未找到对应实体");
	}else {
		sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_1.toString());
		boolean ok = sysAnnouncementService.updateById(sysAnnouncement);
		if(ok) {
			result.success("删除成功!");
		}
	}

	return result;
}
 

/**
 *	 更新撤销操作
 * @param id
 * @return
 */
@RequestMapping(value = "/doReovkeData", method = RequestMethod.GET)
public Result<SysAnnouncement> doReovkeData(@RequestParam(name="id",required=true) String id, HttpServletRequest request) {
	Result<SysAnnouncement> result = new Result<SysAnnouncement>();
	SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
	if(sysAnnouncement==null) {
		result.error500("未找到对应实体");
	}else {
		sysAnnouncement.setSendStatus(CommonSendStatus.REVOKE_STATUS_2);//撤销发布
		sysAnnouncement.setCancelTime(new Date());
		boolean ok = sysAnnouncementService.updateById(sysAnnouncement);
		if(ok) {
			result.success("该系统通知撤销成功");
		}
	}

	return result;
}
 

@Transactional
@Override
public void saveAnnouncement(SysAnnouncement sysAnnouncement) {
	if(sysAnnouncement.getMsgType().equals(CommonConstant.MSG_TYPE_ALL)) {
		sysAnnouncementMapper.insert(sysAnnouncement);
	}else {
		// 1.插入通告表记录
		sysAnnouncementMapper.insert(sysAnnouncement);
		// 2.插入用户通告阅读标记表记录
		String userId = sysAnnouncement.getUserIds();
		String[] userIds = userId.substring(0, (userId.length()-1)).split(",");
		String anntId = sysAnnouncement.getId();
		Date refDate = new Date();
		for(int i=0;i<userIds.length;i++) {
			SysAnnouncementSend announcementSend = new SysAnnouncementSend();
			announcementSend.setAnntId(anntId);
			announcementSend.setUserId(userIds[i]);
			announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG);
			announcementSend.setReadTime(refDate);
			sysAnnouncementSendMapper.insert(announcementSend);
		}
	}
}
 

/**
  *  批量删除
 * @param ids
 * @return
 */
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
public Result<SysAnnouncement> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
	Result<SysAnnouncement> result = new Result<SysAnnouncement>();
	if(ids==null || "".equals(ids.trim())) {
		result.error500("参数不识别！");
	}else {
		String[] id = ids.split(",");
		for(int i=0;i<id.length;i++) {
			SysAnnouncement announcement = sysAnnouncementService.getById(id[i]);
			announcement.setDelFlag(CommonConstant.DEL_FLAG_1.toString());
			sysAnnouncementService.updateById(announcement);
		}
		result.success("删除成功!");
	}
	return result;
}
 

/**
  *   通过id删除
 * @param id
 * @return
 */
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
public Result<SysAnnouncement> delete(@RequestParam(name="id",required=true) String id) {
	Result<SysAnnouncement> result = new Result<SysAnnouncement>();
	SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
	if(sysAnnouncement==null) {
		result.error500("未找到对应实体");
	}else {
		sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_1.toString());
		boolean ok = sysAnnouncementService.updateById(sysAnnouncement);
		if(ok) {
			result.success("删除成功!");
		}
	}

	return result;
}
 

/**
  *  编辑
 * @param sysAnnouncement
 * @return
 */
@RequestMapping(value = "/edit", method = RequestMethod.PUT)
public Result<SysAnnouncement> eidt(@RequestBody SysAnnouncement sysAnnouncement) {
	Result<SysAnnouncement> result = new Result<SysAnnouncement>();
	SysAnnouncement sysAnnouncementEntity = sysAnnouncementService.getById(sysAnnouncement.getId());
	if(sysAnnouncementEntity==null) {
		result.error500("未找到对应实体");
	}else {
		boolean ok = sysAnnouncementService.upDateAnnouncement(sysAnnouncement);
		//TODO 返回false说明什么？
		if(ok) {
			result.success("修改成功!");
		}
	}

	return result;
}
 

/**
  * 通过id查询
 * @param id
 * @return
 */
@RequestMapping(value = "/queryById", method = RequestMethod.GET)
public Result<SysAnnouncement> queryById(@RequestParam(name="id",required=true) String id) {
	Result<SysAnnouncement> result = new Result<SysAnnouncement>();
	SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
	if(sysAnnouncement==null) {
		result.error500("未找到对应实体");
	}else {
		result.setResult(sysAnnouncement);
		result.setSuccess(true);
	}
	return result;
}
 

/**
 * @功能：补充用户数据，并返回系统消息
 * @return
 */
@RequestMapping(value = "/listByUser", method = RequestMethod.GET)
public Result<Map<String,Object>> listByUser() {
	Result<Map<String,Object>> result = new Result<Map<String,Object>>();
	LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
	String userId = sysUser.getId();
	// 1.将系统消息补充到用户通告阅读标记表中
	Collection<String> anntIds = sysAnnouncementSendService.queryByUserId(userId);
	LambdaQueryWrapper<SysAnnouncement> querySaWrapper = new LambdaQueryWrapper<SysAnnouncement>();
	querySaWrapper.eq(SysAnnouncement::getMsgType,CommonConstant.MSG_TYPE_ALL); // 全部人员
	querySaWrapper.eq(SysAnnouncement::getDelFlag,CommonConstant.DEL_FLAG_0.toString());  // 未删除
	querySaWrapper.eq(SysAnnouncement::getSendStatus, CommonConstant.HAS_SEND); //已发布
	querySaWrapper.ge(SysAnnouncement::getEndTime, sysUser.getCreateTime()); //新注册用户不看结束通知
	if(anntIds!=null&&anntIds.size()>0) {
		querySaWrapper.notIn(SysAnnouncement::getId, anntIds);
	}
	List<SysAnnouncement> announcements = sysAnnouncementService.list(querySaWrapper);
	if(announcements.size()>0) {
		for(int i=0;i<announcements.size();i++) {
			SysAnnouncementSend announcementSend = new SysAnnouncementSend();
			announcementSend.setAnntId(announcements.get(i).getId());
			announcementSend.setUserId(userId);
			announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG);
			sysAnnouncementSendService.save(announcementSend);
		}
	}
	// 2.查询用户未读的系统消息
	Page<SysAnnouncement> anntMsgList = new Page<SysAnnouncement>(0,5);
	anntMsgList = sysAnnouncementService.querySysCementPageByUserId(anntMsgList,userId,"1");//通知公告消息
	Page<SysAnnouncement> sysMsgList = new Page<SysAnnouncement>(0,5);
	sysMsgList = sysAnnouncementService.querySysCementPageByUserId(sysMsgList,userId,"2");//系统消息
	Map<String,Object> sysMsgMap = new HashMap<String, Object>();
	sysMsgMap.put("sysMsgList", sysMsgList.getRecords());
	sysMsgMap.put("sysMsgTotal", sysMsgList.getTotal());
	sysMsgMap.put("anntMsgList", anntMsgList.getRecords());
	sysMsgMap.put("anntMsgTotal", anntMsgList.getTotal());
	result.setSuccess(true);
	result.setResult(sysMsgMap);
	return result;
}
 

/**
 *同步消息
 * @param anntId
 * @return
 */
@RequestMapping(value = "/syncNotic", method = RequestMethod.GET)
public Result<SysAnnouncement> syncNotic(@RequestParam(name="anntId",required=false) String anntId, HttpServletRequest request) {
	Result<SysAnnouncement> result = new Result<SysAnnouncement>();
	JSONObject obj = new JSONObject();
	if(StringUtils.isNotBlank(anntId)){
		SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(anntId);
		if(sysAnnouncement==null) {
			result.error500("未找到对应实体");
		}else {
			if(sysAnnouncement.getMsgType().equals(CommonConstant.MSG_TYPE_ALL)) {
				obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC);
				obj.put(WebsocketConst.MSG_ID, sysAnnouncement.getId());
				obj.put(WebsocketConst.MSG_TXT, sysAnnouncement.getTitile());
				webSocket.sendAllMessage(obj.toJSONString());
			}else {
				// 2.插入用户通告阅读标记表记录
				String userId = sysAnnouncement.getUserIds();
				if(oConvertUtils.isNotEmpty(userId)){
					String[] userIds = userId.substring(0, (userId.length()-1)).split(",");
					obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_USER);
					obj.put(WebsocketConst.MSG_ID, sysAnnouncement.getId());
					obj.put(WebsocketConst.MSG_TXT, sysAnnouncement.getTitile());
					webSocket.sendMoreMessage(userIds, obj.toJSONString());
				}
			}
		}
	}else{
		obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC);
		obj.put(WebsocketConst.MSG_TXT, "批量设置已读");
		webSocket.sendAllMessage(obj.toJSONString());
	}
	return result;
}
 

/**
  *   添加
 * @param sysAnnouncement
 * @return
 */
@RequestMapping(value = "/add", method = RequestMethod.POST)
public Result<SysAnnouncement> add(@RequestBody SysAnnouncement sysAnnouncement) {
	Result<SysAnnouncement> result = new Result<SysAnnouncement>();
	try {
		sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
		sysAnnouncement.setSendStatus(CommonSendStatus.UNPUBLISHED_STATUS_0);//未发布
		sysAnnouncementService.saveAnnouncement(sysAnnouncement);
		result.success("添加成功！");
	} catch (Exception e) {
		log.error(e.getMessage(),e);
		result.error500("操作失败");
	}
	return result;
}
 

/**
 * @功能：补充用户数据，并返回系统消息
 * @param id
 * @return
 */
@RequestMapping(value = "/listByUser", method = RequestMethod.GET)
public Result<Map<String,Object>> listByUser() {
	Result<Map<String,Object>> result = new Result<Map<String,Object>>();
	LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
	String userId = sysUser.getId();
	// 1.将系统消息补充到用户通告阅读标记表中
	Collection<String> anntIds = sysAnnouncementSendService.queryByUserId(userId);
	LambdaQueryWrapper<SysAnnouncement> querySaWrapper = new LambdaQueryWrapper<SysAnnouncement>();
	querySaWrapper.eq(SysAnnouncement::getMsgType,CommonConstant.MSG_TYPE_ALL); // 全部人员
	querySaWrapper.eq(SysAnnouncement::getDelFlag,CommonConstant.DEL_FLAG_0.toString());  // 未删除
	querySaWrapper.eq(SysAnnouncement::getSendStatus, CommonConstant.HAS_SEND); //已发布
	querySaWrapper.ge(SysAnnouncement::getEndTime, sysUser.getCreateTime()); //新注册用户不看结束通知
	if(anntIds!=null&&anntIds.size()>0) {
		querySaWrapper.notIn(SysAnnouncement::getId, anntIds);
	}
	List<SysAnnouncement> announcements = sysAnnouncementService.list(querySaWrapper);
	if(announcements.size()>0) {
		for(int i=0;i<announcements.size();i++) {
			SysAnnouncementSend announcementSend = new SysAnnouncementSend();
			announcementSend.setAnntId(announcements.get(i).getId());
			announcementSend.setUserId(userId);
			announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG);
			sysAnnouncementSendService.save(announcementSend);
		}
	}
	// 2.查询用户未读的系统消息
	Page<SysAnnouncement> anntMsgList = new Page<SysAnnouncement>(0,5);
	anntMsgList = sysAnnouncementService.querySysCementPageByUserId(anntMsgList,userId,"1");//通知公告消息
	Page<SysAnnouncement> sysMsgList = new Page<SysAnnouncement>(0,5);
	sysMsgList = sysAnnouncementService.querySysCementPageByUserId(sysMsgList,userId,"2");//系统消息
	Map<String,Object> sysMsgMap = new HashMap<String, Object>();
	sysMsgMap.put("sysMsgList", sysMsgList.getRecords());
	sysMsgMap.put("sysMsgTotal", sysMsgList.getTotal());
	sysMsgMap.put("anntMsgList", anntMsgList.getRecords());
	sysMsgMap.put("anntMsgTotal", anntMsgList.getTotal());
	result.setSuccess(true);
	result.setResult(sysMsgMap);
	return result;
}
 

/**
  * 通过id查询
 * @param id
 * @return
 */
@RequestMapping(value = "/queryById", method = RequestMethod.GET)
public Result<SysAnnouncement> queryById(@RequestParam(name="id",required=true) String id) {
	Result<SysAnnouncement> result = new Result<SysAnnouncement>();
	SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
	if(sysAnnouncement==null) {
		result.error500("未找到对应实体");
	}else {
		result.setResult(sysAnnouncement);
		result.setSuccess(true);
	}
	return result;
}