个微

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

@@ -84,9 +84,11 @@ public class CompanyWxAccountController extends BaseController
     @PreAuthorize("@ss.hasPermi('company:companyWx:add')")
     @Log(title = "企微账号", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CompanyWxAccount companyWxEnterpriseAccount)
-    {
-        return toAjax(companyWxAccountService.insertCompanyWxAccount(companyWxEnterpriseAccount));
+    public AjaxResult add(@RequestBody CompanyWxAccount account){
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        account.setCompanyId(loginUser.getCompany().getCompanyId());
+        account.setCompanyUserId(loginUser.getUser().getUserId());
+        return toAjax(companyWxAccountService.insertCompanyWxAccount(account));
     }
 
     /**

fs-service/src/main/java/com/fs/aicall/service/AiCallService.java

@@ -22,10 +22,9 @@ public class AiCallService {
 
 
     private final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-    private AiCallUtils utils;
 
     public String getDialogUrl(Long companyId){
-        return utils.getConfig(companyId).getDialogUrl();
+        return AiCallUtils.getConfig(companyId).getDialogUrl();
     }
 
 
@@ -60,27 +59,27 @@ public class AiCallService {
      * 登录
      */
     public String getToken(Long companyId){
-        return utils.send("login", e -> e.getString("token"), companyId);
+        return AiCallUtils.send("login", e -> e.getString("token"), companyId);
     }
 
     /**
      * 获取机器人列表
      */
     public List<GetairobotResult> getairobotlist(Long companyId){
-        return utils.send("getairobotlist", getList(GetairobotResult.class), companyId);
+        return AiCallUtils.send("getairobotlist", getList(GetairobotResult.class), companyId);
     }
 
     /**
      * 获取话术列表
      */
     public List<EditDialogResult> queryDialog(Long companyId){
-        return utils.send("queryDialog", getList("data", EditDialogResult.class), companyId);
+        return AiCallUtils.send("queryDialog", getList("data", EditDialogResult.class), companyId);
     }
     /**
      * 获取话术详情
      */
     public EditDialogResult getDialog(Long companyId){
-        return utils.send("getDialog", getObj(EditDialogResult.class), companyId);
+        return AiCallUtils.send("getDialog", getObj(EditDialogResult.class), companyId);
     }
 
     /**
@@ -88,7 +87,7 @@ public class AiCallService {
      * @param param 话术参数
      */
     public EditDialogResult editDialog(EditDialogDomain param, Long companyId){
-        return utils.send("editDialog", OBJECT_MAPPER.valueToTree(param), getObj(EditDialogResult.class), companyId);
+        return AiCallUtils.send("editDialog", OBJECT_MAPPER.valueToTree(param), getObj(EditDialogResult.class), companyId);
     }
 
     /**
@@ -96,41 +95,41 @@ public class AiCallService {
      * @param param 参数
      */
     public CalltaskcreateaiCustomizeResult calltaskcreateaiCustomize(CalltaskcreateaiCustomizeDomain param, Long companyId){
-        return utils.send("calltaskcreateaiCustomize", OBJECT_MAPPER.valueToTree(param), getObj(CalltaskcreateaiCustomizeResult.class), companyId);
+        return AiCallUtils.send("calltaskcreateaiCustomize", OBJECT_MAPPER.valueToTree(param), getObj(CalltaskcreateaiCustomizeResult.class), companyId);
     }
     /**
      * 查询外呼任务状态信息
      * @param param 参数
      */
     public QueryCallTaskInfoResult queryCallTaskInfo(TaskInfo param, Long companyId){
-        return utils.send("queryCallTaskInfo", OBJECT_MAPPER.valueToTree(param), getObj(QueryCallTaskInfoResult.class), companyId);
+        return AiCallUtils.send("queryCallTaskInfo", OBJECT_MAPPER.valueToTree(param), getObj(QueryCallTaskInfoResult.class), companyId);
     }
     /**
      * 启动外呼任务
      * @param param 参数
      */
     public TaskInfo startCallTask(TaskInfo param, Long companyId){
-        return utils.send("startCallTask", OBJECT_MAPPER.valueToTree(param), getObj(TaskInfo.class), companyId);
+        return AiCallUtils.send("startCallTask", OBJECT_MAPPER.valueToTree(param), getObj(TaskInfo.class), companyId);
     }
     /**
      * 停止外呼任务
      * @param param 参数
      */
     public TaskInfo stopCallTask(TaskInfo param, Long companyId){
-        return utils.send("stopCallTask", OBJECT_MAPPER.valueToTree(param), getObj(TaskInfo.class), companyId);
+        return AiCallUtils.send("stopCallTask", OBJECT_MAPPER.valueToTree(param), getObj(TaskInfo.class), companyId);
     }
     /**
      * 对话图查询（uuid）
      * @param param 参数
      */
     public TaskInfo getDialogMap(getDialogMapDomain param, Long companyId){
-        return utils.send("getDialogMap", OBJECT_MAPPER.valueToTree(param), getObj("telData", TaskInfo.class), companyId);
+        return AiCallUtils.send("getDialogMap", OBJECT_MAPPER.valueToTree(param), getObj("telData", TaskInfo.class), companyId);
     }
     /**
      * 获取主叫分组
      * @param param 参数
      */
     public CIDGroupListResult getCIDGroupList(BaseDomain param, Long companyId){
-        return utils.send("getCIDGroupList", OBJECT_MAPPER.valueToTree(param), getObj("telData", CIDGroupListResult.class), companyId);
+        return AiCallUtils.send("getCIDGroupList", OBJECT_MAPPER.valueToTree(param), getObj("telData", CIDGroupListResult.class), companyId);
     }
 }

