cidBug修复

fs-cid-workflow/src/main/java/com/fs/app/task/CidTask.java

@@ -27,7 +27,7 @@ public class CidTask {
     /**
      * 扫描当前分组下就绪任务，并开启执行
      */
-    @Scheduled(cron = "0 0/1 * * * ?")
+    @Scheduled(cron = "0/30 * * * * ?")
     public void runCidWorkflow() {
         cidWorkflowTaskService.runCidWorkflow();
     }

fs-service/src/main/java/com/fs/aiSipCall/RemoteCommon.java

@@ -15,8 +15,8 @@ public class RemoteCommon {
     /**
      * 远程接口地址前缀
      */
-//    public static final String REMOTE_ADDERSS_PREFIX = "http://129.28.164.235:8899";
-    public static final String REMOTE_ADDERSS_PREFIX = "http://127.0.0.1:8899";
+    public static final String REMOTE_ADDERSS_PREFIX = "http://129.28.164.235:8899";
+//    public static final String REMOTE_ADDERSS_PREFIX = "http://127.0.0.1:8899";
 
     /**
      * 网关列表接口

fs-service/src/main/java/com/fs/company/mapper/CompanyWxClientMapper.java

@@ -84,5 +84,5 @@ public interface CompanyWxClientMapper extends BaseMapper<CompanyWxClient> {
 
     List<CompanyWxClient> getQwAddWxList(@Param("accountIdList") List<Long> accountIdList, @Param("isWeCom") Integer isWeCom);
 
-    List<CompanyWxClient4WorkFlowVO> getQwAddWxList4Workflow(@Param("accountIdList") List<Long> accountIdList, @Param("execStatus") Integer execStatus, @Param("execNodeType") Integer execNodeType);
+    List<CompanyWxClient4WorkFlowVO> getQwAddWxList4Workflow(@Param("accountIdList") List<Long> accountIdList, @Param("execStatus") Integer execStatus, @Param("execNodeType") Integer execNodeType, @Param("cidGroupNo") Integer cidGroupNo);
 }

fs-service/src/main/java/com/fs/company/service/ICompanyWxClientService.java

@@ -75,5 +75,5 @@ public interface ICompanyWxClientService extends IService<CompanyWxClient> {
 
     List<CompanyWxClient> getQwAddWxList(List<Long> accountIdList,Integer isWeCom);
 
-    List<CompanyWxClient4WorkFlowVO> getQwAddWxList4Workflow(List<Long> accountIdList);
+    List<CompanyWxClient4WorkFlowVO> getQwAddWxList4Workflow(List<Long> accountIdList,Integer cidGroupNo);
 }

fs-service/src/main/java/com/fs/company/service/impl/CompanyWxClientServiceImpl.java

@@ -253,7 +253,7 @@ public class CompanyWxClientServiceImpl extends ServiceImpl<CompanyWxClientMappe
      * @return
      */
     @Override
-    public  List<CompanyWxClient4WorkFlowVO> getQwAddWxList4Workflow(List<Long> accountIdList){
-        return baseMapper.getQwAddWxList4Workflow(accountIdList, ExecutionStatusEnum.WAITING.getValue(), NodeTypeEnum.AI_QW_ADD_WX_TASK.getValue());
+    public  List<CompanyWxClient4WorkFlowVO> getQwAddWxList4Workflow(List<Long> accountIdList,Integer cidGroupNo){
+        return baseMapper.getQwAddWxList4Workflow(accountIdList, ExecutionStatusEnum.WAITING.getValue(), NodeTypeEnum.AI_QW_ADD_WX_TASK.getValue(),cidGroupNo);
     }
 }

fs-service/src/main/resources/mapper/company/CompanyWxClientMapper.xml

@@ -202,7 +202,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         inner join company_ai_workflow_exec t3 on t3.business_key = t2.id
         inner join company_ai_workflow_node t4 on t3.current_node_key=t4.node_key
         where t1.is_add = 0 and t1.account_id is not null and t1.is_we_com = 2
-        and t3.current_node_type = #{execNodeType} And t3.status = #{execStatus}
+        and t3.current_node_type = #{execNodeType} And t3.status = #{execStatus} and t3.cid_group_no = #{cidGroupNo}
         <if test="accountIdList != null and !accountIdList.isEmpty()">
             and t1.account_id in <foreach collection="accountIdList" open="(" separator="," close=")" item="item">#{item}</foreach>
         </if>

fs-wx-task/src/main/java/com/fs/app/service/WxTaskService.java

@@ -893,7 +893,7 @@ public class WxTaskService {
         log.info("==========执行申请企微加好友任务开始==========");
         try {
             // 获取需要添加微信的列表
-            List<CompanyWxClient4WorkFlowVO> list = companyWxClientService.getQwAddWxList4Workflow(accountIdList);
+            List<CompanyWxClient4WorkFlowVO> list = companyWxClientService.getQwAddWxList4Workflow(accountIdList,cidGroupNo);
             log.info("申请企微加好友任务需要添加微信的数量：{}", list.size());
             if (list.isEmpty()) {
                 return;
@@ -1329,6 +1329,8 @@ public class WxTaskService {
             List<CompanyWxClient> updateList,
             Map<Long, CompanyWxClient4WorkFlowVO> clientMap) {
 
+        log.info("==========触发后续工作流步骤开始==========");
+
         for (CompanyWxClient client : updateList) {
             CompanyWxClient4WorkFlowVO vo = clientMap.get(client.getAccountId());
             IWorkflowNode node = workflowNodeFactory.createNode(