NewsController.java 22 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456
  1. package com.xjrsoft.module.oa.controller;
  2. import cn.dev33.satoken.stp.StpUtil;
  3. import cn.hutool.core.bean.BeanUtil;
  4. import cn.hutool.core.util.ObjectUtil;
  5. import cn.hutool.core.util.StrUtil;
  6. import com.baomidou.mybatisplus.core.conditions.Wrapper;
  7. import com.baomidou.mybatisplus.core.metadata.IPage;
  8. import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  9. import com.github.yulichang.wrapper.MPJLambdaWrapper;
  10. import com.xjrsoft.common.constant.GlobalConstant;
  11. import com.xjrsoft.common.model.result.RT;
  12. import com.xjrsoft.common.page.ConventPage;
  13. import com.xjrsoft.common.page.PageOutput;
  14. import com.xjrsoft.common.utils.VoToColumnUtil;
  15. import com.xjrsoft.module.oa.dto.*;
  16. import com.xjrsoft.module.oa.entity.News;
  17. import com.xjrsoft.module.oa.entity.NewsAppendix;
  18. import com.xjrsoft.module.oa.entity.NewsRelation;
  19. import com.xjrsoft.module.oa.entity.NewsRelationConfig;
  20. import com.xjrsoft.module.oa.service.INewsAppendixService;
  21. import com.xjrsoft.module.oa.service.INewsRelationConfigService;
  22. import com.xjrsoft.module.oa.service.INewsRelationService;
  23. import com.xjrsoft.module.oa.service.INewsService;
  24. import com.xjrsoft.module.oa.vo.*;
  25. import com.xjrsoft.module.organization.entity.Department;
  26. import com.xjrsoft.module.organization.mapper.DepartmentMapper;
  27. import com.xjrsoft.module.system.entity.File;
  28. import com.xjrsoft.module.teacher.entity.XjrUser;
  29. import io.swagger.annotations.Api;
  30. import io.swagger.annotations.ApiOperation;
  31. import lombok.AllArgsConstructor;
  32. import org.apache.commons.lang3.BooleanUtils;
  33. import org.springframework.web.bind.annotation.*;
  34. import java.time.LocalDateTime;
  35. import java.util.ArrayList;
  36. import java.util.List;
  37. /**
  38. * 新闻
  39. * @author zlf
  40. * @since 2022-06-16
  41. */
  42. @RestController
  43. @RequestMapping(GlobalConstant.OA_MODULE_PREFIX + "/news")
  44. @Api(value = GlobalConstant.OA_MODULE_PREFIX + "/news", tags = "新闻")
  45. @AllArgsConstructor
  46. public class NewsController {
  47. private INewsService newsService;
  48. private INewsRelationService newsRelationService;
  49. private INewsAppendixService newsAppendixService;
  50. private DepartmentMapper departmentMapper;
  51. private INewsRelationConfigService newsRelationConfigService;
  52. @GetMapping
  53. @ApiOperation(value = "获取新闻分页")
  54. public RT<PageOutput<NewsPageVo>> page(NewsPageDto dto) {
  55. Wrapper<News> wrapper = Wrappers.<News>query().lambda()
  56. .eq(News::getTypeId, dto.getType())
  57. .like(StrUtil.isNotBlank(dto.getKeyword()), News::getFullHead, dto.getKeyword())
  58. .select(News.class, x -> VoToColumnUtil.fieldsToColumns(NewsPageVo.class).contains(x.getProperty()))
  59. .orderByDesc(News::getSendEndDate);
  60. IPage<News> page = newsService.page(ConventPage.getPage(dto), wrapper);
  61. PageOutput<NewsPageVo> pageOutput = ConventPage.getPageOutput(page, NewsPageVo.class);
  62. return RT.ok(pageOutput);
  63. }
  64. @GetMapping("/manage-box")
  65. @ApiOperation(value = "获取管理新闻分页")
  66. public RT<PageOutput<NewsPageVo>> manageBox(NewsPageDto dto) {
  67. IPage<NewsPageVo> page = newsService.manageBox(dto);
  68. PageOutput<NewsPageVo> pageOutput = ConventPage.getPageOutput(page, NewsPageVo.class);
  69. return RT.ok(pageOutput);
  70. }
  71. @GetMapping("/receipt-box")
  72. @ApiOperation(value = "获取接受新闻分页")
  73. public RT<PageOutput<NewsPageVo>> receiptBox(NewsPageDto dto) {
  74. IPage<NewsPageVo> page = newsService.receiptBox(dto);
  75. PageOutput<NewsPageVo> pageOutput = ConventPage.getPageOutput(page, NewsPageVo.class);
  76. return RT.ok(pageOutput);
  77. }
  78. @PostMapping
  79. @ApiOperation(value = "新增新闻")
  80. public RT<Boolean> add(@RequestBody AddNewsDto addNewsDto) {
  81. return RT.ok(newsService.add(addNewsDto));
  82. }
  83. @GetMapping(value = "/info")
  84. @ApiOperation(value = "新闻详情")
  85. public RT<NewsVo> info(@RequestParam Long id, @RequestParam(required = false) Boolean isRead) {
  86. News news = newsService.getById(id);
  87. if (news == null) {
  88. RT.error("找不到此新闻!");
  89. }
  90. List<NewsRelationVo> newsRelationVoList = new ArrayList<>();
  91. MPJLambdaWrapper<NewsRelation> queryWrapper = new MPJLambdaWrapper<>();
  92. queryWrapper
  93. .select(NewsRelation::getId)
  94. .selectAs(XjrUser::getName,NewsRelationVo::getUserName)
  95. .select(NewsRelation.class, x -> VoToColumnUtil.fieldsToColumns(NewsRelationVo.class).contains(x.getProperty()))
  96. .leftJoin(XjrUser.class,XjrUser::getId,NewsRelation::getUserId)
  97. .eq(NewsRelation::getNewsId , id)
  98. .disableSubLogicDel();
  99. if(ObjectUtil.isNotNull(news.getCreateUserId()) && StpUtil.getLoginIdAsLong() == news.getCreateUserId()){
  100. newsRelationVoList = newsRelationService.selectJoinList(NewsRelationVo.class, queryWrapper);
  101. }else{
  102. queryWrapper.eq(NewsRelation::getUserId , StpUtil.getLoginIdAsLong());
  103. NewsRelationVo newsRelationVo = newsRelationService.selectJoinOne(NewsRelationVo.class, queryWrapper);
  104. if(ObjectUtil.isNotNull(newsRelationVo)){
  105. newsRelationVoList.add(newsRelationVo);
  106. }
  107. }
  108. NewsVo newsVo = BeanUtil.toBean(news, NewsVo.class);
  109. newsVo.setRelationList(newsRelationVoList);
  110. Department department = departmentMapper.selectById(newsVo.getSendDeptId());
  111. if(department != null){
  112. newsVo.setSendDeptIdCN(department.getName());
  113. }
  114. if (BooleanUtils.isTrue(isRead)) {
  115. // NewsRelation newsRelation = new NewsRelation();
  116. // newsRelation.setNewsId(id);
  117. // newsRelation.setUserId(StpUtil.getLoginIdAsLong());
  118. // newsRelationService.remove(Wrappers.<NewsRelation>query().lambda()
  119. // .eq(NewsRelation::getUserId, StpUtil.getLoginIdAsLong())
  120. // .eq(NewsRelation::getNewsId, id));
  121. // newsRelationService.save(newsRelation);
  122. }
  123. // List<NewsRelationVo> newsRelationVoList = newsRelationService.selectJoinList(NewsRelationVo.class,
  124. // new MPJLambdaWrapper<NewsRelation>()
  125. // .eq(NewsRelation::getNewsId, id)
  126. // .select(NewsRelation::getId)
  127. // .select(NewsRelation.class, x -> VoToColumnUtil.fieldsToColumns(NewsRelationVo.class).contains(x.getProperty()))
  128. // .leftJoin(XjrUser.class, XjrUser::getId, NewsRelation::getUserId, ext -> ext.selectAs(XjrUser::getName, NewsRelationVo::getUserName)));
  129. // if (newsRelationVoList.size() > 0) {
  130. // newsVo.setRelationList(newsRelationVoList);
  131. // }
  132. List<NewsAppendixVo> newsAppendixVoList = newsAppendixService.selectJoinList(NewsAppendixVo.class,
  133. new MPJLambdaWrapper<NewsAppendix>().eq(NewsAppendix::getNewsId, id)
  134. .select(NewsRelation::getId)
  135. .select(NewsAppendix.class, x -> VoToColumnUtil.fieldsToColumns(NewsAppendixVo.class).contains(x.getProperty()))
  136. .leftJoin(File.class, File::getId, NewsAppendix::getFileId, ext -> ext.selectAs(File::getFileName, NewsAppendixVo::getFileName)
  137. .selectAs(File::getFolderId, NewsAppendixVo::getFolderId)
  138. .selectAs(File::getFileUrl, NewsAppendixVo::getFileUrl))
  139. );
  140. if (newsAppendixVoList.size() > 0) {
  141. newsVo.setAppendixList(newsAppendixVoList);
  142. }
  143. return RT.ok(newsVo);
  144. }
  145. @PutMapping
  146. @ApiOperation(value = "修改新闻")
  147. public RT<Boolean> update(@RequestBody UpdateNewsDto updateNewsDto) {
  148. //News news = BeanUtil.toBean(updateNewsDto, News.class);
  149. return RT.ok(newsService.update(updateNewsDto));
  150. }
  151. @DeleteMapping
  152. @ApiOperation(value = "删除新闻")
  153. public RT<Boolean> delete(@RequestBody List<Long> ids) {
  154. return RT.ok(newsService.delete(ids));
  155. }
  156. @PutMapping("/change-status")
  157. @ApiOperation(value = "发布或下架新闻")
  158. public RT<Boolean> changeStatus(@RequestBody ChangeNewsDto changeNewsDto) throws Exception {
  159. News xjrNews = newsService.getById(changeNewsDto.getId());
  160. if (changeNewsDto.getStatus() == null || xjrNews == null) {
  161. throw new Exception("参数异常");
  162. }
  163. if (changeNewsDto.getStatus().equals(xjrNews.getStatus())) {
  164. if (changeNewsDto.getStatus() == 2) {
  165. throw new Exception("新闻已发布!!!");
  166. } else if (changeNewsDto.getStatus() == 3) {
  167. throw new Exception("新闻已下架!!!");
  168. }
  169. }
  170. //将原来的修改enabled_mark改为修改status
  171. xjrNews.setStatus(changeNewsDto.getStatus());
  172. if(xjrNews.getStatus() == 2){
  173. //将发布时间改为当前时间
  174. xjrNews.setReleaseTime(LocalDateTime.now());
  175. //将张贴时间改为当前时间
  176. xjrNews.setSendStartDate(LocalDateTime.now());
  177. newsService.SendMessage(xjrNews.getId());
  178. }
  179. return RT.ok(newsService.updateById(xjrNews));
  180. }
  181. @PutMapping("/read")
  182. @ApiOperation(value = "读新闻")
  183. public RT<Boolean> read(@RequestBody List<Long> ids) {
  184. for (Long id : ids) {
  185. NewsRelation newsRelation = newsRelationService.getOne(
  186. Wrappers.<NewsRelation>query().lambda()
  187. .eq(NewsRelation::getNewsId, id)
  188. .eq(NewsRelation::getUserId, StpUtil.getLoginIdAsLong()));
  189. if (newsRelation == null) {
  190. newsRelationService.save(new NewsRelation(){{
  191. setNewsId(id);
  192. setUserId(StpUtil.getLoginIdAsLong());
  193. setReadMark(1);
  194. setReadDate(LocalDateTime.now());
  195. }});
  196. continue;
  197. }
  198. newsRelationService.updateById(new NewsRelation(){{
  199. setId(newsRelation.getId());
  200. setReadMark(1);
  201. setReadDate(LocalDateTime.now());
  202. }});
  203. }
  204. return RT.ok(true);
  205. }
  206. @PutMapping("/reply")
  207. @ApiOperation(value = "新闻回复")
  208. public RT<Boolean> reply(@RequestBody NewsReplyDto newsReplyDto) {
  209. NewsRelation newsRelation = newsRelationService.getOne(
  210. Wrappers.<NewsRelation>query().lambda()
  211. .eq(NewsRelation::getNewsId, newsReplyDto.getId())
  212. .eq(NewsRelation::getUserId, StpUtil.getLoginIdAsLong()));
  213. if (newsRelation == null) {
  214. newsRelation = new NewsRelation();
  215. newsRelation.setNewsId(newsReplyDto.getId());
  216. newsRelation.setUserId(StpUtil.getLoginIdAsLong());
  217. newsRelation.setReadMark(1);
  218. newsRelation.setReadDate(LocalDateTime.now());
  219. newsRelation.setReplyContent(newsReplyDto.getReplyContent());
  220. return RT.ok(newsRelationService.save(newsRelation));
  221. }
  222. if (newsRelation.getReadMark() == null || newsRelation.getReadMark() == 0) {
  223. newsRelation.setReadMark(1);
  224. newsRelation.setReadDate(LocalDateTime.now());
  225. }
  226. newsRelation.setReplyContent(newsReplyDto.getReplyContent());
  227. return RT.ok(newsRelationService.updateById(newsRelation));
  228. }
  229. @GetMapping("/page-relation")
  230. @ApiOperation(value = "获取新闻阅读权限分页")
  231. public RT<PageOutput<NewsRelationVo>> pageRelation(NewsRelationPageDto dto) {
  232. IPage<NewsRelationVo> page = newsRelationService.selectJoinListPage(ConventPage.getPage(dto), NewsRelationVo.class,
  233. new MPJLambdaWrapper<NewsRelation>()
  234. .eq(NewsRelation::getNewsId, dto.getNewsId())
  235. .eq(ObjectUtil.isNotEmpty(dto.getReadMark()) && dto.getReadMark() > 0, NewsRelation::getReadMark, dto.getReadMark() == 1 ? 0 : 1)
  236. .isNull(ObjectUtil.isNotEmpty(dto.getReplyMark()) && dto.getReplyMark() == 1, NewsRelation::getReplyContent)
  237. .isNotNull(ObjectUtil.isNotEmpty(dto.getReplyMark()) && dto.getReplyMark() == 2, NewsRelation::getReplyContent)
  238. .select(NewsRelation::getId)
  239. .select(NewsRelation.class, x -> VoToColumnUtil.fieldsToColumns(NewsRelationVo.class).contains(x.getProperty()))
  240. .leftJoin(XjrUser.class, XjrUser::getId, NewsRelation::getUserId, ext -> ext.selectAs(XjrUser::getName, NewsRelationVo::getUserName))
  241. );
  242. PageOutput<NewsRelationVo> pageOutput = ConventPage.getPageOutput(page);
  243. return RT.ok(pageOutput);
  244. }
  245. @GetMapping("/page-relation-config")
  246. @ApiOperation(value = "获取新闻权限分页")
  247. public RT<PageOutput<NewsRelationConfigVo>> pageRelationConfig(NewsRelationPageDto dto) {
  248. Wrapper<NewsRelationConfig> wrapper = Wrappers.<NewsRelationConfig>query().lambda()
  249. .eq(NewsRelationConfig::getNewsId, dto.getNewsId())
  250. .select(NewsRelationConfig.class, x -> VoToColumnUtil.fieldsToColumns(NewsRelationConfigVo.class).contains(x.getProperty()));
  251. IPage<NewsRelationConfig> page = newsRelationConfigService.page(ConventPage.getPage(dto), wrapper);
  252. PageOutput<NewsRelationConfigVo> pageOutput = ConventPage.getPageOutput(page, NewsRelationConfigVo.class);
  253. return RT.ok(pageOutput);
  254. }
  255. @GetMapping("/count-relation")
  256. @ApiOperation(value = "公告阅读权限统计")
  257. public RT<Long[]> countRelation(@RequestParam Long id) {
  258. Long total = newsRelationService.count(Wrappers.<NewsRelation>query().lambda().eq(NewsRelation::getNewsId, id));
  259. Long notRead = newsRelationService.count(Wrappers.<NewsRelation>query().lambda().eq(NewsRelation::getNewsId, id).eq(NewsRelation::getReadMark, 0));
  260. Long isRead = newsRelationService.count(Wrappers.<NewsRelation>query().lambda().eq(NewsRelation::getNewsId, id).eq(NewsRelation::getReadMark, 1));
  261. Long isReply = newsRelationService.count(Wrappers.<NewsRelation>query().lambda().eq(NewsRelation::getNewsId, id).isNotNull(NewsRelation::getReplyContent));
  262. Long notReply = newsRelationService.count(Wrappers.<NewsRelation>query().lambda().eq(NewsRelation::getNewsId, id).isNull(NewsRelation::getReplyContent));
  263. Long[] arrayRefVar = {total, notRead, isRead, isReply, notReply};
  264. return RT.ok(arrayRefVar);
  265. }
  266. @PutMapping("/update-relation")
  267. @ApiOperation(value = "设置新闻阅读权限")
  268. public RT<Boolean> updateRelation(@RequestBody UpdateNewsRelationDto updateRelationDto) {
  269. return RT.ok(newsService.updateRelation(updateRelationDto));
  270. }
  271. @DeleteMapping("/delete-relation")
  272. @ApiOperation(value = "删除新闻阅读权限")
  273. public RT<Boolean> deleteRelation(@RequestBody DeleteNewsRelationDto deleteNewsRelationDto) {
  274. return RT.ok(newsService.deleteRelation(deleteNewsRelationDto));
  275. }
  276. @GetMapping("/count-type")
  277. @ApiOperation(value = "未读类型统计")
  278. public RT<List<NewsCountTypeVo>> countType() {
  279. List<NewsCountTypeVo> newsCountTypeVoList = new ArrayList<>();
  280. Integer typeIds[] = {1, 2, 3};
  281. for (Integer typeId : typeIds) {
  282. NewsCountTypeVo newsCountTypeVo = new NewsCountTypeVo();
  283. News news = new News();
  284. //新闻
  285. if(typeId == 1){
  286. Long notReadCount = newsService.count(Wrappers.<News>query().lambda()
  287. .eq(News::getTypeId, typeId)
  288. .eq(News::getStatus, 2)
  289. .gt(News::getSendEndDate, LocalDateTime.now())
  290. .eq(News::getWfStatus, 1)
  291. .notInSql(News::getId, "select distinct news_id from xjr_oa_news_relation where read_mark = 1 and user_id = " + StpUtil.getLoginIdAsLong()));
  292. newsCountTypeVo.setTypeId(typeId);
  293. newsCountTypeVo.setTotal(notReadCount);
  294. news = newsService.getOne(Wrappers.<News>query().lambda()
  295. .eq(News::getTypeId, typeId)
  296. .eq(News::getStatus, 2)
  297. .gt(News::getSendEndDate, LocalDateTime.now())
  298. .eq(News::getWfStatus, 1)
  299. //.notInSql(News::getId, "select distinct news_id from xjr_oa_news_relation where read_mark = 1 and user_id = " + StpUtil.getLoginIdAsLong())
  300. .orderByDesc(News::getReleaseTime)
  301. .last("limit 1"));
  302. }
  303. //公告
  304. if(typeId == 2){
  305. //公告发给全体的
  306. Long notReadCountProclamationToAll = newsService.count(Wrappers.<News>query().lambda()
  307. .eq(News::getTypeId, 2)
  308. .eq(News::getStatus, 2)
  309. .eq(News::getSendRange, 1)
  310. .notInSql(News::getId, "select distinct news_id from xjr_oa_news_relation where read_mark = 1 and user_id = " + StpUtil.getLoginIdAsLong())
  311. .and(wp -> wp.gt(News::getSendEndDate, LocalDateTime.now())
  312. .or()
  313. .isNull(News::getSendEndDate)));
  314. News newsAll = newsService.getOne(Wrappers.<News>query().lambda()
  315. .eq(News::getTypeId, 2)
  316. .eq(News::getStatus, 2)
  317. .eq(News::getSendRange, 1)
  318. //.notInSql(News::getId, "select distinct news_id from xjr_oa_news_relation where read_mark = 1 and user_id = " + StpUtil.getLoginIdAsLong())
  319. .and(wp -> wp.gt(News::getSendEndDate, LocalDateTime.now())
  320. .or()
  321. .isNull(News::getSendEndDate))
  322. .orderByDesc(News::getReleaseTime)
  323. .last("limit 1"));
  324. //公告发给非全体的
  325. Long notReadCountProclamation = newsRelationService.count(Wrappers.<NewsRelation>query().lambda()
  326. .eq(NewsRelation::getReadMark, 2)
  327. .eq(NewsRelation::getUserId, 2)
  328. .inSql(NewsRelation::getNewsId, "select id from xjr_oa_news where delete_mark = 0 and type_id = 2 and (send_range = 2 or send_range = 3) AND (send_end_date > '" + LocalDateTime.now() + "' OR send_end_date IS NULL)"));
  329. MPJLambdaWrapper<News> queryNews = new MPJLambdaWrapper<>();
  330. queryNews
  331. .leftJoin(NewsRelation.class, NewsRelation::getNewsId, News::getId)
  332. .eq(News::getTypeId, typeId)
  333. .eq(News::getStatus, 2)
  334. .and(wp -> wp.eq(News::getSendRange, 2)
  335. .or()
  336. .eq(News::getSendRange, 3))
  337. .and(wp -> wp.gt(News::getSendEndDate, LocalDateTime.now())
  338. .or()
  339. .isNull(News::getSendEndDate))
  340. //.eq(NewsRelation::getReadMark, 0)
  341. .eq(NewsRelation::getUserId, StpUtil.getLoginIdAsLong())
  342. .orderByDesc(News::getReleaseTime)
  343. .last("limit 1");
  344. News newsNotAll = newsService.selectJoinOne(News.class, queryNews);
  345. if(newsAll != null && newsNotAll != null){
  346. if(newsAll.getReleaseTime().compareTo(newsNotAll.getReleaseTime()) < 0){
  347. news = newsNotAll;
  348. }else {
  349. news = newsAll;
  350. }
  351. }
  352. if(newsAll != null && newsNotAll == null){
  353. news = newsAll;
  354. }
  355. if(newsAll == null && newsNotAll != null){
  356. news = newsNotAll;
  357. }
  358. newsCountTypeVo.setTypeId(typeId);
  359. newsCountTypeVo.setTotal(notReadCountProclamationToAll + notReadCountProclamation);
  360. }
  361. if (news != null) {
  362. newsCountTypeVo.setTime(news.getReleaseTime());
  363. newsCountTypeVo.setTitle(news.getFullHead());
  364. }
  365. newsCountTypeVoList.add(newsCountTypeVo);
  366. }
  367. return RT.ok(newsCountTypeVoList);
  368. }
  369. @GetMapping("/send-message")
  370. @ApiOperation(value = "发送消息")
  371. public RT<Boolean> sendMessage(@RequestParam Long id) {
  372. return RT.ok(newsService.SendMessage(id));
  373. }
  374. @GetMapping("/unread-count")
  375. @ApiOperation(value = "获取登录人未读消息数量")
  376. public RT<Long> unreadCount() {
  377. Long notReadCountNews = newsService.count(Wrappers.<News>query().lambda()
  378. .eq(News::getTypeId, 1)
  379. .eq(News::getStatus, 2)
  380. .gt(News::getSendEndDate, LocalDateTime.now())
  381. .eq(News::getWfStatus, 1)
  382. .notInSql(News::getId, "select distinct news_id from xjr_oa_news_relation where read_mark = 1 and user_id = " + StpUtil.getLoginIdAsLong()));
  383. //公告发给全体的
  384. Long notReadCountProclamationToAll = newsService.count(Wrappers.<News>query().lambda()
  385. .eq(News::getTypeId, 2)
  386. .eq(News::getStatus, 2)
  387. .eq(News::getSendRange, 1)
  388. .notInSql(News::getId, "select distinct news_id from xjr_oa_news_relation where read_mark = 1 and user_id = " + StpUtil.getLoginIdAsLong())
  389. .and(wp -> wp.gt(News::getSendEndDate, LocalDateTime.now())
  390. .or()
  391. .isNull(News::getSendEndDate)));
  392. //公告发给非全体的
  393. Long notReadCountProclamation = newsRelationService.count(Wrappers.<NewsRelation>query().lambda()
  394. .eq(NewsRelation::getReadMark, 2)
  395. .eq(NewsRelation::getUserId, 2)
  396. .inSql(NewsRelation::getNewsId, "select id from xjr_oa_news where delete_mark = 0 and type_id = 2 and status = 2 and (send_range = 2 or send_range = 3) AND (send_end_date > '" + LocalDateTime.now() + "' OR send_end_date IS NULL)"));
  397. Long notReadCount = notReadCountNews + notReadCountProclamationToAll + notReadCountProclamation;
  398. return RT.ok(notReadCount);
  399. }
  400. }