刘俊驰 hai 9 meses
pai
achega
625490c74e

+ 1 - 1
cooleshow-user/user-biz/pom.xml

@@ -147,7 +147,7 @@
         <dependency>
             <groupId>com.dayaedu.cbs.openfeign</groupId>
             <artifactId>dayaedu-openfeign-api</artifactId>
-            <version>1.0.4</version>
+            <version>${cbs.version}</version>
         </dependency>
         <dependency>
             <groupId>com.dayaedu.cbs.openfeign</groupId>

+ 5 - 4
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -2068,7 +2069,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                 break;
             }
             for (MusicSheet record : records) {
-                if (record.getCbsMusicSheetId() != null) {
+                if (record.getCbsMusicSheetId() != null && !DateUtil.format(record.getCreateTime(),"yyyy-MM-dd HH:mm:ss").equals("2024-06-25 00:00:00")) {
                     continue;
                 }
 
@@ -2102,9 +2103,6 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
 
 
     private void syncMusicSheet(MusicSheet record, Date date) {
-        if (record.getCbsMusicSheetId() !=null) {
-            return;
-        }
         List<MusicSheetAccompaniment> list = musicSheetAccompanimentService.lambdaQuery().eq(MusicSheetAccompaniment::getMusicSheetId, record.getId()).list();
 
         CbsMusicSheetWrapper.AddMusicSheet addMusicSheet = this.musicToAddMusicSheet(record,list);
@@ -2134,6 +2132,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         }
         CbsMusicSheetWrapper.AddMusicSheet addMusicSheet = new CbsMusicSheetWrapper.AddMusicSheet();
         addMusicSheet.setId(from.getId());
+        if (from.getCbsMusicSheetId() != null && DateUtil.format(from.getCreateTime(),"yyyy-MM-dd HH:mm:ss").equals("2024-06-25 00:00:00")) {
+            addMusicSheet.setId(from.getCbsMusicSheetId());
+        }
         addMusicSheet.setMusicCover(from.getTitleImg());
         addMusicSheet.setName(from.getMusicSheetName());
         if (StringUtils.isNotBlank(from.getMusicSubject())) {

+ 1 - 1
cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -970,7 +970,7 @@
     <select id="selectSyncPage" resultType="com.yonge.cooleshow.biz.dal.entity.MusicSheet">
         select *
         from music_sheet
-        where del_flag_ = 0 and audit_status_ = 'PASS'
+        where del_flag_ = 0 and audit_status_ = 'PASS' and id_ = 22
     </select>
     <!--单曲专辑数量统计-->
 </mapper>