Browse Source

解决冲突

yanguofeng 3 years ago
parent
commit
9b4014fbb5

+ 6 - 0
adm-business/adm-server/pom.xml

@@ -36,6 +36,12 @@
         <dependency>
             <groupId>com.persagy</groupId>
             <artifactId>dmp-amqp-starter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.persagy</groupId>
+                    <artifactId>dmp-common</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.locationtech.jts</groupId>

+ 1 - 0
adm-business/adm-server/src/main/java/com/persagy/adm/server/backstage/domain/AdmAnalysisModel.java

@@ -6,6 +6,7 @@ import com.persagy.adm.server.algorithm.entity.AdmModelFile;
 import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.dmp.digital.entity.ObjectRelation;
 import lombok.Data;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 import java.util.Map;

+ 2 - 2
adm-business/adm-server/src/main/java/com/persagy/adm/server/backstage/service/impl/AdmAnalysisServiceBase.java

@@ -25,7 +25,7 @@ public abstract class AdmAnalysisServiceBase implements AdmAnalyseService {
      * @author : lijie
      * Update By 2022/1/21 10:59
      */
-    @PostConstruct
+//    @PostConstruct
     @Override
     public final synchronized void init(AdmAnalysisModel model) throws BusinessException {
         // 1.是否需要打印日志
@@ -42,7 +42,7 @@ public abstract class AdmAnalysisServiceBase implements AdmAnalyseService {
      * @author : lijie
      * Update By 2022/1/21 10:50
      */
-    @PreDestroy
+//    @PreDestroy
     @Override
     public final synchronized void destroy(AdmAnalysisModel model) throws BusinessException {
         // 1.是否需要打印日志