Browse Source

数据迁移-上传:修改删除逻辑

fengyanjie@sagacloud.cn 4 years ago
parent
commit
3534f82e09

+ 4 - 2
dmp-admin/src/main/java/com/persagy/dmp/admin/repository/TransObjectInfoRepository.java

@@ -6,6 +6,8 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.querydsl.QuerydslPredicateExecutor;
 
+import java.util.Set;
+
 public interface TransObjectInfoRepository extends JpaRepository<TransObjectInfo, Integer>, QuerydslPredicateExecutor<TransObjectInfo> {
 
     @Modifying
@@ -13,8 +15,8 @@ public interface TransObjectInfoRepository extends JpaRepository<TransObjectInfo
     int deleteByProjectId(String projectId);
 
     @Modifying
-    @Query(nativeQuery = true, value = "delete from admin_trans_object_info where project_id = ? and object_id is not null")
-    int deleteByProjectIdAndObjectId(String projectId);
+    @Query(nativeQuery = true, value = "delete from admin_trans_object_info where project_id = ?1 and object_id in ?2")
+    int deleteByProjectIdAndObjectId(String projectId, Set<String> idArray);
 
 }
 

+ 1 - 1
dmp-admin/src/main/java/com/persagy/dmp/admin/service/DmpTransObjectService.java

@@ -75,7 +75,7 @@ public class DmpTransObjectService {
         }
         redis.expire(key, 24, TimeUnit.HOURS);
 
-        objectInfoRepository.deleteByProjectIdAndObjectId(projectId);
+        objectInfoRepository.deleteByProjectIdAndObjectId(projectId, objectMap.keySet());
 
         TransObjectContext ctx = new TransObjectContext();
         ctx.setAppId("datautils");