fs-service/src/main/java/com/fs/aicall/utils/AiCallUtils.java

@@ -24,7 +24,7 @@ public class AiCallUtils {
 
     private final static ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
-    public String encrypt(String customer, long timestamp, int seq, String password) {
+    public static String encrypt(String customer, long timestamp, int seq, String password) {
 
         // 获取输入字符串的字节数组
         byte[] messageDigest = Md5Utils.md5(customer + "@" + timestamp + "@" + seq + "@" + password);
@@ -42,7 +42,7 @@ public class AiCallUtils {
         return hexString.toString();
     }
 
-    public String getParams(ObjectNode params, Long companyId){
+    public static String getParams(ObjectNode params, Long companyId){
         try {
             AiCallConfig config = getConfig(companyId);
             long timestamp = Instant.now().getEpochSecond();
@@ -64,10 +64,10 @@ public class AiCallUtils {
             throw new RuntimeException(e);
         }
     }
-    public <T> T send(String addr, Function<JSONObject, T> dataFun, Long companyId){
+    public static <T> T send(String addr, Function<JSONObject, T> dataFun, Long companyId){
         return send(addr, null, dataFun, companyId);
     }
-    public <T> T send(String addr, ObjectNode params, Function<JSONObject, T> dataFun, Long companyId){
+    public static <T> T send(String addr, ObjectNode params, Function<JSONObject, T> dataFun, Long companyId){
         String url = getConfig(companyId).getUrl() + addr;
         String body = getParams(params, companyId);
         HttpRequest request = HttpUtil.createPost(url).body(body);
@@ -83,7 +83,7 @@ public class AiCallUtils {
         return dataFun.apply(json.getJSONObject("data").getJSONObject("response"));
     }
 
-    public AiCallConfig getConfig(Long companyId) {
+    public static AiCallConfig getConfig(Long companyId) {
         CompanyVoiceApiTiantianMapper mapper = SpringUtils.getBean(CompanyVoiceApiTiantianMapper.class);
         CompanyVoiceApiTiantian config = mapper.selectOne(new QueryWrapper<CompanyVoiceApiTiantian>().eq("company_id", companyId));
         AiCallConfig aiCallConfig = new AiCallConfig();