Browse Source

音乐组合功能开发

zsf 2 months ago
parent
commit
3bdbd1afa4
16 changed files with 405 additions and 146 deletions
  1. 19 0
      src/main/java/com/zzys/lightting/combination/controller/CombinationContentController.java
  2. 115 0
      src/main/java/com/zzys/lightting/combination/controller/CombinationRecordController.java
  3. 48 0
      src/main/java/com/zzys/lightting/combination/model/CombinationContent.java
  4. 57 0
      src/main/java/com/zzys/lightting/combination/model/CombinationPlayRecord.java
  5. 15 15
      src/main/java/com/zzys/lightting/combination/model/CombinationRecord.java
  6. 15 0
      src/main/java/com/zzys/lightting/combination/repository/CombinationContentRepository.java
  7. 12 0
      src/main/java/com/zzys/lightting/combination/repository/CombinationPlayRecordRepository.java
  8. 12 0
      src/main/java/com/zzys/lightting/combination/repository/CombinationRecordRepository.java
  9. 27 0
      src/main/java/com/zzys/lightting/combination/service/CombinationContentService.java
  10. 9 0
      src/main/java/com/zzys/lightting/combination/service/CombinationPlayRecordService.java
  11. 7 7
      src/main/java/com/zzys/lightting/combination/service/CombinationRecordService.java
  12. 36 0
      src/main/java/com/zzys/lightting/combination/service/impl/CombinationContentServiceImpl.java
  13. 13 0
      src/main/java/com/zzys/lightting/combination/service/impl/CombinationPlayRecordServiceImpl.java
  14. 20 27
      src/main/java/com/zzys/lightting/combination/service/impl/CombinationRecordServiceImpl.java
  15. 0 12
      src/main/java/com/zzys/lightting/user/dao/repository/UserListenRecordRepository.java
  16. 0 85
      src/main/java/com/zzys/lightting/user/rest/UserListenRecordController.java

+ 19 - 0
src/main/java/com/zzys/lightting/combination/controller/CombinationContentController.java

@@ -0,0 +1,19 @@
+package com.zzys.lightting.combination.controller;
+
+import com.zzys.lightting.base.rest.BaseController;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description:组合内容管理
+ * @Author: mimang
+ * @Date: 2025/1/23
+ */
+@Slf4j
+@RestController
+@RequestMapping(value = "/combinationContent")
+@Api(tags = "组合内容管理")
+public class CombinationContentController extends BaseController {
+}

+ 115 - 0
src/main/java/com/zzys/lightting/combination/controller/CombinationRecordController.java

