更新mapper

fs-ai-call-task/src/main/java/com/fs/app/controller/CommonController.java

@@ -1,57 +1,12 @@
 package com.fs.app.controller;
 
 
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSON;
-import com.fs.app.task.qwTask;
-import com.fs.app.taskService.*;
 import com.fs.common.core.domain.R;
-import com.fs.common.core.domain.ResponseResult;
-import com.fs.common.core.redis.RedisCache;
-import com.fs.common.utils.StringUtils;
-import com.fs.company.service.ICompanyService;
-import com.fs.company.vo.RedPacketMoneyVO;
-import com.fs.course.mapper.FsCourseRedPacketLogMapper;
-import com.fs.course.mapper.FsCourseWatchLogMapper;
-import com.fs.course.param.newfs.FsUserCourseAddCompanyUserParam;
-import com.fs.course.service.*;
-import com.fs.course.vo.FsUserCourseVideoQVO;
-import com.fs.his.domain.FsUser;
-import com.fs.his.service.IFsInquiryOrderService;
-import com.fs.his.utils.qrcode.QRCodeUtils;
-import com.fs.qw.domain.QwCompany;
-import com.fs.qw.domain.QwExternalContact;
-import com.fs.qw.domain.QwIpadServerLog;
-import com.fs.qw.domain.QwUser;
-import com.fs.qw.mapper.QwExternalContactMapper;
-import com.fs.qw.mapper.QwUserMapper;
-import com.fs.qw.service.*;
-import com.fs.qwApi.domain.QwExternalContactResult;
-import com.fs.qwApi.service.QwApiService;
-import com.fs.sop.mapper.QwSopLogsMapper;
-import com.fs.sop.mapper.QwSopMapper;
-import com.fs.sop.mapper.SopUserLogsMapper;
-import com.fs.sop.service.*;
-import com.fs.sop.vo.QwSopLogsDoSendListTVO;
-import com.fs.store.service.IFsUserCourseCountService;
-import com.fs.wxwork.dto.WxWorkGetQrCodeDTO;
-import com.fs.wxwork.service.WxWorkService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.fs.app.task.qwTask;
-
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
 
 @Api("公共接口")
 @RestController

fs-ai-call-task/src/main/java/com/fs/app/task/qwTask.java

@@ -1,40 +1,9 @@
 package com.fs.app.task;
 
-import com.fs.app.taskService.*;
-import com.fs.common.utils.PubFun;
-import com.fs.ipad.IpadSendUtils;
-import com.fs.qw.domain.QwExternalContact;
-import com.fs.qw.domain.QwGroupChat;
-import com.fs.qw.domain.QwUser;
-import com.fs.qw.service.*;
-import com.fs.sop.domain.QwSop;
-import com.fs.sop.mapper.QwSopLogsMapper;
-import com.fs.sop.mapper.QwSopMapper;
-import com.fs.sop.service.IQwSopLogsService;
-import com.fs.sop.service.IQwSopTagService;
-import com.fs.sop.service.ISopUserLogsService;
-import com.fs.sop.service.impl.QwSopLogsServiceImpl;
-import com.fs.sop.service.impl.QwSopServiceImpl;
-import com.fs.sop.vo.QwSopLogsDoSendListTVO;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import static com.fs.qw.service.impl.AsyncChatSopService.MAX_GROUP_USER_NUM;
-import static com.fs.qw.service.impl.AsyncChatSopService.MAX_GROUP_NUM;
-
 /**
  * 企业微信SOP定时任务管理类
  * 负责处理各种定时任务，包括SOP规则检查、消息发送、数据清理等

fs-company/src/main/java/com/fs/company/controller/company/CompanyWorkflowController.java

@@ -3,14 +3,18 @@ package com.fs.company.controller.company;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.domain.CompanyWorkflow;
 import com.fs.company.domain.CompanyWorkflowNodeType;
 import com.fs.company.param.CompanyWorkflowSaveParam;
 import com.fs.company.param.CompanyWorkflowUpdateBindWCParam;
 import com.fs.company.service.ICompanyWorkflowService;
+import com.fs.framework.security.LoginUser;
+import com.fs.framework.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -28,6 +32,8 @@ public class CompanyWorkflowController extends BaseController {
 
     @Autowired
     private ICompanyWorkflowService companyWorkflowService;
+    @Autowired
+    private TokenService tokenService;
 
     /**
      * 查询AI工作流列表
@@ -64,6 +70,9 @@ public class CompanyWorkflowController extends BaseController {
     @Log(title = "AI工作流", businessType = BusinessType.INSERT)
     @PostMapping("/save")
     public AjaxResult save(@RequestBody CompanyWorkflowSaveParam param) {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        param.setCompanyId(loginUser.getUser().getCompanyId());
+        param.setCompanyUserId(loginUser.getUser().getUserId());
         Long workflowId = companyWorkflowService.saveCompanyWorkflow(param);
         return AjaxResult.success(workflowId);
     }
@@ -156,5 +165,14 @@ public class CompanyWorkflowController extends BaseController {
     public AjaxResult updateWorkflowBindCompanyUser(@RequestBody CompanyWorkflowUpdateBindWCParam param) {
         return companyWorkflowService.updateWorkflowBindCompanyUser(param);
     }
+    /**
+     * 修改工作流绑定的销售
+     */
+    @GetMapping("/optionList")
+    public R optionList() {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        companyWorkflowService.optionList(loginUser.getCompany().getCompanyId());
+        return R.ok();
+    }
 
 }

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

