map = oaTaskExecService.execTask(todoId);
+ return map;
+ }
+
+}
+
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/SendTodoLogController.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/SendTodoLogController.java
new file mode 100644
index 00000000..2fed7a97
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/SendTodoLogController.java
@@ -0,0 +1,21 @@
+package com.ydw.bat.wkflow.business_main.datas.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * OA日志表 前端控制器
+ *
+ *
+ * @author super_liu
+ * @since 2021-09-17
+ */
+@RestController
+@RequestMapping("/sendTodoLog")
+public class SendTodoLogController {
+
+}
+
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessNew.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessNew.java
index b9470655..134d9db7 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessNew.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessNew.java
@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -88,4 +90,21 @@ public class BusProcessNew implements Serializable {
@ApiModelProperty(value = "流程名称")
@TableField("PRC_NAME")
private String prcName;
+
+ @TableField( exist = false)
+ @ApiModelProperty(value = "OA link")
+ private String link;
+
+ @TableField( exist = false)
+ @ApiModelProperty(value = "干活任务截止时间")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ private String endTime;
+
+ @TableField( exist = false)
+ @ApiModelProperty(value = "任务状态 0 默认 1 审批任务 2 干活任务")
+ private int taskStatus;
+
+ @TableField( exist = false)
+ @ApiModelProperty(value = "提交状态 0 提交 其它 接受 ")
+ private long commitStatus;
}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/OaTaskExec.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/OaTaskExec.java
new file mode 100644
index 00000000..d0d3ac29
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/OaTaskExec.java
@@ -0,0 +1,86 @@
+package com.ydw.bat.wkflow.business_main.datas.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *
+ * OA 干活任务执行表
+ *
+ *
+ * @author Super_liu
+ * @since 2021-09-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="OaTaskExec对象", description="OA 干活任务执行表")
+public class OaTaskExec implements Serializable {
+
+ private static final long serialVersionUID=1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "ID", type = IdType.UUID)
+ private String id;
+
+ @ApiModelProperty(value = "执行维度 1 3天内 2 3天外 3 超时")
+ @TableField("EXEC_TYPE")
+ private int execType;
+
+ @ApiModelProperty(value = "待办ID")
+ @TableField("TODO_ID")
+ private String todoId;
+
+ @ApiModelProperty(value = "待办用户ID")
+ @TableField("USER_ID")
+ private String userId;
+
+ @ApiModelProperty(value = "待办对象JSON")
+ @TableField("MESG")
+ private String mesg;
+
+ @ApiModelProperty(value = "执行状态 0 未启动 1 已启动 2 已完成")
+ @TableField("EXEC_STATUS")
+ private int execStatus;
+
+ @ApiModelProperty(value = "执行时间")
+ @TableField("EXEC_TIME")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ private String execTime;
+
+ @ApiModelProperty(value = "截止时间")
+ @TableField("END_TIME")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ private String endTime;
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField("CREATE_TIME")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ private String createTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @TableField("UPDATE_TIME")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ private String updateTime;
+
+ @ApiModelProperty(value = "参数1")
+ @TableField("PARAM1")
+ private int param1;
+
+ @ApiModelProperty(value = "参数2")
+ @TableField("PARAM2")
+ private String param2;
+
+
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/SendTodoLog.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/SendTodoLog.java
new file mode 100644
index 00000000..0cdb1b53
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/SendTodoLog.java
@@ -0,0 +1,88 @@
+package com.ydw.bat.wkflow.business_main.datas.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *
+ * OA日志表
+ *
+ *
+ * @author super_liu
+ * @since 2021-09-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="SendTodoLog对象", description="OA日志表")
+public class SendTodoLog implements Serializable {
+
+ private static final long serialVersionUID=1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "ID", type = IdType.UUID)
+ private String id;
+
+ @ApiModelProperty(value = "类型 0 待办, 1已办, 2 取消, 3 删除")
+ @TableField("MSG_TYPE")
+ private String msgType;
+
+ @ApiModelProperty(value = "待办ID")
+ @TableField("TODO_ID")
+ private String todoId;
+
+ @ApiModelProperty(value = "待办用户ID")
+ @TableField("USER_ID")
+ private String userId;
+
+ @ApiModelProperty(value = "邮箱用户ID")
+ @TableField("EMAIL_USER_ID")
+ private String emailUserId;
+
+ @ApiModelProperty(value = "待办对象JSON")
+ @TableField("MESG")
+ private String mesg;
+
+ @ApiModelProperty(value = "状态 1 待发送 2 成功 3 失败 4 无需发送")
+ @TableField("MSG_STATUS")
+ private String msgStatus;
+
+ @ApiModelProperty(value = "失败次数")
+ @TableField("ERR_NUM")
+ private int errNum;
+
+ @ApiModelProperty(value = "操作信息")
+ @TableField("OPER_MESG")
+ private String operMesg;
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField("CREATE_TIME")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private String createTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @TableField("UPDATE_TIME")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private String updateTime;
+
+ @ApiModelProperty(value = "参数1")
+ @TableField("PARAM1")
+ private String param1;
+
+ @ApiModelProperty(value = "参数2")
+ @TableField("PARAM2")
+ private String param2;
+
+
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/OaTaskExecMapper.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/OaTaskExecMapper.java
new file mode 100644
index 00000000..10f7b6e4
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/OaTaskExecMapper.java
@@ -0,0 +1,16 @@
+package com.ydw.bat.wkflow.business_main.datas.mapper;
+
+import com.ydw.bat.wkflow.business_main.datas.entity.OaTaskExec;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * OA 干活任务执行表 Mapper 接口
+ *
+ *
+ * @author Super_liu
+ * @since 2021-09-24
+ */
+public interface OaTaskExecMapper extends BaseMapper {
+
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/SendTodoLogMapper.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/SendTodoLogMapper.java
new file mode 100644
index 00000000..fb6d03b2
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/SendTodoLogMapper.java
@@ -0,0 +1,18 @@
+package com.ydw.bat.wkflow.business_main.datas.mapper;
+
+import com.ydw.bat.wkflow.business_main.datas.entity.SendTodoLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ *
+ * OA日志表 Mapper 接口
+ *
+ *
+ * @author super_liu
+ * @since 2021-09-17
+ */
+@Repository
+public interface SendTodoLogMapper extends BaseMapper {
+
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IOaTaskExecService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IOaTaskExecService.java
new file mode 100644
index 00000000..1e22b933
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IOaTaskExecService.java
@@ -0,0 +1,20 @@
+package com.ydw.bat.wkflow.business_main.datas.service;
+
+import com.ydw.bat.wkflow.business_main.datas.entity.OaTaskExec;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ *
+ * OA 干活任务执行表 服务类
+ *
+ *
+ * @author Super_liu
+ * @since 2021-09-24
+ */
+public interface IOaTaskExecService extends IService {
+
+ Map execTask(String todoId);
+
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/ISendTodoLogService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/ISendTodoLogService.java
new file mode 100644
index 00000000..46c0fed2
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/ISendTodoLogService.java
@@ -0,0 +1,16 @@
+package com.ydw.bat.wkflow.business_main.datas.service;
+
+import com.ydw.bat.wkflow.business_main.datas.entity.SendTodoLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * OA日志表 服务类
+ *
+ *
+ * @author super_liu
+ * @since 2021-09-17
+ */
+public interface ISendTodoLogService extends IService {
+
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/OaTaskExecServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/OaTaskExecServiceImpl.java
new file mode 100644
index 00000000..f0ffc21f
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/OaTaskExecServiceImpl.java
@@ -0,0 +1,90 @@
+package com.ydw.bat.wkflow.business_main.datas.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.entity.OaTaskExec;
+import com.ydw.bat.wkflow.business_main.datas.mapper.OaTaskExecMapper;
+import com.ydw.bat.wkflow.business_main.datas.service.IOaTaskExecService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.Utils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ *
+ * OA 干活任务执行表 服务实现类
+ *
+ *
+ * @author Super_liu
+ * @since 2021-09-24
+ */
+@Service
+public class OaTaskExecServiceImpl extends ServiceImpl implements IOaTaskExecService {
+
+ @Autowired
+ private IOaTaskExecService oaTaskExecService;
+
+ @Autowired
+ private CreateMQService oaService;
+
+ @Override
+ public Map execTask(String todoId){
+ Map map = new TreeMap<>();
+ QueryWrapper wrapper = new QueryWrapper();
+ wrapper.eq("TODO_ID",todoId);
+ wrapper.eq("EXEC_TYPE",2);
+ List taskExecs = oaTaskExecService.list(wrapper);
+ if(!taskExecs.isEmpty()){
+ OaTaskExec oaTaskExec = taskExecs.get(0);
+ BusProcessNew object = (BusProcessNew) net.sf.json.JSONObject.toBean(net.sf.json.JSONObject.fromObject(oaTaskExec.getMesg()), BusProcessNew.class);
+ int days = Utils.subDayNum(oaTaskExec.getEndTime());
+ if(days > 3){
+ // 3天外处理 更改执行状态 1 进入定时任务 不发送OA待办
+ updateOaTaskExec(taskExecs,1,2);
+ getSuccess(map, "0", "操作成功");
+ }else {
+ if(days < 0){
+ // 超时处理
+ updateOaTaskExec(taskExecs,0,3);
+ // 直接发送OA待办 重置任务状态 0
+ object.setTaskStatus(0);
+ oaService.sendTodoMq(object);
+ getSuccess(map, "0", "操作成功");
+ }else {
+ // 3天内处理
+ updateOaTaskExec(taskExecs,0,1);
+ // 直接发送OA待办 重置任务状态 0
+ object.setTaskStatus(0);
+ oaService.sendTodoMq(object);
+ getSuccess(map, "0", "操作成功");
+ }
+ }
+
+ }
+ return map;
+ }
+
+ private void getSuccess(Map map, String sign, String message) {
+ map.put("sign",sign);
+ map.put("message",message);
+ }
+
+ private void updateOaTaskExec(List taskExecs, int execStatus, int execType){
+ List updateList = new ArrayList<>();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+ updateList.addAll(taskExecs);
+ updateList.forEach(taskExec -> {
+ // 任务修改为 启动状态
+ taskExec.setExecStatus(execStatus);
+ taskExec.setExecType(execType);
+ taskExec.setUpdateTime(sdf.format(new Date()));
+ });
+ oaTaskExecService.updateBatchById(updateList);
+ }
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/SendTodoLogServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/SendTodoLogServiceImpl.java
new file mode 100644
index 00000000..2e01d0ae
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/SendTodoLogServiceImpl.java
@@ -0,0 +1,24 @@
+package com.ydw.bat.wkflow.business_main.datas.service.impl;
+
+import com.ydw.bat.wkflow.business_main.datas.entity.SendTodoLog;
+import com.ydw.bat.wkflow.business_main.datas.mapper.SendTodoLogMapper;
+import com.ydw.bat.wkflow.business_main.datas.service.ISendTodoLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * OA日志表 服务实现类
+ *
+ *
+ * @author super_liu
+ * @since 2021-09-17
+ */
+@Service
+public class SendTodoLogServiceImpl extends ServiceImpl implements ISendTodoLogService {
+
+ @Autowired
+ private SendTodoLogMapper sendTodoLogMapper;
+
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_mq/service/CreateMQService.java b/src/main/java/com/ydw/bat/wkflow/business_mq/service/CreateMQService.java
new file mode 100644
index 00000000..f5df0403
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_mq/service/CreateMQService.java
@@ -0,0 +1,48 @@
+package com.ydw.bat.wkflow.business_mq.service;
+
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_oa.webService.todoContent.NotifyTodoSendContext;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class CreateMQService {
+ @Autowired
+ private AmqpTemplate rabbitTemplate;
+
+ @Value("${oa.flag}")
+ private Boolean oaFlag;
+
+ /**
+ * @author: super_liu
+ * @date: 2021年09月17日 14:40
+ **/
+ public void setTodoDoneMq(NotifyTodoSendContext object){
+
+ if(oaFlag){
+ //发送消息队列
+ this.rabbitTemplate.convertAndSend("sendDone-exchange_MQ_GSAR", "sendDone-key_MQ_GSAR", object);
+
+ }
+ }
+
+ /**
+ * @author: super_liu
+ * @date: 2021年09月17日 14:40
+ **/
+ public void sendTodoMq(BusProcessNew object){
+
+ if(oaFlag) {
+ //发送消息队列
+ this.rabbitTemplate.convertAndSend("send-exchange_MQ_GSAR", "send-key_MQ_GSAR", object);
+ }
+ }
+
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDoneMQService.java b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDoneMQService.java
new file mode 100644
index 00000000..aa16152b
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDoneMQService.java
@@ -0,0 +1,179 @@
+package com.ydw.bat.wkflow.business_mq.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.rabbitmq.client.Channel;
+import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
+import com.ydw.bat.wkflow.business_main.datas.entity.ResponseMessage;
+import com.ydw.bat.wkflow.business_main.datas.entity.SendTodoLog;
+import com.ydw.bat.wkflow.business_main.datas.entity.UserVO;
+import com.ydw.bat.wkflow.business_main.datas.mapper.SendTodoLogMapper;
+import com.ydw.bat.wkflow.business_oa.utils.EmailUtils;
+import com.ydw.bat.wkflow.business_oa.webService.service.WebServiceOAService;
+import com.ydw.bat.wkflow.business_oa.webService.todoContent.NotifyTodoSendContext;
+import com.ydw.bat.wkflow.business_oa.webService.todoResult.NotifyTodoAppResult;
+import net.sf.json.JSONObject;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.amqp.rabbit.annotation.Exchange;
+import org.springframework.amqp.rabbit.annotation.Queue;
+import org.springframework.amqp.rabbit.annotation.QueueBinding;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.amqp.support.AmqpHeaders;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.messaging.Message;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Component
+public class SendDoneMQService {
+
+ private static final Logger logger = LoggerFactory.getLogger(SendDoneMQService.class);
+
+ @Autowired
+ private CreateMQService convertMq;
+
+ @Autowired
+ private EmailUtils emailUtils;
+
+ @Autowired
+ private WebServiceOAService webServiceOAService;
+
+ @Autowired
+ private SendTodoLogMapper sendTodoLogMapper;
+
+ @Autowired
+ private LawsUserInfoService lawsUserInfoService;
+
+ @RabbitListener(bindings = @QueueBinding(
+ value = @Queue(value = "createMQDone_SQ_GSAR", durable = "true"),
+ exchange = @Exchange(value = "sendDone-exchange_MQ_GSAR", ignoreDeclarationExceptions = "true"),
+ key = "sendDone-key_MQ_GSAR"))
+ public void createMQDone(NotifyTodoSendContext object, Message message, Channel channel) throws Exception{
+ try{
+ try{
+ Thread.sleep(5000);
+ insertOrUpdateInfo(object);
+ }catch(InterruptedException e){
+ logger.error(e.toString());
+ Thread.currentThread().interrupt();
+ }
+ } catch (Exception e) {
+ logger.error("消息队列进入添加数据方法前失败！");
+ logger.error(e.getMessage(),e);
+ }finally {
+ Long tag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG);
+ channel.basicAck(tag,false);
+ logger.debug("消息确认成功！！！！！！！！！");
+ }
+
+ }
+
+ public void insertOrUpdateInfo(NotifyTodoSendContext object) throws Exception {
+ try {
+ NotifyTodoAppResult todoAppResult = webServiceOAService.setTodoDone(object);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
+
+ if(todoAppResult.getSIGN().equals("0") || todoAppResult.getMASSAGE().equals("操作成功")){
+ logger.info("--------------------------成功发送 ESP 已办任务----------------------------");
+ QueryWrapper wrapper = new QueryWrapper();
+ wrapper.eq("TODO_ID",object.getModelId());
+ wrapper.eq("MSG_TYPE","1");
+ List list = sendTodoLogMapper.selectList(wrapper);
+ if(!list.isEmpty()) {
+ SendTodoLog sendTodoLog = list.get(0);
+ sendTodoLog.setOperMesg(todoAppResult.getMASSAGE());
+ sendTodoLog.setMsgStatus("2");
+ sendTodoLog.setCreateTime(sdf.format(new Date()));
+ sendTodoLog.setUpdateTime(sdf.format(new Date()));
+ sendTodoLogMapper.updateById(sendTodoLog);
+ }else {
+ sendTodoSave(object, sdf, "2",todoAppResult.getMASSAGE());
+ }
+ }else {
+ logger.error("ESP 发送待办任务异常 :" + "SIGN: "+todoAppResult.getSIGN()+",MASSAGE: "+todoAppResult.getMASSAGE());
+ // 重试发送待办
+ logger.info("重试发送待办");
+ this.restartSendMq(object,todoAppResult.getMASSAGE());
+ }
+ }catch (Exception e){
+ logger.error(e.getMessage(),e);
+ this.restartSendMq(object, e.getMessage());
+ }
+ }
+
+ public void restartSendMq(NotifyTodoSendContext object,String operMesg) throws Exception{
+ QueryWrapper wrapper = new QueryWrapper();
+ wrapper.eq("TODO_ID",object.getModelId());
+ wrapper.eq("MSG_TYPE","1");
+ List list = sendTodoLogMapper.selectList(wrapper);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
+ if(!list.isEmpty()){
+ SendTodoLog sendTodoLog = list.get(0);
+ int againNumNew = Integer.valueOf(sendTodoLog.getErrNum());
+ if(againNumNew >= 6){
+ // 发送待办 或 发送给管理员邮箱
+ logger.info("发送失败6次,发送给管理员邮箱");
+ List emailList = new ArrayList<>();
+ ResponseMessage byId = lawsUserInfoService.getById("WY8J26MH23");
+ // 占时指定admin用户邮箱
+ emailList.add(byId == null ? "" : (byId.getData().getEmail() != null ? byId.getData().getEmail() : ""));
+ String[] arr = emailList.toArray(new String[emailList.size()]);
+ String title = "OA请求发送失败6次";
+ String countText = "" +
+ "
"+"OA请求发送失败6次,请线下协调处理"+"" +
+ "
"+"OA请求发送失败6次,请线下协调处理"+"