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

/**
  *  编辑
 * @param sysAnnouncementSend
 * @return
 */
@PutMapping(value = "/edit")
public Result<SysAnnouncementSend> eidt(@RequestBody SysAnnouncementSend sysAnnouncementSend) {
	Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
	SysAnnouncementSend sysAnnouncementSendEntity = sysAnnouncementSendService.getById(sysAnnouncementSend.getId());
	if(sysAnnouncementSendEntity==null) {
		result.error500("未找到对应实体");
	}else {
		boolean ok = sysAnnouncementSendService.updateById(sysAnnouncementSend);
		//TODO 返回false说明什么？
		if(ok) {
			result.success("修改成功!");
		}
	}
	
	return result;
}
 

/**
 * @功能：更新用户系统消息阅读状态
 * @param json
 * @return
 */
@PutMapping(value = "/editByAnntIdAndUserId")
public Result<SysAnnouncementSend> editById(@RequestBody JSONObject json) {
	Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
	String anntId = json.getString("anntId");
	LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
	String userId = sysUser.getId();
	LambdaUpdateWrapper<SysAnnouncementSend> updateWrapper = new UpdateWrapper().lambda();
	updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG);
	updateWrapper.set(SysAnnouncementSend::getReadTime, new Date());
	updateWrapper.last("where annt_id ='"+anntId+"' and user_id ='"+userId+"'");
	SysAnnouncementSend announcementSend = new SysAnnouncementSend();
	sysAnnouncementSendService.update(announcementSend, updateWrapper);
	result.setSuccess(true);
	return result;
}
 

/**
  *   通过id删除
 * @param id
 * @return
 */
@DeleteMapping(value = "/delete")
public Result<SysAnnouncementSend> delete(@RequestParam(name="id",required=true) String id) {
	Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
	SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id);
	if(sysAnnouncementSend==null) {
		result.error500("未找到对应实体");
	}else {
		boolean ok = sysAnnouncementSendService.removeById(id);
		if(ok) {
			result.success("删除成功!");
		}
	}
	
	return result;
}
 

/**
  *  编辑
 * @param sysAnnouncementSend
 * @return
 */
@PutMapping(value = "/edit")
public Result<SysAnnouncementSend> eidt(@RequestBody SysAnnouncementSend sysAnnouncementSend) {
	Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
	SysAnnouncementSend sysAnnouncementSendEntity = sysAnnouncementSendService.getById(sysAnnouncementSend.getId());
	if(sysAnnouncementSendEntity==null) {
		result.error500("未找到对应实体");
	}else {
		boolean ok = sysAnnouncementSendService.updateById(sysAnnouncementSend);
		//TODO 返回false说明什么？
		if(ok) {
			result.success("修改成功!");
		}
	}
	
	return result;
}
 

/**
 * @功能：一键已读
 * @return
 */
@PutMapping(value = "/readAll")
public Result<SysAnnouncementSend> readAll() {
	Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
	LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
	String userId = sysUser.getId();
	LambdaUpdateWrapper<SysAnnouncementSend> updateWrapper = new UpdateWrapper().lambda();
	updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG);
	updateWrapper.set(SysAnnouncementSend::getReadTime, new Date());
	updateWrapper.last("where user_id ='"+userId+"'");
	SysAnnouncementSend announcementSend = new SysAnnouncementSend();
	sysAnnouncementSendService.update(announcementSend, updateWrapper);
	result.setSuccess(true);
	result.setMessage("全部已读");
	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);
		}
	}
}
 

@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);
		}
	}
}
 

/**
 * @功能：一键已读
 * @return
 */
@PutMapping(value = "/readAll")
public Result<SysAnnouncementSend> readAll() {
	Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
	LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
	String userId = sysUser.getId();
	LambdaUpdateWrapper<SysAnnouncementSend> updateWrapper = new UpdateWrapper().lambda();
	updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG);
	updateWrapper.set(SysAnnouncementSend::getReadTime, new Date());
	updateWrapper.last("where user_id ='"+userId+"'");
	SysAnnouncementSend announcementSend = new SysAnnouncementSend();
	sysAnnouncementSendService.update(announcementSend, updateWrapper);
	result.setSuccess(true);
	result.setMessage("全部已读");
	return result;
}
 

