Merge remote-tracking branch 'origin/master'

fs-company/src/main/java/com/fs/company/controller/companyWorkflow/CompanyTagTemplateBindingController.java

@@ -123,6 +123,16 @@ public class CompanyTagTemplateBindingController extends BaseController {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         return tagTemplateBindingService.batchBindLobsterTag(
                 loginUser.getCompany().getCompanyId(), loginUser.getUsername(),
-                param.getQwCorpId(), param.getUserIds(), param.getTagCodes(),loginUser.getUser().getUserId());
+                param.getQwCorpId(), param.getUserIds(), param.getTagCodes(),loginUser.getUser().getUserId(),
+                param.getExternalUserId());
     }
+    /**
+     * 企微客户获取龙虾标签
+     */
+    @PostMapping("/lobsterTags")
+    public AjaxResult lobsterTags(@RequestBody List<Long> userIds) {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        return tagTemplateBindingService.lobsterTags(userIds,loginUser.getUser().getUserId(),loginUser.getCompany().getCompanyId());
+    }
+
 }

fs-ipad-task/src/main/java/com/fs/app/task/SendMsg.java

@@ -18,10 +18,7 @@ import com.fs.course.domain.FsCoursePlaySourceConfig;
 import com.fs.course.service.IFsCoursePlaySourceConfigService;
 import com.fs.framework.aspectj.SopTenantDataSourceAspect;
 import com.fs.ipad.vo.BaseVo;
-import com.fs.qw.domain.QwIpadServer;
-import com.fs.qw.domain.QwPushCount;
-import com.fs.qw.domain.QwRestrictionPushRecord;
-import com.fs.qw.domain.QwUser;
+import com.fs.qw.domain.*;
 import com.fs.qw.mapper.QwIpadServerMapper;
 import com.fs.qw.mapper.QwPushCountMapper;
 import com.fs.qw.mapper.QwRestrictionPushRecordMapper;
@@ -29,6 +26,7 @@ import com.fs.qw.mapper.QwUserMapper;
 import com.fs.qw.service.impl.AsyncSopTestService;
 import com.fs.qw.vo.QwSopCourseFinishTempSetting;
 import com.fs.qw.vo.QwSopTempSetting;
+import com.fs.qwApi.Result.QwGetMomentTaskGResult;
 import com.fs.sop.domain.QwSopLogs;
 import com.fs.sop.mapper.QwSopLogsMapper;
 import com.fs.sop.service.IQwSopLogsService;
@@ -425,36 +423,65 @@ public class SendMsg {
         log.info("销售执行完成：{}, 耗时：{}", user.getQwUserName(), end3 - start3);
     }
 
