ai统计导出

fs-admin/src/main/java/com/fs/fastGpt/FastgptEventLogTotalController.java

@@ -21,7 +21,7 @@ import java.util.List;
 
 /**
  * ai事件埋点统计Controller
- * 
+ *
  * @author fs
  * @date 2025-06-26
  */
@@ -86,8 +86,8 @@ public class FastgptEventLogTotalController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('fastGpt:fastgptEventLogTotal:export')")
     @Log(title = "ai事件埋点统计", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FastgptEventLogTotal fastgptEventLogTotal)
+    @PostMapping("/export")
+    public AjaxResult export(@RequestBody FastgptEventLogTotal fastgptEventLogTotal)
     {
         List<FastgptEventLogTotalVo> list = fastgptEventLogTotalService.selectFastgptEventLogTotalExport(fastgptEventLogTotal);
         ExcelUtil<FastgptEventLogTotalVo> util = new ExcelUtil<FastgptEventLogTotalVo>(FastgptEventLogTotalVo.class);

fs-company/src/main/java/com/fs/company/controller/fastGpt/FastgptEventLogTotalController.java

@@ -24,7 +24,7 @@ import java.util.List;
 
 /**
  * ai事件埋点统计Controller
- * 
+ *
  * @author fs
  * @date 2025-06-26
  */

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

@@ -184,20 +184,54 @@ public class CommonController {
     @Autowired
     private IQwContactWayService contactWayService;
 
+
     @GetMapping("/resetQwContactWayUserLimit")
     public void resetQwContactWayUserLimit()  {
         contactWayService.resetQwContactWayUserLimit();
     }
     @GetMapping("/qwContactWay")
     public void qwContactWay(String userID) throws Exception {
-        String state="way:wwce259dbd92b6f0e7:256";
-        String corpId="wwce259dbd92b6f0e7";
+        String state="way:ww6d9a09888a2e9c4d:11";
+        String corpId="ww6d9a09888a2e9c4d";
+        boolean isSend = true;
+        boolean isWay = false;
+        QwContactWay wayId = null;
+        String welcomeCode="15454";
+
+        QwUser qwUser = qwUserMapper.selectQwUserByCorpIdAndUserId(corpId, userID);
+
         if (state != null && state != "") {
             String s = "way:" + corpId + ":";
             if (state.contains(s)) {
                 String substring = state.substring(state.indexOf(s) + s.length());
                 QwContactWay qwContactWay = qwContactWayMapper.selectQwContactWayById(Long.parseLong(substring));
                 if (qwContactWay != null) {
+
+                    if (welcomeCode != null && welcomeCode != "") {
+                        isWay = true;
+                        wayId = qwContactWay;
+                        if (qwContactWay.getIsWelcome() != null && qwContactWay.getIsWelcome() == 1) {
+                            boolean isClose = true;
+                            if (wayId.getIsSpanWelcome() == 1) {
+                                ExternalContact externalContact = new ExternalContact();
+                                String name = externalContact.getName();
+                                String closeWelcomeWord = wayId.getCloseWelcomeWord();
+                                if (closeWelcomeWord != null && closeWelcomeWord.length() > 0) {
+                                    List<String> strings = JSON.parseArray(closeWelcomeWord, String.class);
+                                    for (String string : strings) {
+                                        if (name.contains(string)) {
+                                            isClose = false;
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                            if (qwContactWay.getIsWelcome() == 1 && isClose) {
+                                isSend = contactWayService.sendWelcomeMsg(qwContactWay, corpId, welcomeCode, qwUser, 1546L);
+                            }
+                        }
+
+                    }
                     if (qwContactWay.getUserType() == 1 && qwContactWay.getIsUserLimit() == 1) {
 
                         String userLimitJson = qwContactWay.getUserLimitJson();

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

@@ -447,6 +447,7 @@ public class QwContactWayServiceImpl implements IQwContactWayService
                             if (qwResult.getErrcode()==0){
                                 return false;
                             }else {
+                                log.error("发送渠道活码的欢迎语失败："+qwResult.getErrmsg());
                                 return true;
                             }