Merge branch 'local/1030_music' into saas

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/UserMusicWrapper.java

@@ -165,6 +165,10 @@ public class UserMusicWrapper {
         @ApiModelProperty("录制上传时间")
         private Date createTime;
 
+
+        @ApiModelProperty("过期时间")
+        private Date expireTime;
+
         public String jsonString() {
             return JSON.toJSONString(this);
         }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/UserMusicServiceImpl.java

@@ -13,6 +13,8 @@ import com.ym.mec.biz.dal.enums.EUserMusicType;
 import com.ym.mec.biz.dal.mapper.UserMusicMapper;
 import com.ym.mec.biz.dal.wrapper.UserMusicWrapper;
 import com.ym.mec.biz.service.*;
+import com.ym.mec.util.date.DateUtil;
+import jodd.time.TimeUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +22,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -225,6 +232,21 @@ public class UserMusicServiceImpl extends ServiceImpl<UserMusicMapper, UserMusic
                 }
             }
         }
+        // 草稿过期时间
+        SysConfig byParamName = sysConfigService.findByParamName(SysConfigService.USER_MUSIC_DRAFT_TIME);
+        Integer time = 7;
+        try {
+            time = Integer.parseInt(byParamName.getParanValue());
+        }catch (Exception e){
+            log.error("作品草稿过期时间配置错误");
+        }
+        for (UserMusicWrapper.UserMusic record : records) {
+            if (record.getType() == EUserMusicType.DRAFT && record.getCreateTime() != null) {
+                LocalDate localDate = record.getCreateTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate().plusDays(time);
+                LocalDateTime localDateTime = LocalDateTime.of(localDate, LocalTime.MAX);
+                record.setExpireTime(Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()));
+            }
+        }
 
 
 //        Map<Long, Integer> mapByUserMusicIds = userMusicStarService.getStarCountMapByUserMusicIds(ids);

mec-biz/src/main/resources/config/mybatis/UserMusicMapper.xml

@@ -5,8 +5,23 @@
 
 
     <select id="selectPage" resultType="com.ym.mec.biz.dal.wrapper.UserMusicWrapper$UserMusic">
-		SELECT
-            t.*
+		SELECT t.id_,
+               t.user_id_,
+               t.client_type_,
+               t.music_practice_record_id_,
+               t.music_sheet_id_,
+               t.video_img_,
+               t.accompany_url_,
+               t.type_,
+               t.img_,
+               t.desc_,
+               t.video_url_,
+               t.json_config_,
+               t.like_num_,
+               t.del_flag_,
+               t.expire_flag_,
+               t.submit_time_,
+               t.update_time_ as createTime
 		FROM user_music t
         left join sys_music_score t1 on t1.id_ = t.music_sheet_id_
         <where>