fix: 修复收消息异常

approve-core-service/pom.xml

@@ -160,12 +160,12 @@
                     <groupId>com.dragonsoft.dyy</groupId>
                 </exclusion>
             </exclusions>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>com.dragonsoft</groupId>
             <artifactId>dcms-mq-client-model</artifactId>
             <version>1.0-SNAPSHOT</version>
-        </dependency>-->
+        </dependency>
         <!--nosql api依赖结束-->
         <!--kafka-->
         <dependency>

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/IApproveLogBusiness.java

@@ -1,7 +1,6 @@
 package com.dragonsoft.dcuc.approve.business;
 
 import com.dragoninfo.dcuc.duceap.enums.ManageDisposeTypeEnum;
-import com.dragoninfo.mq.client.model.entity.MessageInfoDTO;
 import com.dragonsoft.dcuc.approve.enumresources.ApproveResultEnum;
 import com.dragonsoft.dcuc.approve.enumresources.ApproveWorkFlowOperationEnum;
 import com.dragonsoft.dcuc.approve.enumresources.CommitTypeEnum;
@@ -9,6 +8,7 @@ import com.dragonsoft.dcuc.approve.model.ApprovalInfo;
 import com.dragonsoft.dcuc.approve.model.RiskScheme;
 import com.dragonsoft.dcuc.approve.model.vo.LogDto;
 import com.dragonsoft.duceap.duwf.api.model.ProcessInstanceVO;
+import com.dragonsoft.mq.client.model.entity.MessageInfoDTO;
 
 import java.util.Date;
 import java.util.Map;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/impl/ApproveBusinessImpl.java

@@ -11,8 +11,6 @@ import com.dragoninfo.dcuc.common.Constants;
 import com.dragoninfo.dcuc.common.utils.LangUtil;
 import com.dragoninfo.dcuc.common.utils.ResponseUtil;
 import com.dragoninfo.duceap.commons.util.kafka.KafkaServer;
-import com.dragoninfo.mq.client.model.entity.MessageInfoVo;
-import com.dragoninfo.mq.client.model.entity.RequestVo;
 import com.dragonsoft.dcuc.approve.business.IApproveBusiness;
 import com.dragonsoft.dcuc.approve.business.IDcucAuthBusiness;
 import com.dragonsoft.dcuc.approve.business.IWorkFlowBusiness;
@@ -45,6 +43,8 @@ import com.dragonsoft.duceap.duwf.api.model.CandidateVo;
 import com.dragonsoft.duceap.duwf.api.model.ProcessInstanceVO;
 import com.dragonsoft.duceap.duwf.api.model.TaskHistoryDetailVo;
 import com.dragonsoft.duceap.workflow.enums.WorkFlowOprationEnum;