@@ -51,6 +51,7 @@ public class CompanyWorkflow extends BaseEntity {
     private String startNodeKey;
 
     private String endNodeKey;
+    private Long companyId;
 
     public Boolean isStartNode(String nodeKey) {
         return nodeKey.equals(startNodeKey);

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

@@ -6,6 +6,7 @@ import com.fs.company.domain.CompanyWorkflow;
 import com.fs.company.domain.CompanyWorkflowEdge;
 import com.fs.company.domain.CompanyWorkflowNode;
 import com.fs.company.vo.CompanyWorkflowNodeVoiceVo;
+import com.fs.company.vo.OptionVO;
 import org.apache.ibatis.annotations.Param;
 import org.mapstruct.Mapper;
 
@@ -56,4 +57,6 @@ public interface CompanyWorkflowMapper extends BaseMapper<CompanyWorkflow>  {
     void addAiWorkflowCompanyUserVoice(@Param("workflowId") Long workflowId, @Param("companyUserIds") List<Long> companyUserIds, @Param("nodeKeyAdd") List<String> nodeKeyAdd);
 
     List<CompanyWorkflowNodeVoiceVo> getMyWorkflowNodes(@Param("companyUserId") Long companyUserId);
+
+    List<OptionVO> optionList(@Param("companyId") Long companyId);
 }

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

@@ -31,6 +31,8 @@ public class CompanyWorkflowSaveParam implements Serializable {
 
     /** 画布数据JSON */
     private String canvasData;
+    private Long companyId;
+    private Long companyUserId;
 
     /** 节点列表 */
     private List<CompanyWorkflowNode> nodes;

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

@@ -10,6 +10,7 @@ import com.fs.company.param.CompanyWorkflowUpdateBindWCParam;
 import com.fs.company.vo.CompanyWorkflowExportVO;
 import com.fs.company.vo.CompanyWorkflowNodeVoiceVo;
 import com.fs.company.vo.CompanyWorkflowVO;
+import com.fs.company.vo.OptionVO;
 
 import java.util.List;
 
@@ -88,4 +89,6 @@ public interface ICompanyWorkflowService {
     AjaxResult getBindCompanyUserByWorkflowId(Long workflowId);
 
     List<CompanyWorkflowNodeVoiceVo> getMyWorkflowNodes(Long companyUserId);
+
+    List<OptionVO> optionList(Long companyId);
 }

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

@@ -11,6 +11,7 @@ import com.fs.company.service.ICompanyWorkflowService;
 import com.fs.company.vo.CompanyWorkflowExportVO;
 import com.fs.company.vo.CompanyWorkflowNodeVoiceVo;
 import com.fs.company.vo.CompanyWorkflowVO;
+import com.fs.company.vo.OptionVO;
 import com.fs.enums.NodeTypeEnum;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -359,4 +360,9 @@ public class CompanyWorkflowServiceImpl implements ICompanyWorkflowService {
     public List<CompanyWorkflowNodeVoiceVo> getMyWorkflowNodes(Long companyUserId) {
         return companyWorkflowMapper.getMyWorkflowNodes(companyUserId);
     }
+
+    @Override
+    public List<OptionVO> optionList(Long companyId) {
+        return companyWorkflowMapper.optionList(companyId);
+    }
 }

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

@@ -107,7 +107,9 @@
           and wcv.statu = 0
           and aw.del_flag = 0
     </select>
-
+    <select id="optionList" resultType="com.fs.company.vo.OptionVO">
+        select workflow_id value,workflow_name label from company_ai_workflow where company_id = #{companyId}
+    </select>
 
     <insert id="insertCompanyWorkflow" parameterType="CompanyWorkflow" useGeneratedKeys="true" keyProperty="workflowId">
         insert into company_ai_workflow