-    @Scheduled(fixedDelay = 10000*60*30) // 每30min执行一次
+    private static final Integer LOBSTER_EXECUTE_STATUS = 0;
+    @Scheduled(fixedDelay = 1000*60
+            *30
+    ) // 每30mIn执行一次
     public void sendLobsterQwMsg(){
         log.info("开始龙虾发送企微消息");
+//        sopTenantDataSourceAspect.switchTenant(tenantId);
         List<CompanyWorkflowLobsterTask> companyWorkflowLobsterTasks = companyWorkflowLobsterTaskMapper.selectList(new LambdaQueryWrapper<CompanyWorkflowLobsterTask>().eq(CompanyWorkflowLobsterTask::getDelFlag, 0)
-                .between(CompanyWorkflowLobsterTask::getSendTime, LocalDateTime.now().minusMinutes(30), LocalDateTime.now())
+                .between(CompanyWorkflowLobsterTask::getSendTime, LocalDateTime.now().minusMinutes(30), LocalDateTime.now()
+                        ).eq(CompanyWorkflowLobsterTask::getExecuteStatus, LOBSTER_EXECUTE_STATUS)
         );
+        log.info("开始龙虾发送企微消息,数量：{}",companyWorkflowLobsterTasks.size());
+        if (companyWorkflowLobsterTasks.isEmpty()){
+            log.info("龙虾没有需要发送的qw消息");
+            return;
+        }
         for (CompanyWorkflowLobsterTask task : companyWorkflowLobsterTasks){
-            QwUser qwUser = qwUserMapper.selectQwUserById(task.getQwUserId());
-            WxLoginResp login = isLogin(qwUser.getUid(), qwUser.getServerId());
-            WxWorkSendTextMsgDTO dto = new WxWorkSendTextMsgDTO();
+            QwUser qwUser = qwUserMapper.selectById(task.getQwUserId());
+
+            //只拼一个发消息的逻辑
+            QwSopCourseFinishTempSetting.Setting content = new QwSopCourseFinishTempSetting.Setting();
+            content.setValue(task.getTaskContent());
+            content.setContentType("1");
+
+            QwSopLogs qwSopLogs = new QwSopLogs();
+            qwSopLogs.setId(String.valueOf(task.getId()));
+            qwSopLogs.setSendType(1);
+            qwSopLogs.setExternalUserId(task.getExternalUserId());
+
             BaseVo vo = new BaseVo();
-            vo.setUuid(qwUser.getUid());
+            vo.setCorpCode(qwUser.getCorpId());
             vo.setCorpId(qwUser.getCorpId());
-            vo.setCorpCode(login.getUser_info().getObject().getScorp_id());
-            vo.setServerId(qwUser.getServerId());
-            dto.setUuid(qwUser.getUid());
-            dto.setSend_userid(userIds(vo));//目前没接群聊
-            dto.setContent(task.getTaskContent());
-            dto.setIsRoom(false);
-            WxWorkResponseDTO<WxWorkSendTextMsgRespDTO> wxWorkSendTextMsgRespDTOWxWorkResponseDTO = wxWorkService.SendTextMsg(dto, qwUser.getServerId());
+            // 判断这个企微是否需要发送
+            if (!sendServer.isSend(qwUser, vo)) {
+                log.info("当前这个企微不需要发送 数据{}",qwUser);
+                return;
+            }
 
-            log.info("开始发送企微消息,内容:{}", wxWorkSendTextMsgRespDTOWxWorkResponseDTO);
-            //todo 发企微,
-            if (wxWorkSendTextMsgRespDTOWxWorkResponseDTO.getErrcode()==0){
+            sendServer.send(content, qwUser, qwSopLogs, null, vo);
+//            WxLoginResp login = isLogin(qwUser.getUid(), qwUser.getServerId());
+//            WxWorkSendTextMsgDTO dto = new WxWorkSendTextMsgDTO();
+//            vo.setUuid(qwUser.getUid());
+//            vo.setCorpId(qwUser.getCorpId());
+//            vo.setCorpCode(login.getUser_info().getObject().getScorp_id());
+//            vo.setServerId(qwUser.getServerId());
+//            dto.setUuid(qwUser.getUid());
+//            dto.setSend_userid(userIds(vo));//目前没接群聊
+//            dto.setContent(task.getTaskContent());
+//            dto.setIsRoom(false);
+//            WxWorkResponseDTO<WxWorkSendTextMsgRespDTO> wxWorkSendTextMsgRespDTOWxWorkResponseDTO = wxWorkService.SendTextMsg(dto, qwUser.getServerId());
+            if (content.getSendStatus() != 2) {
+                //todo 发送成功记录日志 insert日志表！！！
                 task.setExecuteStatus(2);
-                log.info("企微发送成功:{}", task.getId());
             }else {
                 task.setExecuteStatus(3);
-                log.info("企微发送失败:{}", task.getId());
+
             }
+            log.info("开始发送企微消息,内容:{}",content );
+
         }
         companyWorkflowLobsterTaskMapper.updateTaskListExecuteStatus(companyWorkflowLobsterTasks);
 

fs-qw-api-msg/src/main/java/com/fs/app/controller/QwMsgController.java

@@ -383,10 +383,10 @@ public class QwMsgController {
                         final String finalContent = content;
                         if (2000000000000000L-receiver>0){
                             log.info("id:{}, 客户发送", id);
-//                            aiHookService.qwHookNotifyAiReply(id,sender,finalContent,wxWorkMsgResp.getUuid(),wxWorkMessageDTO.getMsgtype(),tenantId);
+                            aiHookService.qwHookNotifyAiReply(id,sender,finalContent,wxWorkMsgResp.getUuid(),wxWorkMessageDTO.getMsgtype(),tenantId);
                             // ====== Qdrant RAG AI 回复（替代 FastGPT） ======
-                            qdrantRagAiReply(id, sender, finalContent, wxWorkMsgResp.getUuid(),
-                                    wxWorkMessageDTO.getMsgtype(), tenantId, serverId);
+//                            qdrantRagAiReply(id, sender, finalContent, wxWorkMsgResp.getUuid(),
+//                                    wxWorkMessageDTO.getMsgtype(), tenantId, serverId);
                         }else {
                             log.info("销售发送");
                             aiHookService.qwHookNotifyAddMsgNew(id,receiver,content,wxWorkMsgResp.getUuid(),1);

fs-service/src/main/java/com/fs/company/domain/CompanyWorkflowLobsterTask.java

@@ -86,4 +86,7 @@ public class CompanyWorkflowLobsterTask extends BaseEntity {
     private Long qwUserId; // 企微用户id
 
     private Long bindingId;
+
+    /** 企微外部联系人ID */
+    private String externalUserId;
 }

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

@@ -5,6 +5,7 @@ import com.fs.company.domain.CompanyLobsterTagUserRel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 public interface CompanyLobsterTagUserRelMapper extends BaseMapper<CompanyLobsterTagUserRel> {
 
@@ -12,4 +13,5 @@ public interface CompanyLobsterTagUserRelMapper extends BaseMapper<CompanyLobste
 
     void updateBatchRelBybinding(@Param("id") Long id,@Param("flag") Integer unDelFlag);
 
+    Map<String,String> selectLobsterTagsByExId(@Param("userIds") List<Long> userIds, @Param("userId") Long userId, @Param("companyId") Long companyId);
 }

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

@@ -13,5 +13,5 @@ public interface CompanyWorkflowLobsterEdgeMapper extends BaseMapper<CompanyWork
 
     List<CompanyWorkflowLobsterEdge> selectByWorkflowId(@Param("workflowId") Long workflowId);
 
-    int updateById(@Param("entity") CompanyWorkflowLobsterEdge entity);
+//    int updateById(@Param("entity") CompanyWorkflowLobsterEdge entity);
 }

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

@@ -13,5 +13,5 @@ public interface CompanyWorkflowLobsterVariableMapper extends BaseMapper<Company
 
     List<CompanyWorkflowLobsterVariable> selectByWorkflowId(@Param("workflowId") Long workflowId);
 
-    int updateById(@Param("entity") CompanyWorkflowLobsterVariable entity);
+//    int updateById(@Param("entity") CompanyWorkflowLobsterVariable entity);
 }

fs-service/src/main/java/com/fs/company/param/BatchBindLobsterTagParam.java

@@ -22,5 +22,6 @@ public class BatchBindLobsterTagParam implements Serializable {
     /** 企微公司ID */
     private String qwCorpId;
 
-
+    /** 企微外部联系人ID */
+    private String externalUserId;
 }

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

@@ -53,5 +53,7 @@ public interface ICompanyTagTemplateBindingService {
     /**
      * 批量添加龙虾标签给企微客户
      */
-    AjaxResult batchBindLobsterTag(Long companyId, String userName, String qwCorpId, List<Long> externalContactIds, List<String> tagCodes,Long companyUserId);
+    AjaxResult batchBindLobsterTag(Long companyId, String userName, String qwCorpId, List<Long> externalContactIds, List<String> tagCodes,Long companyUserId,String externalUserId);
+
+    AjaxResult lobsterTags(List<Long> userIds, Long userId, Long companyId);
 }

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

@@ -321,7 +321,7 @@ public class CompanyTagTemplateBindingServiceImpl implements ICompanyTagTemplate
     @Override
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult batchBindLobsterTag(Long companyId, String userName, String qwCorpId, List<Long> externalContactIds,
-                                           List<String> tagCodes,Long companyUserId) {
+                                           List<String> tagCodes,Long companyUserId,String externalUserId) {
         if (externalContactIds == null || externalContactIds.isEmpty()) {
             return AjaxResult.error("请勾选需要添加龙虾标签的客户");
         }
@@ -394,7 +394,8 @@ public class CompanyTagTemplateBindingServiceImpl implements ICompanyTagTemplate
                         task.setCompanyId(companyId).setCompanyUserId(companyUserId).setCorpId(qwCorpId)
                                 .setTemplateId(binding.getTemplateId()).setTaskName(binding.getTemplateName())
                                 .setTaskType(2).setTaskContent(node.getGreetingConfig()).setTaskName("龙虾企微发消息")
-                                .setQwUserId(qwUserId).setBindingId(binding.getId()).setLobsterNodeId(node.getId());
+                                .setQwUserId(qwUserId).setBindingId(binding.getId()).setLobsterNodeId(node.getId())
+                                .setExternalUserId(externalUserId);
                         task.setSendTime(getSendTimeNode(node));
                         tasks.add(task);
                     });
@@ -409,6 +410,13 @@ public class CompanyTagTemplateBindingServiceImpl implements ICompanyTagTemplate
         return AjaxResult.success("已为 " + externalContactIds.size() + " 个客户添加 " + targetBindings.size() + " 个龙虾标签");
     }
 
