|
|
@@ -2,10 +2,14 @@ package com.fs.app.controller;
|
|
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
+import com.fs.aiSoundReplication.service.AsrService;
|
|
|
+import com.fs.app.msgarchives.QwMsgAuditIngestService;
|
|
|
+import com.fs.app.msgarchives.QwMsgMediaFileService;
|
|
|
import com.fs.common.core.domain.R;
|
|
|
import com.fs.common.core.redis.RedisCache;
|
|
|
import com.fs.common.utils.StringUtils;
|
|
|
import com.fs.common.utils.uuid.IdUtils;
|
|
|
+import com.fs.enums.MediaMsgTypeEnum;
|
|
|
import com.fs.fastGpt.domain.FastGptRole;
|
|
|
import com.fs.fastGpt.service.AiHookService;
|
|
|
import com.fs.fastGpt.service.IFastGptRoleService;
|
|
|
@@ -15,10 +19,14 @@ import com.fs.his.dto.TracesDTO;
|
|
|
import com.fs.his.enums.ShipperCodeEnum;
|
|
|
import com.fs.his.service.IFsExpressService;
|
|
|
import com.fs.his.service.IFsStoreOrderService;
|
|
|
+import com.fs.qw.domain.QwCompany;
|
|
|
import com.fs.qw.domain.QwExternalContact;
|
|
|
import com.fs.qw.domain.QwUser;
|
|
|
import com.fs.qw.domain.QwUserVideo;
|
|
|
+import com.fs.qw.domain.audit.QwMsgAuditMessage;
|
|
|
+import com.fs.qw.mapper.QwCompanyMapper;
|
|
|
import com.fs.qw.mapper.QwExternalContactMapper;
|
|
|
+import com.fs.qw.mapper.QwMsgAuditMessageMapper;
|
|
|
import com.fs.qw.mapper.QwUserMapper;
|
|
|
import com.fs.qw.service.IQwExternalContactService;
|
|
|
import com.fs.qw.service.IQwUserService;
|
|
|
@@ -79,6 +87,17 @@ public class QwMsgController {
|
|
|
private IFsExpressService expressService;
|
|
|
@Autowired
|
|
|
private IFsStoreOrderService storeOrderService;
|
|
|
+ @Autowired
|
|
|
+ private QwMsgAuditIngestService ingestService;
|
|
|
+ @Autowired
|
|
|
+ private QwCompanyMapper qwCompanyMapper;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private QwMsgAuditMessageMapper messageMapper;
|
|
|
+ @Autowired
|
|
|
+ private QwMsgMediaFileService mediaFileService;
|
|
|
+ @Autowired
|
|
|
+ private AsrService asrService;
|
|
|
|
|
|
@GetMapping("/sendExpressInfo/{orderId}")
|
|
|
public R sendExpressInfo(@PathVariable Long orderId){
|
|
|
@@ -196,9 +215,10 @@ public class QwMsgController {
|
|
|
}
|
|
|
|
|
|
|
|
|
- @PostMapping("/callback/{serverId}")
|
|
|
+ @PostMapping("/callback/{serverId}/{isNewVersion}")
|
|
|
@ResponseBody
|
|
|
- public Map<String,String> callback(@RequestBody String json,@PathVariable Long serverId ){
|
|
|
+ public Map<String,String> callback(@RequestBody String json, @PathVariable Long serverId, @PathVariable(required = false) Boolean isNewVersion){
|
|
|
+
|
|
|
// System.out.println(json);
|
|
|
WxWorkMsgResp wxWorkMsgResp = JSON.parseObject(json, WxWorkMsgResp.class);
|
|
|
Integer type = wxWorkMsgResp.getType();
|
|
|
@@ -351,7 +371,7 @@ public class QwMsgController {
|
|
|
|
|
|
if (2000000000000000L-receiver>0){
|
|
|
log.info("id:{}, 客户发送", id);
|
|
|
- aiHookService.qwHookNotifyAiReply(id,sender,content,wxWorkMsgResp.getUuid(),wxWorkMessageDTO.getMsgtype());
|
|
|
+ aiHookService.qwHookNotifyAiReply(id,sender,content,wxWorkMsgResp.getUuid(),wxWorkMessageDTO.getMsgtype(), isNewVersion);
|
|
|
}else {
|
|
|
log.info("销售发送");
|
|
|
aiHookService.qwHookNotifyAddMsgNew(id,receiver,content,wxWorkMsgResp.getUuid(),1);
|
|
|
@@ -562,5 +582,4 @@ public class QwMsgController {
|
|
|
qwUserService.atMsg(qwUser1, "掉线提醒("+msg+")");
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
}
|