Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev
This commit is contained in:
commit
20629211d6
@ -32,6 +32,10 @@ import cn.axzo.msg.center.inside.notices.service.MessageRecordService;
|
||||
import cn.axzo.msg.center.inside.notices.service.MessageRelationService;
|
||||
import cn.axzo.msg.center.inside.notices.service.MessageRouterService;
|
||||
import cn.axzo.msg.center.inside.notices.service.RawMessageRecordService;
|
||||
import cn.axzo.msg.center.message.domain.param.MessageGroupNodeStatisticParam;
|
||||
import cn.axzo.msg.center.message.service.PendingMessageNewService;
|
||||
import cn.axzo.msg.center.service.dto.PersonDTO;
|
||||
import cn.axzo.msg.center.service.enums.AppTerminalTypeEnum;
|
||||
import cn.azxo.framework.common.model.Page;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
@ -94,6 +98,8 @@ public class MessageCoreServiceImpl implements MessageCoreService {
|
||||
|
||||
@Resource
|
||||
private RawMessageRecordService rawMessageRecordService;
|
||||
@Resource
|
||||
private PendingMessageNewService pendingMessageNewService;
|
||||
|
||||
public MsgRouteTypeEnum getSystemType(String systemType) {
|
||||
/*String systemType = ContextInfoHolder.get().getSystemAndDeviceInfo().getSystemType();*/
|
||||
@ -323,8 +329,12 @@ public class MessageCoreServiceImpl implements MessageCoreService {
|
||||
List<MsgStateEnum> states = Lists.newArrayList(MsgStateEnum.HAS_BEEN_SENT, MsgStateEnum.RECEIVED);
|
||||
int generalCnt = rawMessageRecordService.countPersonMessage(request.getPersonId(), MsgTypeEnum.GENERAL_MESSAGE,
|
||||
null, null, states);
|
||||
int pendingCnt = rawMessageRecordService.countPersonMessage(request.getPersonId(), MsgTypeEnum.PENDING_MESSAGE,
|
||||
null, null, states);
|
||||
// 统计待办的数量
|
||||
MessageGroupNodeStatisticParam param = new MessageGroupNodeStatisticParam();
|
||||
param.setOperator(PersonDTO.builder().id(request.getPersonId()).build());
|
||||
param.setTerminalType(AppTerminalTypeEnum.CMS_WEB_PC);
|
||||
param.setWithIdentify(false);
|
||||
int pendingCnt = pendingMessageNewService.countUncompleted(param);
|
||||
return new MessageStatisticRes(generalCnt, pendingCnt);
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user