|
|
@@ -4,23 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.util.IdUtil;
|
|
|
import co.elastic.clients.elasticsearch.ElasticsearchClient;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
-import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.qiwenshare.common.util.DateUtil;
|
|
|
import com.qiwenshare.common.util.MusicUtils;
|
|
|
import com.qiwenshare.common.util.security.SessionUtil;
|
|
|
-import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
|
|
|
-import vip.xiaonuo.disk.service.IShareFileService;
|
|
|
-import vip.xiaonuo.disk.service.IShareService;
|
|
|
-import vip.xiaonuo.disk.service.IUserService;
|
|
|
-import vip.xiaonuo.disk.config.es.FileSearch;
|
|
|
-import vip.xiaonuo.disk.domain.*;
|
|
|
-import vip.xiaonuo.disk.io.QiwenFile;
|
|
|
-import vip.xiaonuo.disk.mapper.FileMapper;
|
|
|
-import vip.xiaonuo.disk.mapper.MusicMapper;
|
|
|
-import vip.xiaonuo.disk.mapper.UserFileMapper;
|
|
|
-import vip.xiaonuo.disk.util.QiwenFileUtil;
|
|
|
-import vip.xiaonuo.disk.util.TreeNode;
|
|
|
import com.qiwenshare.ufop.factory.UFOPFactory;
|
|
|
import com.qiwenshare.ufop.operation.copy.Copier;
|
|
|
import com.qiwenshare.ufop.operation.copy.domain.CopyFile;
|
|
|
@@ -47,6 +34,18 @@ import org.jaudiotagger.tag.id3.AbstractID3v2Tag;
|
|
|
import org.jaudiotagger.tag.id3.framebody.FrameBodyAPIC;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
+import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
|
|
|
+import vip.xiaonuo.disk.config.es.FileSearch;
|
|
|
+import vip.xiaonuo.disk.domain.*;
|
|
|
+import vip.xiaonuo.disk.io.QiwenFile;
|
|
|
+import vip.xiaonuo.disk.mapper.FileMapper;
|
|
|
+import vip.xiaonuo.disk.mapper.MusicMapper;
|
|
|
+import vip.xiaonuo.disk.mapper.UserFileMapper;
|
|
|
+import vip.xiaonuo.disk.service.IShareFileService;
|
|
|
+import vip.xiaonuo.disk.service.IShareService;
|
|
|
+import vip.xiaonuo.disk.service.IUserService;
|
|
|
+import vip.xiaonuo.disk.util.QiwenFileUtil;
|
|
|
+import vip.xiaonuo.disk.util.TreeNode;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import java.io.File;
|
|
|
@@ -188,7 +187,7 @@ public class FileDealComp {
|
|
|
.eq(UserFile::getDeleteFlag, 0)
|
|
|
.eq(UserFile::getUserId, sessionUserId)
|
|
|
.groupBy(UserFile::getFilePath, UserFile::getFileName)
|
|
|
- .having("count(fileName) >= 2");
|
|
|
+ .having("count(file_name) >= 2");
|
|
|
List<UserFile> repeatList = userFileMapper.selectList(lambdaQueryWrapper);
|
|
|
|
|
|
for (UserFile userFile : repeatList) {
|