客户端个人中心---回收站恢复文件接口报错

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/RecycleBinVO.java

@@ -17,6 +17,6 @@ import java.util.List;
 public class RecycleBinVO extends RecycleBin {
 	private static final long serialVersionUID = 1L;
 
-	private List<String> regainIds;
+	private List<RecycleBin> regainIds;
 
 }

blade-service/blade-business/src/main/java/org/springblade/business/controller/RecycleBinController.java

@@ -1,6 +1,8 @@
 package org.springblade.business.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,10 +27,7 @@ import org.springblade.business.entity.RecycleBin;
 import org.springblade.business.service.IRecycleBinService;
 import org.springblade.core.boot.ctrl.BladeController;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -60,7 +59,8 @@ public class RecycleBinController extends BladeController {
 	public R<Boolean> regain(@RequestBody RecycleBinVO vo){
 		if(vo.getRegainIds() != null && vo.getRegainIds().size() > 0){
 			//获取数据
-			List<RecycleBin> recycleBinList = this.recycleBinService.list(Wrappers.<RecycleBin>lambdaQuery().in(RecycleBin::getId, vo.getRegainIds()));
+			List<Long> longs = vo.getRegainIds().stream().map(i -> i.getId()).collect(Collectors.toList());
+			List<RecycleBin> recycleBinList = this.recycleBinService.list(Wrappers.<RecycleBin>lambdaQuery().in(RecycleBin::getId, longs));
 			//恢复数据成功后删除回收站对应记录
 			List<String> recycleBinIds = new ArrayList<>();
 			//划分数据类型
@@ -90,9 +90,17 @@ public class RecycleBinController extends BladeController {
 					if(fileList.size() > 0){
 						//文件数据包括工程文件及影像资料，这里采用最简单粗暴的方法进行恢复
 						//恢复工程文件数据
-						regainFile = this.archiveFileService.update(Wrappers.<ArchiveFile>lambdaUpdate().set(ArchiveFile::getIsDeleted, 0).in(ArchiveFile::getId, fileList));
+						//regainFile = this.archiveFileService.update(Wrappers.<ArchiveFile>lambdaUpdate().set(ArchiveFile::getIsDeleted, 0).in(ArchiveFile::getId, fileList));
+						List<ArchiveFile> archiveFiles = this.archiveFileService.getDeleteDataByIds(fileList);
+						if (archiveFiles != null && archiveFiles.size() >0) {
+							regainFile = this.archiveFileService.recoveryByIds(fileList);
+						}
 						//恢复影像资料数据
-						regainFile = this.imageClassificationFileService.update(Wrappers.<ImageClassificationFile>lambdaUpdate().set(ImageClassificationFile::getIsDeleted, 0).in(ImageClassificationFile::getId, fileList));
+						List<ImageClassificationFile> list = this.imageClassificationFileService.getDeleteDataByIds(fileList);
+						if (list != null && list.size() >0) {
+							//regainFile = this.imageClassificationFileService.update(Wrappers.<ImageClassificationFile>lambdaUpdate().set(ImageClassificationFile::getIsDeleted, 0).in(ImageClassificationFile::getId, fileList));
+							regainFile = this.imageClassificationFileService.recoveryByIds(fileList);
+						}
 					}
 				}catch (Exception e){
 					e.printStackTrace();

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ArchiveFileMapper.java

@@ -38,4 +38,14 @@ public interface ArchiveFileMapper extends BaseMapper<ArchiveFile> {
 	 */
 	List<ArchiveFile> selectArchiveFilePage(@Param("current") Integer current, @Param("size") Integer size, @Param("vo") ArchiveFileVO vo);
 
+	/**
+	 * 恢复逻辑删除
+	 */
+	Boolean recoveryByIds(@Param("ids") List<String> ids);
+
+	/**
+	 * 根据ids查找已经删除的数据
+	 */
+	List<ArchiveFile> getDeleteDataByIds(@Param("ids")List<String> ids);
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ArchiveFileMapper.xml

@@ -32,6 +32,13 @@
         <result column="cite_change_number" property="citeChangeNumber"/>
         <result column="e_visa_file" property="eVisaFile"/>
     </resultMap>
+    <update id="recoveryByIds">
+        update u_archive_file set is_deleted = 0 where
+        id in
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
 
     <select id="selectArchiveFileCount" resultMap="archiveFileResultMap">
         select count(id) from u_archive_file where is_deleted = 0
@@ -97,5 +104,11 @@
         </if>
         order by create_time DESC
     </select>
+    <select id="getDeleteDataByIds" resultType="org.springblade.business.entity.ArchiveFile">
+        select * from u_archive_file where id in
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
 
 </mapper>

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ImageClassificationFileMapper.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.business.mapper;
 
+import org.springblade.business.entity.ArchiveFile;
 import org.springblade.business.entity.ImageClassificationFile;
 import org.springblade.business.vo.ImageClassificationFileVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -60,4 +61,14 @@ public interface ImageClassificationFileMapper extends BaseMapper<ImageClassific
 	 */
 	List<ImageClassificationFile> selectImageClassificationFilePage(@Param("current")long current, @Param("size")long size, @Param("param") ImageClassificationFileVO imageClassificationFile);
 
+	/**
+	 * 恢复逻辑删除
+	 */
+	Boolean recoveryByIds(@Param("ids")List<String> ids);
+
+	/**
+	 * 根据ids查找已经删除的数据
+	 */
+	public List<ImageClassificationFile> getDeleteDataByIds(@Param("ids")List<String> ids);
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ImageClassificationFileMapper.xml

@@ -31,6 +31,13 @@
         <result column="pdf_url" property="pdfUrl"/>
         <result column="marge_pdf_url" property="margePdfUrl"/>
     </resultMap>
+    <update id="recoveryByIds">
+        update u_image_classification_file set is_deleted = 0 where
+        id in
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
 
     <select id="queryCurrentContractImageFileType" resultType="java.lang.Integer">
         select `type` from u_image_classification_file where contract_id = #{contractId} and is_deleted = 0
@@ -105,5 +112,11 @@
             and files.shootingTimeStr like concat('%',#{param.queryDate},'%')
         </if>
     </select>
+    <select id="getDeleteDataByIds" resultType="org.springblade.business.entity.ImageClassificationFile">
+        select * from u_image_classification_file where id in
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
 
 </mapper>

blade-service/blade-business/src/main/java/org/springblade/business/service/IArchiveFileService.java

@@ -21,6 +21,8 @@ import org.springblade.business.vo.ArchiveFileVO;
 import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+
 /**
  *  服务类
  *
@@ -34,4 +36,16 @@ public interface IArchiveFileService extends BaseService<ArchiveFile> {
 	 */
 	IPage<ArchiveFileVO> selectArchiveFilePage(ArchiveFileVO archiveFile);
 
+	/**
+	 * 恢复删除
+	 */
+	Boolean recoveryByIds(List<String> ids);
+
+	/**
+	 * 根据ids查找已经删除的数据
+	 */
+	List<ArchiveFile> getDeleteDataByIds(List<String> ids);
+
+
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/IImageClassificationFileService.java

@@ -1,5 +1,6 @@
 package org.springblade.business.service;
 
+import org.springblade.business.entity.ArchiveFile;
 import org.springblade.business.entity.ImageClassificationFile;
 import org.springblade.business.vo.ImageClassificationFileVO;
 import org.springblade.business.vo.TreeVo;
@@ -43,4 +44,13 @@ public interface IImageClassificationFileService extends BaseService<ImageClassi
 	 */
 	IPage<ImageClassificationFileVO> selectImageClassificationFilePage(IPage<ImageClassificationFileVO> page, ImageClassificationFileVO imageClassificationFile);
 
+	/**
+	 * 恢复删除
+	 */
+	Boolean recoveryByIds(List<String> ids);
+
+	/**
+	 * 根据ids查找已经删除的数据
+	 */
+	List<ImageClassificationFile> getDeleteDataByIds(List<String> ids);
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/ArchiveFileServiceImpl.java

@@ -70,4 +70,22 @@ public class ArchiveFileServiceImpl extends BaseServiceImpl<ArchiveFileMapper, A
 		return iPage.setRecords(pageVoList);
 	}
 
+	/**
+	 * 恢复逻辑删除
+	 * @param ids
+	 * @return
+	 */
+	@Override
+	public Boolean recoveryByIds(List<String> ids) {
+		return baseMapper.recoveryByIds(ids);
+	}
+
+	/**
+	 * 根据ids查找已经删除的数据
+	 */
+	@Override
+	public List<ArchiveFile> getDeleteDataByIds(List<String> ids) {
+		return baseMapper.getDeleteDataByIds(ids);
+	}
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/ImageClassificationFileServiceImpl.java

@@ -20,6 +20,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.nacos.common.utils.DateFormatUtils;
 import org.apache.commons.lang.StringUtils;
+import org.springblade.business.entity.ArchiveFile;
 import org.springblade.business.entity.ImageClassificationFile;
 import org.springblade.business.utils.YearTreeUtils;
 import org.springblade.business.vo.ImageClassificationFileVO;
@@ -102,4 +103,21 @@ public class ImageClassificationFileServiceImpl extends BaseServiceImpl<ImageCla
 		return page;
 	}
 
+	/**
+	 * 恢复删除
+	 * @param ids
+	 * @return
+	 */
+	@Override
+	public Boolean recoveryByIds(List<String> ids) {
+		return baseMapper.recoveryByIds(ids);
+	}
+	/**
+	 * 根据ids查找已经删除的数据
+	 */
+	@Override
+	public List<ImageClassificationFile> getDeleteDataByIds(List<String> ids) {
+		return baseMapper.getDeleteDataByIds(ids);
+	}
+
 }