From f09aa1929fb986670ccf6df3d10c69cf8a52945f Mon Sep 17 00:00:00 2001
From: tuyp <tuyaping@ykhl.com>
Date: Tue, 22 Aug 2023 16:22:59 +0800
Subject: [PATCH] contentVod别名

---
 src/main/java/com/subsidy/jobs/RenSheJuJob.java                 | 24 +++++++++++++++++-------
 src/main/java/com/subsidy/service/impl/RenSheJuServiceImpl.java |  4 ++--
 src/main/resources/mapper/CourseContentMapper.xml               |  2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/subsidy/jobs/RenSheJuJob.java b/src/main/java/com/subsidy/jobs/RenSheJuJob.java
index 2b8a588..0d99731 100644
--- a/src/main/java/com/subsidy/jobs/RenSheJuJob.java
+++ b/src/main/java/com/subsidy/jobs/RenSheJuJob.java
@@ -132,15 +132,25 @@ public class RenSheJuJob {
         if ("prod".equals(env)) {
             renSheJuService.uploadClassCode();
         }
+        System.gc();
     }
 
-    /**
-     * POST-9 获取推送失败班级列表
-     */
-    @Scheduled(cron = "0 35 1 * * ?")
-    public void getErrorClass()throws IOException{
-        renSheJuService.getErrorClass();
-    }
+//    /**
+//     * POST-9 获取推送失败班级列表
+//     */
+//    @Scheduled(cron = "0 35 1 * * ?")
+//    public void getErrorClass()throws IOException{
+//        renSheJuService.getErrorClass();
+//    }
+
+//    /**
+//     * 定时gc
+//     */
+//    @Scheduled(cron = "0 10 16 * * ?")
+//    public void gc(){
+//        Runtime.getRuntime().gc();
+//    }
+
 
     /**
      * 强制用户用户下线（websocket强制下线）
diff --git a/src/main/java/com/subsidy/service/impl/RenSheJuServiceImpl.java b/src/main/java/com/subsidy/service/impl/RenSheJuServiceImpl.java
index e610eae..96a1e00 100644
--- a/src/main/java/com/subsidy/service/impl/RenSheJuServiceImpl.java
+++ b/src/main/java/com/subsidy/service/impl/RenSheJuServiceImpl.java
@@ -677,14 +677,14 @@ public class RenSheJuServiceImpl implements RenSheJuService {
                 if (null != rensheResponseVO.getCtt()){
                     renshejuHistoryDO.setOutputParam(rensheResponseVO.getCtt().toString());
                 }else {
-                    response.body().toString();
+                    renshejuHistoryDO.setOutputParam(response.body().toString());
                 }
             } else {
                 renshejuHistoryDO.setOutputParam(RenSheJuConstant.API_ERROR);
             }
             renshejuHistoryMapper.insert(renshejuHistoryDO);
             return rensheResponseVO;
-//            return null;
+//          return null;
         } catch (Exception e) {
             RenshejuHistoryDO renshejuHistoryDO = new RenshejuHistoryDO();
             renshejuHistoryDO.setInterfaceName(RenSheJuConstant.POST_8);
diff --git a/src/main/resources/mapper/CourseContentMapper.xml b/src/main/resources/mapper/CourseContentMapper.xml
index 0dd672b..a940e74 100644
--- a/src/main/resources/mapper/CourseContentMapper.xml
+++ b/src/main/resources/mapper/CourseContentMapper.xml
@@ -58,7 +58,7 @@
         SELECT
         t.id,
         t.vod_url,
-        cvm.vod_alias_name,
+        ifnull(cvm.vod_alias_name,t.vod_name) as vod_alias_name,
         t.vod_type,
         t.vod_length,
         cvm.order_no as or1,
--
libgit2 0.25.0