合并分支

fs-ipad-task/src/main/java/com/fs/app/service/IpadSendServer.java

@@ -78,7 +78,7 @@ public class IpadSendServer {
         miniProgramVo.setBase(vo);
         WxWorkResponseDTO<WxWorkSendAppMsgRespDTO> resp = ipadSendUtils.sendMiniProgram(miniProgramVo);
         if (resp.getErrcode() != 0) {
-            log.debug("ID:{}-ipad接口请求返回异常：{}", vo.getId(), resp.getErrmsg());
+            log.info("ID:{}-ipad接口请求返回异常：{}", vo.getId(), resp.getErrmsg());
             content.setSendStatus(2);
             content.setSendRemarks("发送失败：" + resp.getErrmsg());
         }
@@ -91,7 +91,7 @@ public class IpadSendServer {
         fileVo.setBase(vo);
         WxWorkResponseDTO<WxwSendCDNFileMsgRespDTO> resp = ipadSendUtils.sendFile(fileVo);
         if (resp.getErrcode() != 0) {
-            log.debug("ID:{}-ipad接口请求返回异常：{}", vo.getId(), resp.getErrmsg());
+            log.info("ID:{}-ipad接口请求返回异常：{}", vo.getId(), resp.getErrmsg());
             content.setSendStatus(2);
             content.setSendRemarks("发送失败：" + resp.getErrmsg());
         }
@@ -102,7 +102,7 @@ public class IpadSendServer {
         txtVo.setBase(vo);
         WxWorkResponseDTO<WxWorkSendTextMsgRespDTO> resp = ipadSendUtils.sendTxt(txtVo);
         if (resp.getErrcode() != 0) {
-            log.debug("ID:{}-ipad接口请求返回异常：{}", vo.getId(), resp.getErrmsg());
+            log.info("ID:{}-ipad接口请求返回异常：{}", vo.getId(), resp.getErrmsg());
             content.setSendStatus(2);
             content.setSendRemarks("发送失败：" + resp.getErrmsg());
         }
@@ -113,7 +113,7 @@ public class IpadSendServer {
         imgVo.setBase(vo);
         WxWorkResponseDTO<WxwSendCDNImgMsgRespDTO> resp = ipadSendUtils.sendImg(imgVo);
         if (resp.getErrcode() != 0) {
-            log.debug("ID:{}-ipad接口请求返回异常：{}", vo.getId(), resp.getErrmsg());
+            log.info("ID:{}-ipad接口请求返回异常：{}", vo.getId(), resp.getErrmsg());
             content.setSendStatus(2);
             content.setSendRemarks("发送失败：" + resp.getErrmsg());
         }
@@ -130,7 +130,7 @@ public class IpadSendServer {
         linkVo.setBase(vo);
         WxWorkResponseDTO<WxwSendLinkMsgRespDTO> resp = ipadSendUtils.sendLink(linkVo);
         if (resp.getErrcode() != 0) {
-            log.debug("ID:{}-ipad接口请求返回异常：{}", vo.getId(), resp.getErrmsg());
+            log.info("ID:{}-ipad接口请求返回异常：{}", vo.getId(), resp.getErrmsg());
             content.setSendStatus(2);
             content.setSendRemarks("发送失败：" + resp.getErrmsg());
         }
@@ -143,7 +143,7 @@ public class IpadSendServer {
         videoVo.setBase(vo);
         WxWorkResponseDTO<WxwSendCDNVideoMsgRespDTO> resp = ipadSendUtils.sendVideo(videoVo);
         if (resp.getErrcode() != 0) {
-            log.debug("ID:{}-ipad接口请求返回异常：{}", vo.getId(), resp.getErrmsg());
+            log.info("ID:{}-ipad接口请求返回异常：{}", vo.getId(), resp.getErrmsg());
             content.setSendStatus(2);
             content.setSendRemarks("发送失败：" + resp.getErrmsg());
         }
@@ -165,7 +165,7 @@ public class IpadSendServer {
         videoVo.setBase(vo);
         WxWorkResponseDTO<WxwSendVideoNumberRespDTO> resp = ipadSendUtils.sendWxVideo(videoVo);
         if (resp.getErrcode() != 0) {
-            log.debug("ID:{}-ipad接口请求返回异常：{}", vo.getId(), resp.getErrmsg());
+            log.info("ID:{}-ipad接口请求返回异常：{}", vo.getId(), resp.getErrmsg());
             content.setSendStatus(2);
             content.setSendRemarks("发送失败：" + resp.getErrmsg());
         }
@@ -173,7 +173,7 @@ public class IpadSendServer {
 
     public void sendVoice(BaseVo vo, QwSopCourseFinishTempSetting.Setting content) {
         if (StringUtils.isEmpty(content.getVoiceUrl()) || StringUtils.isEmpty(content.getVoiceDuration())) {
-            log.debug("语音未生成无法发送，转文字发送：{}", vo);
+            log.info("语音未生成无法发送，转文字发送：{}", vo);
             sendTxt(vo, content);
             return;
         }
@@ -184,7 +184,7 @@ public class IpadSendServer {
         voiceVo.setBase(vo);
         WxWorkResponseDTO<WxwSendCDNVoiceMsgRespDTO> resp = ipadSendUtils.sendVoice(voiceVo);
         if (resp.getErrcode() != 0) {
-            log.debug("ID:{}-ipad接口请求返回异常：{}", vo.getId(), resp.getErrmsg());
+            log.info("ID:{}-ipad接口请求返回异常：{}", vo.getId(), resp.getErrmsg());
             content.setSendStatus(2);
             content.setSendRemarks("发送失败：" + resp.getErrmsg());
         }
@@ -193,22 +193,22 @@ public class IpadSendServer {
     public boolean isSend(QwUser qwUser, BaseVo parentVo) {
         // 判断企微发送方式是否是ipad
         if (qwUser.getSendMsgType() == 0) {
-            log.debug("发送方式是侧边栏企微用户：ID：{} 名称：{}", qwUser.getId(), qwUser.getQwUserName());
+            log.info("发送方式是侧边栏企微用户：ID：{} 名称：{}", qwUser.getId(), qwUser.getQwUserName());
             return false;
         }
         // 判断是否信息准确
         if (org.springframework.util.StringUtils.isEmpty(qwUser.getUid())) {
-            log.debug("企微用户：ID：{} 名称：{}", qwUser.getId(), qwUser.getQwUserName());
+            log.info("企微用户：ID：{} 名称：{}", qwUser.getId(), qwUser.getQwUserName());
             return false;
         }
         // 是否已经授权服务器地址
         if (qwUser.getServerId() == null) {
-            log.debug("企微用户：ID：{} 名称：{} 未绑定AI主机", qwUser.getId(), qwUser.getQwUserName());
+            log.info("企微用户：ID：{} 名称：{} 未绑定AI主机", qwUser.getId(), qwUser.getQwUserName());
             return false;
         }
         // ipad状态是否是登录状态
         if (qwUser.getIpadStatus() == 0) {
-            log.debug("企微用户：ID：{} 名称：{} 未登录uid:{}，serveID:{}", qwUser.getId(), qwUser.getQwUserName(), qwUser.getUid(), qwUser.getServerId());
+            log.info("企微用户：ID：{} 名称：{} 未登录uid:{}，serveID:{}", qwUser.getId(), qwUser.getQwUserName(), qwUser.getUid(), qwUser.getServerId());
             return false;
         }
         // 更新信息使用的类
@@ -240,7 +240,7 @@ public class IpadSendServer {
                 return false;
             }
             parentVo.setCorpId(login.getUser_info().getObject().getCorp_id());
-            log.debug("QwUserID:{}, AI主机信息：{}", qwUser.getId(), login);
+            log.info("QwUserID:{}, AI主机信息：{}", qwUser.getId(), login);
         } catch (Exception e) {
             updateQwUser.setId(qwUser.getId());
             updateQwUser.setRemark("登录状态异常：" + e.getMessage());
@@ -303,15 +303,15 @@ public class IpadSendServer {
             contactHParam.setCorpId(qwUser.getCorpId().trim());
             Integer courseType = setting.getCourseType();
             if (setting.getType() == 2 && courseType != 0) {// 课程消息，进行复杂的条件判断
-                log.debug("企微查询：{}", contactHParam);
+                log.info("企微查询：{}", contactHParam);
                 Long qwExternalContactId = qwExternalContactMapper.getQwExternalContactId(contactHParam);
                 FsCourseWatchLog watchLog = watchLogService.getWatchCourseLogVideoBySop(
                         setting.getVideoId().longValue(),
                         String.valueOf(qwUser.getId()),
                         qwExternalContactId
                 );
-                log.debug("ID:{}-看课记录参数：videoID:{}， qwUserID:{}， extID:{}", qwSopLogs.getId(), setting.getVideoId().longValue(), qwUser.getId(), qwExternalContactId);
-                log.debug("ID:{}-看课记录：{}", qwSopLogs.getId(), watchLog);
+                log.info("ID:{}-看课记录参数：videoID:{}， qwUserID:{}， extID:{}", qwSopLogs.getId(), setting.getVideoId().longValue(), qwUser.getId(), qwExternalContactId);
+                log.info("ID:{}-看课记录：{}", qwSopLogs.getId(), watchLog);
                 String logId = qwSopLogs.getId();
                 if (watchLog != null) {
                     //新逻辑