+    @Override
+    public AjaxResult lobsterTags(List<Long> userIds, Long userId, Long companyId) {
+
+
+        return AjaxResult.success(companyLobsterTagUserRelMapper.selectLobsterTagsByExId( userIds,  userId,  companyId));
+    }
+
     private LocalDateTime getSendTimeNode(CompanyWorkflowLobsterNode node) {
         Integer days = Integer.valueOf(node.getNodeCode().substring(4));
         LocalDate date = LocalDate.now().plusDays(days);

fs-service/src/main/java/com/fs/qw/service/impl/QwUserServiceImpl.java

@@ -1310,8 +1310,8 @@ public class QwUserServiceImpl implements IQwUserService
         WxWorkSetCallbackUrlDTO wxWorkSetCallbackUrlDTO = new WxWorkSetCallbackUrlDTO();
 
         System.out.println("回调地址"+"http://saasqwapimsg.ylrzcloud.com/msg/callback/"+serverId + "/"+loginParam.getTenantId());
-//        wxWorkSetCallbackUrlDTO.setUrl("http://saasqwapimsg.ylrzcloud.com/msg/callback/"+serverId+ "/"+loginParam.getTenantId());
-        wxWorkSetCallbackUrlDTO.setUrl("http://wf89b6de.natappfree.cc/msg/callback/"+serverId+ "/"+loginParam.getTenantId());
+        wxWorkSetCallbackUrlDTO.setUrl("http://saasqwapimsg.ylrzcloud.com/msg/callback/"+serverId+ "/"+loginParam.getTenantId());
+//        wxWorkSetCallbackUrlDTO.setUrl("http://wf89b6de.natappfree.cc/msg/callback/"+serverId+ "/"+loginParam.getTenantId());
         wxWorkSetCallbackUrlDTO.setUuid(data.getUuid());
         wxWorkService.SetCallbackUrl(wxWorkSetCallbackUrlDTO,serverId);
 

fs-service/src/main/resources/application-dev.yml

@@ -7,15 +7,15 @@ spring:
     # redis 配置
     redis:
         # 地址
-        host: localhost
-#        host: 192.168.0.245
+#        host: localhost
+        host: 192.168.0.245
         # 端口，默认为6379
         port: 6379
         # 数据库索引
         database: 0
         # 密码
-        password:
-#        password: Ylrztek250218!3@.
+#        password:
+        password: Ylrztek250218!3@.
         # 连接超时时间
         timeout: 20s
         lettuce:

fs-service/src/main/resources/db/tenant-initData.sql

@@ -1,4 +1,4 @@
-
+
 
 INSERT INTO `sys_dept` (`dept_id`, `parent_id`, `ancestors`, `dept_name`, `order_num`, `leader`, `phone`, `email`, `status`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (1, 0, '0', '总公司', 1, 'admin', '', '', '0', '0', 'admin', '2021-11-24 23:26:40', 'admin', '2025-03-23 15:53:14');
 

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

@@ -25,5 +25,10 @@
     <update id="updateBatchRelBybinding">
         update company_lobster_tag_user_rel set del_flag = #{flag} where binding_id = #{id}
     </update>
+    <select id="selectLobsterTagsByExId" resultType="java.util.Map">
+        select b.id , b.tag_name
+        from
+            company_tag_template_binding b
+    </select>
 
 </mapper>

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

@@ -52,22 +52,22 @@
         order by sort_no asc
     </select>
 
-    <update id="updateById">
-        update company_workflow_lobster_edge
-        <trim prefix="set" suffixOverrides=",">
-            <if test="entity.edgeKey != null">edge_key = #{entity.edgeKey},</if>
-            <if test="entity.sourceNodeCode != null">source_node_code = #{entity.sourceNodeCode},</if>
-            <if test="entity.targetNodeCode != null">target_node_code = #{entity.targetNodeCode},</if>
-            <if test="entity.sourcePort != null">source_port = #{entity.sourcePort},</if>
-            <if test="entity.targetPort != null">target_port = #{entity.targetPort},</if>
-            <if test="entity.edgeLabel != null">edge_label = #{entity.edgeLabel},</if>
-            <if test="entity.edgeColor != null">edge_color = #{entity.edgeColor},</if>
-            <if test="entity.conditionExpr != null">condition_expr = #{entity.conditionExpr},</if>
-            <if test="entity.sortNo != null">sort_no = #{entity.sortNo},</if>
-            <if test="entity.updateBy != null">update_by = #{entity.updateBy},</if>
-            <if test="entity.updateTime != null">update_time = #{entity.updateTime},</if>
-        </trim>
-        where id = #{entity.id}
-    </update>
+<!--    <update id="updateById">-->
+<!--        update company_workflow_lobster_edge-->
+<!--        <trim prefix="set" suffixOverrides=",">-->
+<!--            <if test="entity.edgeKey != null">edge_key = #{entity.edgeKey},</if>-->
+<!--            <if test="entity.sourceNodeCode != null">source_node_code = #{entity.sourceNodeCode},</if>-->
+<!--            <if test="entity.targetNodeCode != null">target_node_code = #{entity.targetNodeCode},</if>-->
+<!--            <if test="entity.sourcePort != null">source_port = #{entity.sourcePort},</if>-->
+<!--            <if test="entity.targetPort != null">target_port = #{entity.targetPort},</if>-->
+<!--            <if test="entity.edgeLabel != null">edge_label = #{entity.edgeLabel},</if>-->
+<!--            <if test="entity.edgeColor != null">edge_color = #{entity.edgeColor},</if>-->
+<!--            <if test="entity.conditionExpr != null">condition_expr = #{entity.conditionExpr},</if>-->
+<!--            <if test="entity.sortNo != null">sort_no = #{entity.sortNo},</if>-->
+<!--            <if test="entity.updateBy != null">update_by = #{entity.updateBy},</if>-->
+<!--            <if test="entity.updateTime != null">update_time = #{entity.updateTime},</if>-->
+<!--        </trim>-->
+<!--        where id = #{entity.id}-->
+<!--    </update>-->
 
 </mapper>

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

@@ -133,25 +133,25 @@
         set del_flag = #{flag}
         where binding_id = #{id}
     </update>
+
+
     <update id="updateTaskListExecuteStatus">
-        update company_workflow_lobster_task
-        <foreach item="item" collection="list" separator="," open="(" close=")" index="index">
+        <foreach collection="list" item="item" separator=";">
+            update company_workflow_lobster_task
             set execute_status = #{item.executeStatus}
-            where
-                id =
-            #{item.id}
+            where id = #{item.id}
         </foreach>
     </update>
 
     <insert id="batchInsert">
         insert into company_workflow_lobster_task
         (company_id, template_id, task_name, task_type, task_content,
-         corp_id,create_by, create_time, company_user_id, lobster_node_id, send_time,qw_user_id,binding_id)
+         corp_id,create_by, create_time, company_user_id, lobster_node_id, send_time,qw_user_id,binding_id, external_user_id)
         values
         <foreach collection="list" item="item" separator=",">
             (#{item.companyId}, #{item.templateId}, #{item.taskName}, #{item.taskType}, #{item.taskContent},
              #{item.corpId},#{item.createBy}, #{item.createTime},
-            #{item.companyUserId}, #{item.lobsterNodeId},#{item.sendTime},#{item.qwUserId},#{item.bindingId}
+            #{item.companyUserId}, #{item.lobsterNodeId},#{item.sendTime},#{item.qwUserId},#{item.bindingId},#{item.externalUserId}
              )
         </foreach>
     </insert>

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

@@ -27,20 +27,20 @@
         order by id asc
     </select>
 
-    <update id="updateById">
-        update company_workflow_lobster_variable
-        <trim prefix="set" suffixOverrides=",">
-            <if test="entity.varCode != null">var_code = #{entity.varCode},</if>
-            <if test="entity.varName != null">var_name = #{entity.varName},</if>
-            <if test="entity.varType != null">var_type = #{entity.varType},</if>
-            <if test="entity.sourceType != null">source_type = #{entity.sourceType},</if>
-            <if test="entity.required != null">required = #{entity.required},</if>
-            <if test="entity.defaultValue != null">default_value = #{entity.defaultValue},</if>
-            <if test="entity.description != null">description = #{entity.description},</if>
-            <if test="entity.updateBy != null">update_by = #{entity.updateBy},</if>
-            <if test="entity.updateTime != null">update_time = #{entity.updateTime},</if>
-        </trim>
-        where id = #{entity.id}
-    </update>
+<!--    <update id="updateById">-->
+<!--        update company_workflow_lobster_variable-->
+<!--        <trim prefix="set" suffixOverrides=",">-->
+<!--            <if test="entity.varCode != null">var_code = #{entity.varCode},</if>-->
+<!--            <if test="entity.varName != null">var_name = #{entity.varName},</if>-->
+<!--            <if test="entity.varType != null">var_type = #{entity.varType},</if>-->
+<!--            <if test="entity.sourceType != null">source_type = #{entity.sourceType},</if>-->
+<!--            <if test="entity.required != null">required = #{entity.required},</if>-->
+<!--            <if test="entity.defaultValue != null">default_value = #{entity.defaultValue},</if>-->
+<!--            <if test="entity.description != null">description = #{entity.description},</if>-->
+<!--            <if test="entity.updateBy != null">update_by = #{entity.updateBy},</if>-->
+<!--            <if test="entity.updateTime != null">update_time = #{entity.updateTime},</if>-->
+<!--        </trim>-->
+<!--        where id = #{entity.id}-->
+<!--    </update>-->
 
 </mapper>