+import com.dragonsoft.mq.client.model.vo.MessageInfoReqVo;
+import com.dragonsoft.mq.client.model.vo.MessageInfoVo;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -130,7 +130,7 @@ public class ApproveBusinessImpl implements IApproveBusiness {
         String dateFormat = DateUtils.getDateFormat(DateConst.DB_STORE_TIME);
         String uuid = UUIDUtils.getUUID();
         //流程结束且是同意操作才发消息
-        RequestVo requestVo = new RequestVo();
+        MessageInfoReqVo requestVo = new MessageInfoReqVo();
         MessageInfoVo messageInfoVo = new MessageInfoVo();
         String processInstanceId = approveMessageInfoDTO.getProcessInstanceId();
 

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/impl/ApproveLogBusinessImpl.java

@@ -11,9 +11,6 @@ import com.dragoninfo.dcuc.duceap.enums.OperateDisposeTypeEnum;
 import com.dragoninfo.dcuc.duceap.enums.RequestDisposeTypeEnum;
 import com.dragoninfo.dcuc.duceap.enums.SchemeTypeEnum;
 import com.dragoninfo.duceap.commons.util.kafka.KafkaServer;
-import com.dragoninfo.mq.client.model.entity.MessageInfoDTO;
-import com.dragoninfo.mq.client.model.entity.MessageInfoVo;
-import com.dragoninfo.mq.client.model.entity.RequestVo;
 import com.dragonsoft.dcuc.approve.business.IApproveLogBusiness;
 import com.dragonsoft.dcuc.approve.constants.Constants;
 import com.dragonsoft.dcuc.approve.enumresources.*;
@@ -38,6 +35,9 @@ import com.dragonsoft.duceap.duwf.api.model.OutgoingVo;
 import com.dragonsoft.duceap.duwf.api.model.ProcessInstanceVO;
 import com.dragonsoft.duceap.duwf.api.model.TaskDefinitionVo;
 import com.dragonsoft.duceap.workflow.client.WorkflowClientFactory;
+import com.dragonsoft.mq.client.model.entity.MessageInfoDTO;
+import com.dragonsoft.mq.client.model.vo.MessageInfoReqVo;
+import com.dragonsoft.mq.client.model.vo.MessageInfoVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -699,7 +699,7 @@ public class ApproveLogBusinessImpl implements IApproveLogBusiness {
 
         List<MessageInfoVo> messageInfoVos = new ArrayList<>();
         messageInfoVos.add(messageInfoVo);
-        RequestVo requestVo = new RequestVo();
+        MessageInfoReqVo requestVo = new MessageInfoReqVo();
         //设置消息
         requestVo.setMessages(messageInfoVos);
         requestVo.setTopic(kafkaProperties.getApproveLogTopic());

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/impl/WorkFlowBusinessImpl.java

@@ -14,6 +14,7 @@ import com.dragonsoft.dcuc.approve.model.resp.ApproveWorkflowProcessTypeVo;
 import com.dragonsoft.dcuc.approve.model.resp.TaskOperateRespVO;
 import com.dragonsoft.dcuc.approve.model.resp.TaskOutgoingVo;
 import com.dragonsoft.dcuc.approve.properties.ApproveProperties;
+import com.dragonsoft.dcuc.approve.properties.WorkFlowProperties;
 import com.dragonsoft.duceap.base.exception.ApplicationException;
 import com.dragonsoft.duceap.core.entity.page.PageRequest;
 import com.dragonsoft.duceap.core.search.Searchable;
@@ -47,6 +48,9 @@ public class WorkFlowBusinessImpl implements IWorkFlowBusiness {
     @Autowired
     private ApproveProperties approveProperties;
 
+    @Autowired
+    private WorkFlowProperties workFlowProperties;
+
     @Override
     public List<ApproveCommentVo> getProcessDefPath(String processInstanceId) {
         //获取流程图对象
@@ -117,9 +121,8 @@ public class WorkFlowBusinessImpl implements IWorkFlowBusiness {
 
     @Override
     public List<ApproveWorkflowProcessTypeVo> queryProcessTypeList() {
-        ApproveProperties.Workflow workflow = approveProperties.getWorkflow();
 
-        String processTypeCode = workflow.getProcessTypeCode();
+        String processTypeCode = workFlowProperties.getProcessTypeCode();
 
         //根据流程类别code获取流程类别信息
         WorkflowProcesstypeVo workflowProcesstypeVo = queryProcessType(processTypeCode);

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/msg/LogListener.java

@@ -1,9 +1,9 @@
 package com.dragonsoft.dcuc.approve.msg;
 
 import com.alibaba.fastjson.JSON;
-import com.dragoninfo.mq.client.model.entity.MessageInfoDTO;
 import com.dragonsoft.dcuc.approve.business.IApproveLogBusiness;
 import com.dragonsoft.duceap.commons.util.collections.CollectionUtils;
+import com.dragonsoft.mq.client.model.entity.MessageInfoDTO;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/properties/ApproveProperties.java

@@ -12,10 +12,6 @@ import org.springframework.stereotype.Component;
 @Component
 @ConfigurationProperties(prefix = "approve")
 public class ApproveProperties {
-    /**
-     * 工作流
-     */
-    Workflow workflow;
     /**
      * 科信人员列表
      */
@@ -38,9 +34,4 @@ public class ApproveProperties {
      */
     private String authServiceUrl;
 
-    @Data
-    public static class Workflow {
-        private String processTypeCode = "approve";
-    }
-
 }

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/properties/WorkFlowProperties.java

@@ -0,0 +1,24 @@
+package com.dragonsoft.dcuc.approve.properties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author huangzqa
+ * @date 2021/7/23
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "approve.workflow")
+public class WorkFlowProperties {
+
+    /**
+     * 流程类型
+     */
+    private String processTypeCode = "approve";
+}

approve-core-service/src/main/resources/application-base.yml

@@ -73,6 +73,8 @@ duceap:
     packagePath: com.dragonsoft.dcuc.approve.facade.api
 approve:
   app-code: Y-120000000000-0043
+  workflow:
+    process-type-code: approve
   kafka:
     enable: true
     app-key: dcuc69000787