|
@@ -5,8 +5,10 @@ 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.utils.Constant;
|
|
|
import com.zzys.lightting.utils.EscapeUtil;
|
|
|
import com.zzys.lightting.utils.PageRequestUtil;
|
|
|
+import org.apache.commons.collections4.CollectionUtils;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.data.domain.Page;
|
|
@@ -36,6 +38,7 @@ public class UserListenRecordServiceImpl implements UserListenRecordService {
|
|
|
@Override
|
|
|
public UserListenRecord saveRecord(UserListenRecord record) {
|
|
|
record.setCreateTime(DateUtil.now());
|
|
|
+ record.setListenStatus(Constant.DEFAULT_VALUE_ONE);
|
|
|
return repository.save(record);
|
|
|
}
|
|
|
|
|
@@ -47,13 +50,16 @@ public class UserListenRecordServiceImpl implements UserListenRecordService {
|
|
|
@Override
|
|
|
public UserListenRecord finishRecord(UserListenRecord record) {
|
|
|
record.setUpdateTime(DateUtil.now());
|
|
|
+ record.setListenStatus(Constant.DEFAULT_VALUE_ZERO);
|
|
|
return repository.save(record);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public Page<UserListenRecord> findListByPage(UserListenRecord record, int pageSize, int pageNum) {
|
|
|
+
|
|
|
+ Page<UserListenRecord> page = null;
|
|
|
if (record == null){
|
|
|
- return repository.findAll(PageRequestUtil.of(pageNum,pageSize));
|
|
|
+ page = repository.findAll(PageRequestUtil.of(pageNum,pageSize));
|
|
|
}else {
|
|
|
//处理条件
|
|
|
Specification<UserListenRecord> specification = ((root, query, criteriaBuilder) -> {
|
|
@@ -77,13 +83,21 @@ public class UserListenRecordServiceImpl implements UserListenRecordService {
|
|
|
list.add(criteriaBuilder.like(root.get("userName"),"%"+userName2+"%"));
|
|
|
}
|
|
|
|
|
|
- //list.add(criteriaBuilder.equal(root.get("userStatus"), Constant.DEFAULT_VALUE_ONE));
|
|
|
+ list.add(criteriaBuilder.equal(root.get("listenStatus"), Constant.DEFAULT_VALUE_ONE));
|
|
|
query.where(criteriaBuilder.and(list.toArray(new Predicate[list.size()])));
|
|
|
query.orderBy(criteriaBuilder.asc(root.get("createTime")));
|
|
|
return query.getRestriction();
|
|
|
});
|
|
|
- return repository.findAll(specification,PageRequestUtil.of(pageNum,pageSize));
|
|
|
+ page = repository.findAll(specification,PageRequestUtil.of(pageNum,pageSize));
|
|
|
}
|
|
|
-
|
|
|
+ //处理时间
|
|
|
+ if (CollectionUtils.isNotEmpty(page.getContent())){
|
|
|
+ for (UserListenRecord userListenRecord : page.getContent()) {
|
|
|
+ //计算用时
|
|
|
+ String userTime = DateUtil.formatBetween(DateUtil.parse(userListenRecord.getCreateTime()),DateUtil.parse(userListenRecord.getUpdateTime()));
|
|
|
+ userListenRecord.setListenTime(userTime);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return page;
|
|
|
}
|
|
|
}
|