|
@@ -2,16 +2,17 @@ package com.qmth.sop.server.api;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
-import com.qmth.boot.api.annotation.Aac;
|
|
|
-import com.qmth.boot.api.annotation.BOOL;
|
|
|
import com.qmth.boot.api.constant.ApiConstant;
|
|
|
import com.qmth.sop.business.bean.result.SysMessageCountResult;
|
|
|
import com.qmth.sop.business.bean.result.SysMessageResult;
|
|
|
+import com.qmth.sop.business.bean.result.SysMessageWorkResult;
|
|
|
+import com.qmth.sop.business.entity.SysMessage;
|
|
|
import com.qmth.sop.business.entity.TBTask;
|
|
|
import com.qmth.sop.business.service.SysMessageService;
|
|
|
import com.qmth.sop.business.service.TBTaskService;
|
|
|
import com.qmth.sop.business.templete.execute.AsyncSysMessageExportService;
|
|
|
import com.qmth.sop.common.contant.SystemConstant;
|
|
|
+import com.qmth.sop.common.enums.MessageTypeEnum;
|
|
|
import com.qmth.sop.common.enums.TaskTypeEnum;
|
|
|
import com.qmth.sop.common.util.Result;
|
|
|
import com.qmth.sop.common.util.ResultUtil;
|
|
@@ -53,7 +54,6 @@ public class SysMessageController {
|
|
|
@Resource
|
|
|
AsyncSysMessageExportService asyncSysMessageExportService;
|
|
|
|
|
|
- @Aac(auth= BOOL.FALSE)
|
|
|
@ApiOperation(value = "回执查询接口")
|
|
|
@RequestMapping(value = "/query", method = RequestMethod.POST)
|
|
|
@ApiResponses({@ApiResponse(code = 200, message = "回执查询结果", response = SysMessageResult.class)})
|
|
@@ -68,7 +68,6 @@ public class SysMessageController {
|
|
|
return ResultUtil.ok(resultIPage);
|
|
|
}
|
|
|
|
|
|
- @Aac(auth = BOOL.FALSE)
|
|
|
@ApiOperation(value = "回执查询导出")
|
|
|
@RequestMapping(value = "/export", method = RequestMethod.POST)
|
|
|
@ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
|
|
@@ -89,7 +88,6 @@ public class SysMessageController {
|
|
|
/*
|
|
|
统计已读和未读系统消息
|
|
|
*/
|
|
|
- @Aac(auth= BOOL.FALSE)
|
|
|
@ApiOperation(value = "回执统计已读和未读")
|
|
|
@RequestMapping(value = "/count", method = RequestMethod.POST)
|
|
|
@ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = SysMessageCountResult.class)})
|
|
@@ -98,46 +96,56 @@ public class SysMessageController {
|
|
|
}
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
+ * 标记消息已阅读
|
|
|
+ */
|
|
|
+
|
|
|
+ @ApiOperation(value = "标记消息已阅读")
|
|
|
+ @RequestMapping(value = "/read", method = RequestMethod.POST)
|
|
|
+ @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
|
|
|
+ public Result read(@ApiParam(value = "消息表id", required = true) @RequestParam(required = true) long id) {
|
|
|
+ return ResultUtil.ok(sysMessageService.read(id));
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 查看消息详细
|
|
|
+ */
|
|
|
+
|
|
|
+ @ApiOperation(value = "查看消息详细")
|
|
|
+ @RequestMapping(value = "/get", method = RequestMethod.POST)
|
|
|
+ @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = SysMessage.class)})
|
|
|
+ public Result get(@ApiParam(value = "消息表id", required = true) @RequestParam(required = true) long id) {
|
|
|
+ return ResultUtil.ok(sysMessageService.getById(id));
|
|
|
+ }
|
|
|
|
|
|
+ //按多个类型统计未读消息
|
|
|
+
|
|
|
+ @ApiOperation(value = "按多个类型统计当前用户未读消息")
|
|
|
+ @RequestMapping(value = "/countByTypes", method = RequestMethod.POST)
|
|
|
+ @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
|
|
|
+ public Result countByTypes(@ApiParam(value = "消息类型", required = true) @RequestParam(required = true) MessageTypeEnum[] types) {
|
|
|
+ return ResultUtil.ok(sysMessageService.countByTypes(types));
|
|
|
+ }
|
|
|
+
|
|
|
+ //按多个类型查询未读消息
|
|
|
+
|
|
|
+ @ApiOperation(value = "按多个类型查询当前用户未读消息")
|
|
|
+ @RequestMapping(value = "/pageByTypes", method = RequestMethod.POST)
|
|
|
+ @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = SysMessageWorkResult.class)})
|
|
|
+ public Result pageByTypes(@ApiParam(value = "消息类型", required = true) @RequestParam(required = true) MessageTypeEnum[] types,
|
|
|
+ @ApiParam(value = "是否已读", required = false) @RequestParam(required = false) Boolean status,
|
|
|
+ @ApiParam(value = "服务单元", required = false) @RequestParam(required = false) Long serviceId,
|
|
|
+ @ApiParam(value = "客户名称(模糊查询)", required = false) @RequestParam(required = false) String custom,
|
|
|
+ @ApiParam(value = "内容模糊查询", required = false) @RequestParam(required = false) String query,
|
|
|
+ @ApiParam(value = "发送时间开始", required = false) @RequestParam(required = false) Long startTime,
|
|
|
+ @ApiParam(value = "发送时间结束", required = false) @RequestParam(required = false) Long endTime,
|
|
|
+ @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
|
|
|
+ @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
|
|
|
+ IPage<SysMessageWorkResult> resultIPage = sysMessageService.pageByTypes(new Page<>(pageNumber, pageSize),types,status,serviceId,custom,query,startTime,endTime);
|
|
|
+ return ResultUtil.ok(resultIPage);
|
|
|
+ }
|
|
|
|
|
|
|
|
|
-// @Aac(auth= BOOL.FALSE)
|
|
|
-// @ApiOperation(value = "系统消息查询接口")
|
|
|
-// @RequestMapping(value = "/query", method = RequestMethod.POST)
|
|
|
-// @ApiResponses({@ApiResponse(code = 200, message = "系统消息查询结果", response = SysMessage.class)})
|
|
|
-// public Result query(
|
|
|
-// @ApiParam(value = "模糊查询条件", required = false) @RequestParam(required = false) String query,
|
|
|
-// @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
|
|
|
-// @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
|
|
|
-// IPage<SysMessage> resultIPage = sysMessageService.query(new Page<>(pageNumber, pageSize),query);
|
|
|
-//
|
|
|
-// return ResultUtil.ok(resultIPage);
|
|
|
-// }
|
|
|
-//
|
|
|
-// @Aac(auth= BOOL.FALSE)
|
|
|
-// @ApiOperation(value = "系统消息新增修改接口")
|
|
|
-// @RequestMapping(value = "/save", method = RequestMethod.POST)
|
|
|
-// @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
|
|
|
-// public Result save(@ApiParam(value = "系统消息信息", required = true) @RequestBody(required = true) SysMessage sysMessage) {
|
|
|
-// return ResultUtil.ok(sysMessageService.saveSysMessage(sysMessage));
|
|
|
-// }
|
|
|
-//
|
|
|
-//
|
|
|
-// @Aac(auth= BOOL.FALSE)
|
|
|
-// @ApiOperation(value = "系统消息删除接口")
|
|
|
-// @RequestMapping(value = "/delete", method = RequestMethod.POST)
|
|
|
-// @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
|
|
|
-// public Result delete(@ApiParam(value = "系统消息id", required = true) @RequestParam(required = true) long id) {
|
|
|
-// return ResultUtil.ok(sysMessageService.delete(id));
|
|
|
-// }
|
|
|
-//
|
|
|
-//
|
|
|
-// @ApiOperation(value = "系统消息获取单个接口")
|
|
|
-// @RequestMapping(value = "/get", method = RequestMethod.GET)
|
|
|
-// @ApiResponses({@ApiResponse(code = 200, message = "系统消息信息", response = SysMessage.class)})
|
|
|
-// public Result get(@ApiParam(value = "系统消息id", required = true) @RequestParam long id) {
|
|
|
-// return ResultUtil.ok(sysMessageService.getById(id));
|
|
|
-// }
|
|
|
|
|
|
|
|
|
}
|