@@ -0,0 +1,115 @@
+package com.zzys.lightting.combination.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.zzys.lightting.base.rest.BaseController;
+import com.zzys.lightting.combination.model.CombinationContent;
+import com.zzys.lightting.combination.model.CombinationRecord;
+import com.zzys.lightting.combination.service.CombinationContentService;
+import com.zzys.lightting.user.dao.model.UserToken;
+import com.zzys.lightting.combination.service.CombinationRecordService;
+import com.zzys.lightting.utils.Result;
+import com.zzys.lightting.utils.WebContextUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @Description:聆听记录接口
+ * @Author: mimang
+ * @Date: 2025/1/21
+ */
+@Slf4j
+@RestController
+@RequestMapping(value = "/combination")
+@Api(tags = "用户组合管理")
+public class CombinationRecordController extends BaseController {
+
+    @Autowired
+    private CombinationRecordService recordService;
+
+    @Autowired
+    private CombinationContentService contentService;
+
+
+    /**
+     * 保存用户聆听记录
+     * @param record
+     * @return
+     */
+    @ApiOperation(value = "保存用户组合记录", notes = "用户音乐组合管理")
+    @PostMapping("/saveCombinationRecord")
+    @Transactional(rollbackFor = Exception.class)
+    public Result saveCombinationRecord(@RequestBody CombinationRecord record){
+        try {
+            UserToken userToken = WebContextUtil.getUserToken();
+            if (userToken== null){
+                return fail(null,"token值非法");
+            }
+            BeanUtil.copyProperties(userToken,record,"id");
+            record = recordService.saveRecord(record);
+            contentService.saveContent(record.getContents(), record.getId());
+            return success(record);
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error(e.getMessage());
+            return fail();
+        }
+    }
+
+
+    @ApiOperation(value = "删除组合")
+    @GetMapping("/finishRecord")
+    public Result finishListen(@RequestParam String recordId){
+        try {
+            CombinationRecord record = recordService.findById(recordId);
+            if (record != null){
+                return success(recordService.finishRecord(record));
+            }else {
+                return fail();
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error(e.getMessage());
+            return fail();
+        }
+    }
+
+    @ApiOperation(value = "查询组合记录")
+    @PostMapping("/findListByPage")
+    public Result findListByPage(@RequestBody(required = false) CombinationRecord record, @RequestParam int pageSize, @RequestParam int pageNum){
+        try {
+            Page<CombinationRecord> page = recordService.findListByPage(record,pageSize,pageNum);
+            return success(page);
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error(e.getMessage());
+            return fail();
+        }
+    }
+
+    @ApiOperation(value = "查看详情")
+    @GetMapping("/findDetailById")
+    public Result findDetailById(@RequestParam String id){
+        try {
+            CombinationRecord record = recordService.findById(id);
+            if (record != null){
+                //获取到组合下音乐
+                List<CombinationContent> contents = contentService.findAllByCombinationId(record.getId());
+                record.setContents(contents);
+            }
+            return success(record);
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error(e.getMessage());
+            return fail();
+        }
+    }
+
+
+}

+ 48 - 0
src/main/java/com/zzys/lightting/combination/model/CombinationContent.java

@@ -0,0 +1,48 @@
+package com.zzys.lightting.combination.model;
+
+import com.zzys.lightting.base.model.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:组合内容
+ * @Author: mimang
+ * @Date: 2025/1/23
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Table(name = "lt_combination_content")
+public class CombinationContent extends BaseEntity {
+
+    @ApiModelProperty(name = "组合ID",required = false,hidden = true)
+    @Column(name = "combination_id",columnDefinition = "varchar(36) not null comment '组合ID'")
+    private String combinationId;
+
+    @ApiModelProperty(name = "音乐ID",required = true)
+    @Column(name = "music_id",columnDefinition = "varchar(36) not null comment '音乐ID'")
+    private String musicId;
+
+    @ApiModelProperty(name = "音乐名称",required = true)
+    @Column(name = "music_name",columnDefinition = "varchar(50) not null comment '音乐名称'")
+    private String musicName;
+
+    @ApiModelProperty(name = "音乐类型ID",required = true)
+    @Column(name = "type_id",columnDefinition = "varchar(36) not null comment '音乐类型ID'")
+    private String typeId;
+
+    @ApiModelProperty(name = "音乐类型名称",required = true)
+    @Column(name = "type_name",columnDefinition = "varchar(50) not null comment '音乐类型名称'")
+    private String typeName;
+
+    @ApiModelProperty(name = "创建时间",required = false,hidden = true)
+    @Column(name = "create_time",columnDefinition = "varchar(30) not null comment '创建时间'")
+    private String createTime;
+}

+ 57 - 0
src/main/java/com/zzys/lightting/combination/model/CombinationPlayRecord.java

@@ -0,0 +1,57 @@
+package com.zzys.lightting.combination.model;
+
+import com.zzys.lightting.base.model.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:组合播放记录
+ * @Author: mimang
+ * @Date: 2025/1/23
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Table(name = "lt_combination_play_record")
+public class CombinationPlayRecord extends BaseEntity {
+
+
+    @ApiModelProperty(name = "组合ID",required = true,hidden = false)
+    @Column(name = "combination_id",columnDefinition = "varchar(36) not null comment '组合ID'")
+    private String combinationId;
+
+    @ApiModelProperty(name = "组合名称",required = true,hidden = false)
+    @Column(name = "combination_name",columnDefinition = "varchar(36) not null comment '组合名称'")
+    private String combinationName;
+
+    @ApiModelProperty(name = "用户编号",required = false,hidden = true)
+    @Column(name = "user_no",columnDefinition = "varchar(50) not null comment '用户编号'")
+    private String userNo;
+
+    @ApiModelProperty(name = "用户名称",required = false,hidden = true)
+    @Column(name = "user_name",columnDefinition = "varchar(50) not null comment '用户名称'")
+    private String userName;
+
+    @ApiModelProperty(name = "组织编号",required = false,hidden = true)
+    @Column(name = "org_no",columnDefinition = "varchar(50) not null comment '组织编号'")
+    private String orgNo;
+
+    @ApiModelProperty(name = "创建时间",required = false,hidden = true)
+    @Column(name = "create_time",columnDefinition = "varchar(30) not null comment '创建时间'")
+    private String createTime;
+
+    @ApiModelProperty(name = "更新时间",required = false,hidden = true)
+    @Column(name = "update_time",columnDefinition = "varchar(30)  comment '更新时间'")
+    private String updateTime;
+
+    @ApiModelProperty(name = "组合状态",required = false,hidden = true)
+    @Column(name = "play_status",columnDefinition = "varchar(10) not null comment '播放状态0正在播放1已结束'")
+    private String playStatus;
+}

+ 15 - 15
src/main/java/com/zzys/lightting/user/dao/model/UserListenRecord.java → src/main/java/com/zzys/lightting/combination/model/CombinationRecord.java

@@ -1,8 +1,7 @@
-package com.zzys.lightting.user.dao.model;
+package com.zzys.lightting.combination.model;
 
 import com.zzys.lightting.base.model.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -11,9 +10,10 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;
 
 /**
- * @Description:用户聆听记录
+ * @Description:用户组合记录
  * @Author: mimang
  * @Date: 2025/1/21
  */
@@ -21,8 +21,8 @@ import javax.persistence.Transient;
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
-@Table(name = "lt_user_listen_record")
-public class UserListenRecord extends BaseEntity {
+@Table(name = "lt_combination_record")
+public class CombinationRecord extends BaseEntity {
 
     @ApiModelProperty(name = "用户编号",required = false,hidden = true)
     @Column(name = "user_no",columnDefinition = "varchar(50) not null comment '用户编号'")
@@ -40,17 +40,13 @@ public class UserListenRecord extends BaseEntity {
     @Column(name = "org_name",columnDefinition = "varchar(50)  comment '组织名称'")
     private String orgName;
 
-    @ApiModelProperty(name = "音乐ID",required = true)
-    @Column(name = "music_id",columnDefinition = "varchar(36) not null comment '音乐ID'")
-    private String musicId;
+    @ApiModelProperty(name = "组合名称",required = true,hidden = false)
+    @Column(name = "name",columnDefinition = "varchar(50) not null comment '组合名称'")
+    private String name;
 
-    @ApiModelProperty(name = "音乐类型ID",required = true)
-    @Column(name = "type_id",columnDefinition = "varchar(36) not null comment '音乐类型ID'")
-    private String typeId;
-
-    @ApiModelProperty(name = "聆听状态",required = false,hidden = true)
-    @Column(name = "listen_status",columnDefinition = "varchar(10) not null comment '状态0结束1正在进行'")
-    private String listenStatus;
+    @ApiModelProperty(name = "组合状态",required = false,hidden = true)
+    @Column(name = "combination_status",columnDefinition = "varchar(10) not null comment '状态0删除1正常'")
+    private String combinationStatus;
 
     @ApiModelProperty(name = "创建时间",required = false,hidden = true)
     @Column(name = "create_time",columnDefinition = "varchar(30) not null comment '创建时间'")
@@ -63,4 +59,8 @@ public class UserListenRecord extends BaseEntity {
     @ApiModelProperty(name = "聆听用时",required = false,hidden = true)
     @Transient
     private String listenTime;
+
+    @ApiModelProperty(name = "组合内容",required = true,hidden = false)
+    @Transient
+    private List<CombinationContent> contents;
 }

+ 15 - 0
src/main/java/com/zzys/lightting/combination/repository/CombinationContentRepository.java

@@ -0,0 +1,15 @@
+package com.zzys.lightting.combination.repository;
+
+import com.zzys.lightting.base.repository.BaseRepository;
+import com.zzys.lightting.combination.model.CombinationContent;
+
+import java.util.List;
+
+/**
+ * @Description:组合内容管理
+ * @Author: mimang
+ * @Date: 2025/1/23
+ */
+public interface CombinationContentRepository extends BaseRepository<CombinationContent,String> {
+    List<CombinationContent> findAllByCombinationId(String combinationId);
+}

+ 12 - 0
src/main/java/com/zzys/lightting/combination/repository/CombinationPlayRecordRepository.java

@@ -0,0 +1,12 @@
+package com.zzys.lightting.combination.repository;
+
+import com.zzys.lightting.base.repository.BaseRepository;
+import com.zzys.lightting.combination.model.CombinationPlayRecord;
+
+/**
+ * @Description:组合播放记录
+ * @Author: mimang
+ * @Date: 2025/1/23
+ */
+public interface CombinationPlayRecordRepository extends BaseRepository<CombinationPlayRecord,String> {
+}

+ 12 - 0
src/main/java/com/zzys/lightting/combination/repository/CombinationRecordRepository.java

@@ -0,0 +1,12 @@
+package com.zzys.lightting.combination.repository;
+
+import com.zzys.lightting.base.repository.BaseRepository;
+import com.zzys.lightting.combination.model.CombinationRecord;
+
+/**
+ * @Description:聆听记录接口
+ * @Author: mimang
+ * @Date: 2025/1/21
+ */
+public interface CombinationRecordRepository extends BaseRepository<CombinationRecord,String> {
+}

+ 27 - 0
src/main/java/com/zzys/lightting/combination/service/CombinationContentService.java

@@ -0,0 +1,27 @@
+package com.zzys.lightting.combination.service;
+
+import com.zzys.lightting.combination.model.CombinationContent;
+
+import java.util.List;
+
+/**
+ * @Description:组合内容管理
+ * @Author: mimang
+ * @Date: 2025/1/23
+ */
+public interface CombinationContentService {
+
+    /**
+     * 保存组合内容
+     * @param list
+     */
+    public void saveContent(List<CombinationContent> list,String combinationId);
+
+
+    /**
+     * 获取到组合下音乐内容
+     * @param combinationId
+     * @return
+     */
+    public List<CombinationContent> findAllByCombinationId(String combinationId);
+}

+ 9 - 0
src/main/java/com/zzys/lightting/combination/service/CombinationPlayRecordService.java

@@ -0,0 +1,9 @@
+package com.zzys.lightting.combination.service;
+
+/**
+ * @Description:组合播放记录接口
+ * @Author: mimang
+ * @Date: 2025/1/23
+ */
+public interface CombinationPlayRecordService {
+}

+ 7 - 7
src/main/java/com/zzys/lightting/user/service/UserListenRecordService.java → src/main/java/com/zzys/lightting/combination/service/CombinationRecordService.java

@@ -1,6 +1,6 @@
-package com.zzys.lightting.user.service;
+package com.zzys.lightting.combination.service;
 
-import com.zzys.lightting.user.dao.model.UserListenRecord;
+import com.zzys.lightting.combination.model.CombinationRecord;
 import org.springframework.data.domain.Page;
 
 /**
@@ -8,28 +8,28 @@ import org.springframework.data.domain.Page;
  * @Author: mimang
  * @Date: 2025/1/21
  */
-public interface UserListenRecordService {
+public interface CombinationRecordService {
 
     /**
      * 保存点击记录
      * @param record
      * @return
      */
-    public UserListenRecord saveRecord(UserListenRecord record);
+    public CombinationRecord saveRecord(CombinationRecord record);
 
     /**
      * 根据ID查询详情
      * @param recordId
      * @return
      */
-    UserListenRecord findById(String recordId);
+    CombinationRecord findById(String recordId);
 
     /**
      * 结束聆听
      * @param record
      * @return
      */
-    UserListenRecord finishRecord(UserListenRecord record);
+    CombinationRecord finishRecord(CombinationRecord record);
 
     /**
      * 获取到聆听列表
@@ -38,5 +38,5 @@ public interface UserListenRecordService {
      * @param pageNum
      * @return
      */
-    Page<UserListenRecord> findListByPage(UserListenRecord record, int pageSize, int pageNum);
+    Page<CombinationRecord> findListByPage(CombinationRecord record, int pageSize, int pageNum);
 }

+ 36 - 0
src/main/java/com/zzys/lightting/combination/service/impl/CombinationContentServiceImpl.java

@@ -0,0 +1,36 @@
+package com.zzys.lightting.combination.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import com.zzys.lightting.combination.model.CombinationContent;
+import com.zzys.lightting.combination.repository.CombinationContentRepository;
+import com.zzys.lightting.combination.service.CombinationContentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Description:组合内容管理
+ * @Author: mimang
+ * @Date: 2025/1/23
+ */
+@Service
+public class CombinationContentServiceImpl implements CombinationContentService {
+
+    @Autowired
+    private CombinationContentRepository repository;
+
+    @Override
+    public void saveContent(List<CombinationContent> list,String combinationId) {
+        for (CombinationContent content : list){
+            content.setCreateTime(DateUtil.now());
+            content.setCombinationId(combinationId);
+            repository.save(content);
+        }
+    }
+
+    @Override
+    public List<CombinationContent> findAllByCombinationId(String combinationId) {
+        return repository.findAllByCombinationId(combinationId);
+    }
+}

+ 13 - 0
src/main/java/com/zzys/lightting/combination/service/impl/CombinationPlayRecordServiceImpl.java

@@ -0,0 +1,13 @@
+package com.zzys.lightting.combination.service.impl;
+
+import com.zzys.lightting.combination.service.CombinationPlayRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description:组合播放记录接口
+ * @Author: mimang
+ * @Date: 2025/1/23
+ */
+@Service
+public class CombinationPlayRecordServiceImpl implements CombinationPlayRecordService {
+}

+ 20 - 27
src/main/java/com/zzys/lightting/user/service/impl/UserListenRecordServiceImpl.java → src/main/java/com/zzys/lightting/combination/service/impl/CombinationRecordServiceImpl.java

@@ -1,10 +1,9 @@
-package com.zzys.lightting.user.service.impl;
+package com.zzys.lightting.combination.service.impl;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.PageUtil;
-import com.zzys.lightting.user.dao.model.UserListenRecord;
-import com.zzys.lightting.user.dao.repository.UserListenRecordRepository;
-import com.zzys.lightting.user.service.UserListenRecordService;
+import com.zzys.lightting.combination.model.CombinationRecord;
+import com.zzys.lightting.combination.repository.CombinationRecordRepository;
+import com.zzys.lightting.combination.service.CombinationRecordService;
 import com.zzys.lightting.utils.Constant;
 import com.zzys.lightting.utils.EscapeUtil;
 import com.zzys.lightting.utils.PageRequestUtil;
@@ -15,12 +14,8 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -29,47 +24,41 @@ import java.util.List;
  * @Date: 2025/1/21
  */
 @Service
-public class UserListenRecordServiceImpl implements UserListenRecordService {
+public class CombinationRecordServiceImpl implements CombinationRecordService {
 
     @Autowired
-    private UserListenRecordRepository repository;
+    private CombinationRecordRepository repository;
 
 
     @Override
-    public UserListenRecord saveRecord(UserListenRecord record) {
+    public CombinationRecord saveRecord(CombinationRecord record) {
         record.setCreateTime(DateUtil.now());
-        record.setListenStatus(Constant.DEFAULT_VALUE_ONE);
+        record.setCombinationStatus(Constant.DEFAULT_VALUE_ONE);
         return repository.save(record);
     }
 
     @Override
-    public UserListenRecord findById(String recordId) {
+    public CombinationRecord findById(String recordId) {
         return repository.findById(recordId).orElse(null);
     }
 
     @Override
-    public UserListenRecord finishRecord(UserListenRecord record) {
+    public CombinationRecord finishRecord(CombinationRecord record) {
         record.setUpdateTime(DateUtil.now());
-        record.setListenStatus(Constant.DEFAULT_VALUE_ZERO);
+        record.setCombinationStatus(Constant.DEFAULT_VALUE_ZERO);
         return repository.save(record);
     }
 
     @Override
-    public Page<UserListenRecord> findListByPage(UserListenRecord record, int pageSize, int pageNum) {
+    public Page<CombinationRecord> findListByPage(CombinationRecord record, int pageSize, int pageNum) {
 
-        Page<UserListenRecord> page = null;
+        Page<CombinationRecord> page = null;
         if (record == null){
             page = repository.findAll(PageRequestUtil.of(pageNum,pageSize));
         }else {
             //处理条件
-            Specification<UserListenRecord> specification = ((root, query, criteriaBuilder) -> {
+            Specification<CombinationRecord> specification = ((root, query, criteriaBuilder) -> {
                 List<Predicate> list = new ArrayList<>();
-                if (StringUtils.isNotEmpty(record.getMusicId())){
-                    list.add(criteriaBuilder.equal(root.get("musicId"),record.getMusicId()));
-                }
-                if (StringUtils.isNotEmpty(record.getTypeId())){
-                    list.add(criteriaBuilder.equal(root.get("typeId"),record.getTypeId()));
-                }
                 if (StringUtils.isNotEmpty(record.getOrgNo())){
                     String orgNo2 = EscapeUtil.escapeChar(record.getOrgNo());
                     list.add(criteriaBuilder.like(root.get("orgNo"),"%"+orgNo2+"%"));
@@ -82,8 +71,12 @@ public class UserListenRecordServiceImpl implements UserListenRecordService {
                     String userName2 = EscapeUtil.escapeChar(record.getUserName());
                     list.add(criteriaBuilder.like(root.get("userName"),"%"+userName2+"%"));
                 }
+                if (StringUtils.isNotEmpty(record.getUserName())){
+                    String userName2 = EscapeUtil.escapeChar(record.getUserName());
+                    list.add(criteriaBuilder.like(root.get("userName"),"%"+userName2+"%"));
+                }
 
-                list.add(criteriaBuilder.equal(root.get("listenStatus"), Constant.DEFAULT_VALUE_ONE));
+                list.add(criteriaBuilder.equal(root.get("combinationStatus"), Constant.DEFAULT_VALUE_ONE));
                 query.where(criteriaBuilder.and(list.toArray(new Predicate[list.size()])));
                 query.orderBy(criteriaBuilder.asc(root.get("createTime")));
                 return query.getRestriction();
@@ -92,7 +85,7 @@ public class UserListenRecordServiceImpl implements UserListenRecordService {
         }
         //处理时间
         if (CollectionUtils.isNotEmpty(page.getContent())){
-            for (UserListenRecord userListenRecord : page.getContent()) {
+            for (CombinationRecord userListenRecord : page.getContent()) {
                 //计算用时
                 String userTime = DateUtil.formatBetween(DateUtil.parse(userListenRecord.getCreateTime()),DateUtil.parse(userListenRecord.getUpdateTime()));
                 userListenRecord.setListenTime(userTime);

+ 0 - 12
src/main/java/com/zzys/lightting/user/dao/repository/UserListenRecordRepository.java

@@ -1,12 +0,0 @@
-package com.zzys.lightting.user.dao.repository;
-
-import com.zzys.lightting.base.repository.BaseRepository;
-import com.zzys.lightting.user.dao.model.UserListenRecord;
-
-/**
- * @Description:聆听记录接口
- * @Author: mimang
- * @Date: 2025/1/21
- */
-public interface UserListenRecordRepository extends BaseRepository<UserListenRecord,String> {
-}

+ 0 - 85
src/main/java/com/zzys/lightting/user/rest/UserListenRecordController.java

@@ -1,85 +0,0 @@
-package com.zzys.lightting.user.rest;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
-import com.zzys.lightting.base.rest.BaseController;
-import com.zzys.lightting.user.dao.model.UserListenRecord;
-import com.zzys.lightting.user.dao.model.UserToken;
-import com.zzys.lightting.user.service.UserListenRecordService;
-import com.zzys.lightting.utils.Result;
-import com.zzys.lightting.utils.WebContextUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @Description:聆听记录接口
- * @Author: mimang
- * @Date: 2025/1/21
- */
-@Slf4j
-@RestController
-@RequestMapping(value = "/listenRecord")
-@Api(tags = "用户音乐聆听管理")
-public class UserListenRecordController extends BaseController {
-
-    @Autowired
-    private UserListenRecordService recordService;
-
-
-    /**
-     * 保存用户聆听记录
-     * @param record
-     * @return
-     */
-    @ApiOperation(value = "保存用户聆听记录", notes = "用户聆听管理")
-    @PostMapping("/saveListenRecord")
-    public Result saveListenRecord(@RequestBody UserListenRecord record){
-        try {
-            UserToken userToken = WebContextUtil.getUserToken();
-            if (userToken== null){
-                return fail(null,"token值非法");
-            }
-            BeanUtil.copyProperties(userToken,record,"id");
-            return success(recordService.saveRecord(record));
-        }catch (Exception e){
-            e.printStackTrace();
-            log.error(e.getMessage());
-            return fail();
-        }
-    }
-
-
-    @ApiOperation(value = "结束音乐聆听")
-    @GetMapping("/finishListen")
-    public Result finishListen(@RequestParam String recordId){
-        try {
-            UserListenRecord record = recordService.findById(recordId);
-            if (record != null){
-                return success(recordService.finishRecord(record));
-            }else {
-                return fail();
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            log.error(e.getMessage());
-            return fail();
-        }
-    }
-
-    @ApiOperation(value = "查询聆听记录")
-    @PostMapping("/findListByPage")
-    public Result findListByPage(@RequestBody(required = false) UserListenRecord record,@RequestParam int pageSize,@RequestParam int pageNum){
-        try {
-            Page<UserListenRecord> page = recordService.findListByPage(record,pageSize,pageNum);
-            return success(page);
-        }catch (Exception e){
-            e.printStackTrace();
-            log.error(e.getMessage());
-            return fail();
-        }
-    }
-}