/**
 * @功能：更新用户系统消息阅读状态
 * @param json
 * @return
 */
@PutMapping(value = "/editByAnntIdAndUserId")
public Result<SysAnnouncementSend> editById(@RequestBody JSONObject json) {
	Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
	String anntId = json.getString("anntId");
	LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
	String userId = sysUser.getId();
	LambdaUpdateWrapper<SysAnnouncementSend> updateWrapper = new UpdateWrapper().lambda();
	updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG);
	updateWrapper.set(SysAnnouncementSend::getReadTime, new Date());
	updateWrapper.last("where annt_id ='"+anntId+"' and user_id ='"+userId+"'");
	SysAnnouncementSend announcementSend = new SysAnnouncementSend();
	sysAnnouncementSendService.update(announcementSend, updateWrapper);
	result.setSuccess(true);
	return result;
}
 

/**
  *   通过id删除
 * @param id
 * @return
 */
@DeleteMapping(value = "/delete")
public Result<SysAnnouncementSend> delete(@RequestParam(name="id",required=true) String id) {
	Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
	SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id);
	if(sysAnnouncementSend==null) {
		result.error500("未找到对应实体");
	}else {
		boolean ok = sysAnnouncementSendService.removeById(id);
		if(ok) {
			result.success("删除成功!");
		}
	}
	
	return result;
}
 

/**
  *  编辑
 * @param sysAnnouncementSend
 * @return
 */
@PutMapping(value = "/edit")
public Result<SysAnnouncementSend> eidt(@RequestBody SysAnnouncementSend sysAnnouncementSend) {
	Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
	SysAnnouncementSend sysAnnouncementSendEntity = sysAnnouncementSendService.getById(sysAnnouncementSend.getId());
	if(sysAnnouncementSendEntity==null) {
		result.error500("未找到对应实体");
	}else {
		boolean ok = sysAnnouncementSendService.updateById(sysAnnouncementSend);
		//TODO 返回false说明什么？
		if(ok) {
			result.success("修改成功!");
		}
	}
	
	return result;
}
 

/**
  *   通过id删除
 * @param id
 * @return
 */
@DeleteMapping(value = "/delete")
public Result<SysAnnouncementSend> delete(@RequestParam(name="id",required=true) String id) {
	Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
	SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id);
	if(sysAnnouncementSend==null) {
		result.error500("未找到对应实体");
	}else {
		boolean ok = sysAnnouncementSendService.removeById(id);
		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);
		}
	}
}
 

/**
 * @功能：一键已读
 * @return
 */
@PutMapping(value = "/readAll")
public Result<SysAnnouncementSend> readAll() {
	Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
	LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
	String userId = sysUser.getId();
	LambdaUpdateWrapper<SysAnnouncementSend> updateWrapper = new UpdateWrapper().lambda();
	updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG);
	updateWrapper.set(SysAnnouncementSend::getReadTime, new Date());
	updateWrapper.last("where user_id ='"+userId+"'");
	SysAnnouncementSend announcementSend = new SysAnnouncementSend();
	sysAnnouncementSendService.update(announcementSend, updateWrapper);
	result.setSuccess(true);
	result.setMessage("全部已读");
	return result;
}
 

/**
 * @功能：更新用户系统消息阅读状态
 * @param json
 * @return
 */
@PutMapping(value = "/editByAnntIdAndUserId")
public Result<SysAnnouncementSend> editById(@RequestBody JSONObject json) {
	Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
	String anntId = json.getString("anntId");
	LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
	String userId = sysUser.getId();
	LambdaUpdateWrapper<SysAnnouncementSend> updateWrapper = new UpdateWrapper().lambda();
	updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG);
	updateWrapper.set(SysAnnouncementSend::getReadTime, new Date());
	updateWrapper.last("where annt_id ='"+anntId+"' and user_id ='"+userId+"'");
	SysAnnouncementSend announcementSend = new SysAnnouncementSend();
	sysAnnouncementSendService.update(announcementSend, updateWrapper);
	result.setSuccess(true);
	return result;
}
 

