Преглед на файлове

Merge branch 'master' into rpt

fengyanjie@sagacloud.cn преди 4 години
родител
ревизия
fc70fa07db

+ 0 - 6
dmp-admin/src/main/java/com/persagy/dmp/admin/repository/TransObjectInfoRepository.java

@@ -6,17 +6,11 @@ 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
     @Query(nativeQuery = true, value = "delete from admin_trans_object_info where project_id = ?")
     int deleteByProjectId(String projectId);
 
-    @Modifying
-    @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);
-
 }
 

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

@@ -75,7 +75,9 @@ public class DmpTransObjectService {
         }
         redis.expire(key, 24, TimeUnit.HOURS);
 
-        objectInfoRepository.deleteByProjectIdAndObjectId(projectId, objectMap.keySet());
+        for (List<TransObjectInfo> value : objectMap.values()) {
+            objectInfoRepository.deleteAll(value);
+        }
 
         TransObjectContext ctx = new TransObjectContext();
         ctx.setAppId("datautils");

+ 9 - 0
dmp-admin/src/main/resources/application-dev.yml

@@ -0,0 +1,9 @@
+server:
+  port: 8839
+persagy:
+  dmp:
+    server: http://192.168.64.18:9930
+    exchange: exchange-dmp
+    admin:
+      routingKey: routing-dmp-admin
+      queue: queue-dmp-admin