|
@@ -3,6 +3,7 @@ package com.usky.pm.service.impl;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
+import com.usky.common.core.bean.ApiResult;
|
|
|
import com.usky.common.core.exception.BusinessException;
|
|
|
import com.usky.common.mybatis.core.AbstractCrudService;
|
|
|
import com.usky.common.security.utils.SecurityUtils;
|
|
@@ -21,6 +22,7 @@ import com.usky.pm.service.config.DingTalkAndMessage;
|
|
|
import com.usky.pm.service.vo.PmProjectTotalWorkTimeVo;
|
|
|
import com.usky.pm.service.vo.PmProjectWorkTimeVo;
|
|
|
import com.usky.system.RemoteMceService;
|
|
|
+import com.usky.system.domain.MceRequestVO;
|
|
|
import com.usky.system.domain.SysUser;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
@@ -742,6 +744,13 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
|
|
|
return timedReports;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * @description: 报告提交提醒
|
|
|
+ * @author: fu
|
|
|
+ * @date: 2024/8/7 20:17
|
|
|
+ * @param: []
|
|
|
+ * @return: void
|
|
|
+ **/
|
|
|
@Async
|
|
|
@Override
|
|
|
public void reportSubmissionReminder() {
|
|
@@ -764,18 +773,19 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
|
|
|
.notIn(!userIds.isEmpty(), SysUser::getUserId, userIds);
|
|
|
userIds = sysUserMapper.selectList(userQueryWrapper).stream().map(SysUser::getUserId).collect(Collectors.toList());
|
|
|
|
|
|
- JSONObject jsonObject = new JSONObject();
|
|
|
- jsonObject.put("infoTitle", INFO_TITLE);
|
|
|
- jsonObject.put("infoContent", INFO_CONTENT);
|
|
|
- jsonObject.put("infoType", INFO_TYPE);
|
|
|
- jsonObject.put("id", 0);
|
|
|
- jsonObject.put("infoTypeName", INFO_TITLE);
|
|
|
- jsonObject.put("userName", "报告提醒通知");
|
|
|
- jsonObject.put("userIds", userIds);
|
|
|
-
|
|
|
- // 推送消息中心
|
|
|
+ MceRequestVO mceRequestVO = new MceRequestVO();
|
|
|
+ mceRequestVO.setInfoTitle(INFO_TITLE);
|
|
|
+ mceRequestVO.setInfoContent(INFO_CONTENT);
|
|
|
+ mceRequestVO.setInfoType(String.valueOf(INFO_TYPE));
|
|
|
+ mceRequestVO.setId(0);
|
|
|
+ mceRequestVO.setInfoTypeName(INFO_TITLE);
|
|
|
+ mceRequestVO.setUserName("报告提醒通知");
|
|
|
+ if (!userIds.isEmpty()) {
|
|
|
+ mceRequestVO.setUserIds(userIds);
|
|
|
+ }
|
|
|
try {
|
|
|
- remoteMceService.addMce(jsonObject.toString());
|
|
|
+ // 推送消息中心
|
|
|
+ remoteMceService.addMceReceive(mceRequestVO);
|
|
|
} catch (Exception e) {
|
|
|
log.error("报告提醒通知推送消息中心异常" + e);
|
|
|
}
|