/**
 * @功能：更新用户系统消息阅读状态
 * @param json
 * @return
 */
@PutMapping(value = "/editByAnntIdAndUserId")
public Result<SysAnnouncementSend> editById(@RequestBody JSONObject json) {
	Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
	String anntId = json.getString("anntId");
	LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
	String userId = sysUser.getId();
	LambdaUpdateWrapper<SysAnnouncementSend> updateWrapper = new UpdateWrapper().lambda();
	updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG);
	updateWrapper.set(SysAnnouncementSend::getReadTime, new Date());
	updateWrapper.last("where annt_id ='"+anntId+"' and user_id ='"+userId+"'");
	SysAnnouncementSend announcementSend = new SysAnnouncementSend();
	sysAnnouncementSendService.update(announcementSend, updateWrapper);
	result.setSuccess(true);
	return result;
}
 

/**
  *   通过id删除
 * @param id
 * @return
 */
@DeleteMapping(value = "/delete")
public Result<SysAnnouncementSend> delete(@RequestParam(name="id",required=true) String id) {
	Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
	SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id);
	if(sysAnnouncementSend==null) {
		result.error500("未找到对应实体");
	}else {
		boolean ok = sysAnnouncementSendService.removeById(id);
		if(ok) {
			result.success("删除成功!");
		}
	}
	
	return result;
}
 

/**
  *  编辑
 * @param sysAnnouncementSend
 * @return
 */
@PutMapping(value = "/edit")
public Result<SysAnnouncementSend> eidt(@RequestBody SysAnnouncementSend sysAnnouncementSend) {
	Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
	SysAnnouncementSend sysAnnouncementSendEntity = sysAnnouncementSendService.getById(sysAnnouncementSend.getId());
	if(sysAnnouncementSendEntity==null) {
		result.error500("未找到对应实体");
	}else {
		boolean ok = sysAnnouncementSendService.updateById(sysAnnouncementSend);
		//TODO 返回false说明什么？
		if(ok) {
			result.success("修改成功!");
		}
	}
	
	return result;
}
 

/**
 * @功能：一键已读
 * @return
 */
@PutMapping(value = "/readAll")
public Result<SysAnnouncementSend> readAll() {
	Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
	LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
	String userId = sysUser.getId();
	LambdaUpdateWrapper<SysAnnouncementSend> updateWrapper = new UpdateWrapper().lambda();
	updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG);
	updateWrapper.set(SysAnnouncementSend::getReadTime, new Date());
	updateWrapper.last("where user_id ='"+userId+"'");
	SysAnnouncementSend announcementSend = new SysAnnouncementSend();
	sysAnnouncementSendService.update(announcementSend, updateWrapper);
	result.setSuccess(true);
	result.setMessage("全部已读");
	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
 */
@DeleteMapping(value = "/deleteBatch")
public Result<SysAnnouncementSend> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
	Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
	if(ids==null || "".equals(ids.trim())) {
		result.error500("参数不识别！");
	}else {
		this.sysAnnouncementSendService.removeByIds(Arrays.asList(ids.split(",")));
		result.success("删除成功!");
	}
	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;
}
 

/**
  *   添加
 * @param sysAnnouncementSend
 * @return
 */
@PostMapping(value = "/add")
public Result<SysAnnouncementSend> add(@RequestBody SysAnnouncementSend sysAnnouncementSend) {
	Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
	try {
		sysAnnouncementSendService.save(sysAnnouncementSend);
		result.success("添加成功！");
	} catch (Exception e) {
		log.error(e.getMessage(),e);
		result.error500("操作失败");
	}
	return result;
}
 

/**
  * 分页列表查询
 * @param sysAnnouncementSend
 * @param pageNo
 * @param pageSize
 * @param req
 * @return
 */
@GetMapping(value = "/list")
public Result<IPage<SysAnnouncementSend>> queryPageList(SysAnnouncementSend sysAnnouncementSend,
								  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
								  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
								  HttpServletRequest req) {
	Result<IPage<SysAnnouncementSend>> result = new Result<IPage<SysAnnouncementSend>>();
	QueryWrapper<SysAnnouncementSend> queryWrapper = new QueryWrapper<SysAnnouncementSend>(sysAnnouncementSend);
	Page<SysAnnouncementSend> page = new Page<SysAnnouncementSend>(pageNo,pageSize);
	//排序逻辑 处理
	String column = req.getParameter("column");
	String order = req.getParameter("order");
	if(oConvertUtils.isNotEmpty(column) && oConvertUtils.isNotEmpty(order)) {
		if("asc".equals(order)) {
			queryWrapper.orderByAsc(oConvertUtils.camelToUnderline(column));
		}else {
			queryWrapper.orderByDesc(oConvertUtils.camelToUnderline(column));
		}
	}
	IPage<SysAnnouncementSend> pageList = sysAnnouncementSendService.page(page, queryWrapper);
	//log.info("查询当前页："+pageList.getCurrent());
	//log.info("查询当前页数量："+pageList.getSize());
	//log.info("查询结果数量："+pageList.getRecords().size());
	//log.info("数据总数："+pageList.getTotal());
	result.setSuccess(true);
	result.setResult(pageList);
	return result;
}
 

/**
  * 通过id查询
 * @param id
 * @return
 */
@GetMapping(value = "/queryById")
public Result<SysAnnouncementSend> queryById(@RequestParam(name="id",required=true) String id) {
	Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
	SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id);
	if(sysAnnouncementSend==null) {
		result.error500("未找到对应实体");
	}else {
		result.setResult(sysAnnouncementSend);
		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;
}
 

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

/**
  *  批量删除
 * @param ids
 * @return
 */
@DeleteMapping(value = "/deleteBatch")
public Result<SysAnnouncementSend> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
	Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
	if(ids==null || "".equals(ids.trim())) {
		result.error500("参数不识别！");
	}else {
		this.sysAnnouncementSendService.removeByIds(Arrays.asList(ids.split(",")));
		result.success("删除成功!");
	}
	return result;
}
 

/**
  *   添加
 * @param sysAnnouncementSend
 * @return
 */
@PostMapping(value = "/add")
public Result<SysAnnouncementSend> add(@RequestBody SysAnnouncementSend sysAnnouncementSend) {
	Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
	try {
		sysAnnouncementSendService.save(sysAnnouncementSend);
		result.success("添加成功！");
	} catch (Exception e) {
		log.error(e.getMessage(),e);
		result.error500("操作失败");
	}
	return result;
}
 

/**
  * 分页列表查询
 * @param sysAnnouncementSend
 * @param pageNo
 * @param pageSize
 * @param req
 * @return
 */
@GetMapping(value = "/list")
public Result<IPage<SysAnnouncementSend>> queryPageList(SysAnnouncementSend sysAnnouncementSend,
								  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
								  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
								  HttpServletRequest req) {
	Result<IPage<SysAnnouncementSend>> result = new Result<IPage<SysAnnouncementSend>>();
	QueryWrapper<SysAnnouncementSend> queryWrapper = new QueryWrapper<SysAnnouncementSend>(sysAnnouncementSend);
	Page<SysAnnouncementSend> page = new Page<SysAnnouncementSend>(pageNo,pageSize);
	//排序逻辑 处理
	String column = req.getParameter("column");
	String order = req.getParameter("order");
	if(oConvertUtils.isNotEmpty(column) && oConvertUtils.isNotEmpty(order)) {
		if("asc".equals(order)) {
			queryWrapper.orderByAsc(oConvertUtils.camelToUnderline(column));
		}else {
			queryWrapper.orderByDesc(oConvertUtils.camelToUnderline(column));
		}
	}
	IPage<SysAnnouncementSend> pageList = sysAnnouncementSendService.page(page, queryWrapper);
	//log.info("查询当前页："+pageList.getCurrent());
	//log.info("查询当前页数量："+pageList.getSize());
	//log.info("查询结果数量："+pageList.getRecords().size());
	//log.info("数据总数："+pageList.getTotal());
	result.setSuccess(true);
	result.setResult(pageList);
	return result;
}