Browse Source

去除mq相关配置依赖

linhuili 3 năm trước cách đây
mục cha
commit
980bc74fcc

+ 5 - 5
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/ZoneIspace.kt

@@ -154,11 +154,11 @@ open class ZoneIspace : BaseInfo() {
     @Column(name = "model_id")
     @Column(name = "model_id")
     var modelId: String? = null
     var modelId: String? = null
 
 
-   // @Schema(description = "轮廓线")
-   // @Column(name = "outline")
-    //var outline: ArrayList<ArrayList<PointPosition>>? = null
+   @Schema(description = "轮廓线")
+   @Column(name = "outline")
+   var outline: ArrayList<ArrayList<PointPosition>>? = null
 
 
-    @Schema(description = "轮廓线")
-    val outLine: List<LinkedHashMap<String, Any>>? = null
+   /* @Schema(description = "轮廓线")
+    val outLine: List<LinkedHashMap<String, Any>>? = null*/
 
 
 }
 }

+ 7 - 6
message-center/src/main/resources/application-dev.yml

@@ -38,8 +38,8 @@ spring:
     username:                           postgres
     username:                           postgres
     password:                           cGVyc2FneV8yMDIwcXdlIUAj
     password:                           cGVyc2FneV8yMDIwcXdlIUAj
 
 
-  activemq:
-    broker-url:                         tcp://60.205.177.43:61616
+  #activemq:
+   # broker-url:                         tcp://60.205.177.43:61616
 
 
   servlet:
   servlet:
     multipart:
     multipart:
@@ -47,11 +47,12 @@ spring:
       max-file-size:                   500MB        # 限制单个文件的最大值
       max-file-size:                   500MB        # 限制单个文件的最大值
   main:
   main:
     allow-bean-definition-overriding: true
     allow-bean-definition-overriding: true
-  kafka:
-    bootstrap-servers:                      192.168.20.236:9092
+
+  #kafka:
+   # bootstrap-servers:                      192.168.20.236:9092
 #    bootstrap-servers:                      127.0.0.1:9092
 #    bootstrap-servers:                      127.0.0.1:9092
 
 
 #    bootstrap-servers:                      172.16.9.226:9092
 #    bootstrap-servers:                      172.16.9.226:9092
 
 
-    consumer:
-      group-id:                             datacenter-consumer-group
+    #consumer:
+     # group-id:                             datacenter-consumer-group

+ 2 - 2
message-center/src/main/resources/application-test.yml

@@ -36,10 +36,10 @@ spring:
     username:                           postgres
     username:                           postgres
     password:                           cGVyc2FneV8yMDIwcXdlIUAj
     password:                           cGVyc2FneV8yMDIwcXdlIUAj
 
 
-  activemq:
+ # activemq:
 #    broker-url:                         tcp://60.205.177.43:61616
 #    broker-url:                         tcp://60.205.177.43:61616
 #    broker-url:                         tcp://172.17.100.16:61616
 #    broker-url:                         tcp://172.17.100.16:61616
-    broker-url:                         tcp://activemq:61616
+  #  broker-url:                         tcp://activemq:61616
   servlet:
   servlet:
     multipart:
     multipart:
       max-request-size:                500MB        # 限制上传的多个文件的总大小
       max-request-size:                500MB        # 限制上传的多个文件的总大小

+ 8 - 8
revit-algorithm/src/main/resources-dev/application.yml

@@ -54,14 +54,14 @@ spring:
     multipart:
     multipart:
       max-request-size:                90MB        # 限制上传的多个文件的总大小
       max-request-size:                90MB        # 限制上传的多个文件的总大小
       max-file-size:                   90MB        # 限制单个文件的最大值
       max-file-size:                   90MB        # 限制单个文件的最大值
-  activemq:
-    broker-url: failover:(tcp://192.168.64.15:61616)
-    in-memory: true
-    pool:
-      enabled: false
-    user: admin
-    password: admin
-    non-blocking-redelivery: true
+  #activemq:
+   # broker-url: failover:(tcp://192.168.64.15:61616)
+    # in-memory: true
+      #pool:
+      #  enabled: false
+    # user: admin
+    #  password: admin
+    #  non-blocking-redelivery: true
 mybatis:
 mybatis:
   typeAliasesPackage:                  cn.sagacloud.server.algorithm.models
   typeAliasesPackage:                  cn.sagacloud.server.algorithm.models
 
 

+ 8 - 8
revit-algorithm/src/main/resources-prod/application.yml

@@ -53,14 +53,14 @@ spring:
     multipart:
     multipart:
       max-request-size:                90MB        # 限制上传的多个文件的总大小
       max-request-size:                90MB        # 限制上传的多个文件的总大小
       max-file-size:                   90MB        # 限制单个文件的最大值
       max-file-size:                   90MB        # 限制单个文件的最大值
-  activemq:
-    broker-url: failover:(tcp://172.17.100.16:61616)
-    in-memory: true
-    pool:
-      enabled: false
-    user: admin
-    password: admin
-    non-blocking-redelivery: true
+  #activemq:
+   # broker-url: failover:(tcp://172.17.100.16:61616)
+    #in-memory: true
+    #pool:
+     # enabled: false
+    #user: admin
+    #password: admin
+    #non-blocking-redelivery: true
 mybatis:
 mybatis:
   typeAliasesPackage:                  cn.sagacloud.server.algorithm.models
   typeAliasesPackage:                  cn.sagacloud.server.algorithm.models
 
 

+ 8 - 8
revit-algorithm/src/main/resources-prod/application14.yml

@@ -48,14 +48,14 @@ spring:
     multipart:
     multipart:
       max-request-size:                90MB        # 限制上传的多个文件的总大小
       max-request-size:                90MB        # 限制上传的多个文件的总大小
       max-file-size:                   90MB        # 限制单个文件的最大值
       max-file-size:                   90MB        # 限制单个文件的最大值
-  activemq:
-    broker-url: failover:(tcp://192.168.64.14:61616)
-    in-memory: true
-    pool:
-      enabled: false
-    user: admin
-    password: admin
-    non-blocking-redelivery: true
+    #activemq:
+    # broker-url: failover:(tcp://172.17.100.16:61616)
+    #in-memory: true
+    #pool:
+    # enabled: false
+    #user: admin
+    #password: admin
+    #non-blocking-redelivery: true
 mybatis:
 mybatis:
   typeAliasesPackage:                  cn.sagacloud.server.algorithm.models
   typeAliasesPackage:                  cn.sagacloud.server.algorithm.models
 
 

+ 8 - 8
revit-algorithm/src/main/resources-prod/application239.yml

@@ -48,14 +48,14 @@ spring:
     multipart:
     multipart:
       max-request-size:                90MB        # 限制上传的多个文件的总大小
       max-request-size:                90MB        # 限制上传的多个文件的总大小
       max-file-size:                   90MB        # 限制单个文件的最大值
       max-file-size:                   90MB        # 限制单个文件的最大值
-  activemq:
-    broker-url: failover:(tcp://172.17.100.16:61616)
-    in-memory: true
-    pool:
-      enabled: false
-    user: admin
-    password: admin
-    non-blocking-redelivery: true
+      #activemq:
+      # broker-url: failover:(tcp://172.17.100.16:61616)
+      #in-memory: true
+      #pool:
+      # enabled: false
+    #user: admin
+    #password: admin
+    #non-blocking-redelivery: true
 mybatis:
 mybatis:
   typeAliasesPackage:                  cn.sagacloud.server.algorithm.models
   typeAliasesPackage:                  cn.sagacloud.server.algorithm.models
 
 

+ 8 - 8
revit-algorithm/src/main/resources-prod/application60.yml

@@ -48,14 +48,14 @@ spring:
     multipart:
     multipart:
       max-request-size:                90MB        # 限制上传的多个文件的总大小
       max-request-size:                90MB        # 限制上传的多个文件的总大小
       max-file-size:                   90MB        # 限制单个文件的最大值
       max-file-size:                   90MB        # 限制单个文件的最大值
-  activemq:
-    broker-url: failover:(tcp://60.205.177.43:61616)
-    in-memory: true
-    pool:
-      enabled: false
-    user: admin
-    password: admin
-    non-blocking-redelivery: true
+      #activemq:
+      # broker-url: failover:(tcp://172.17.100.16:61616)
+      #in-memory: true
+      #pool:
+      # enabled: false
+    #user: admin
+    #password: admin
+    #non-blocking-redelivery: true
 mybatis:
 mybatis:
   typeAliasesPackage:                  cn.sagacloud.server.algorithm.models
   typeAliasesPackage:                  cn.sagacloud.server.algorithm.models
 
 

+ 1 - 1
scanbuilding/build.gradle

@@ -61,7 +61,7 @@ dependencies {
     compile group: "org.springframework.boot", name: "spring-boot-starter-actuator", version: SPRING_BOOT_VERSION
     compile group: "org.springframework.boot", name: "spring-boot-starter-actuator", version: SPRING_BOOT_VERSION
     compile group: "org.springframework.boot", name: "spring-boot-starter-logging", version: SPRING_BOOT_VERSION
     compile group: "org.springframework.boot", name: "spring-boot-starter-logging", version: SPRING_BOOT_VERSION
     //消息
     //消息
-    compile group: "org.springframework.boot", name: "spring-boot-starter-activemq", version: SPRING_BOOT_VERSION
+    //compile group: "org.springframework.boot", name: "spring-boot-starter-activemq", version: SPRING_BOOT_VERSION
     providedCompile group: "org.springframework.boot", name:"spring-boot-starter-tomcat", version: SPRING_BOOT_VERSION
     providedCompile group: "org.springframework.boot", name:"spring-boot-starter-tomcat", version: SPRING_BOOT_VERSION
     // spring boot 缓存
     // spring boot 缓存
     compile group:"org.springframework.boot", name:"spring-boot-starter-cache", version: SPRING_BOOT_VERSION
     compile group:"org.springframework.boot", name:"spring-boot-starter-cache", version: SPRING_BOOT_VERSION

+ 1 - 0
scanbuilding/src/main/kotlin/com/persagy/server/services/AdmBaseService.kt

@@ -108,6 +108,7 @@ class AdmBaseService {
         }
         }
         val content = ArrayList<ZoneIspace>()
         val content = ArrayList<ZoneIspace>()
         for(obj in result.content!!){
         for(obj in result.content!!){
+
             val ispace = JSON.toJavaObject(obj, ZoneIspace::class.java)
             val ispace = JSON.toJavaObject(obj, ZoneIspace::class.java)
             content.add(ispace)
             content.add(ispace)
         }
         }

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 40 - 14
scanbuilding/src/main/kotlin/com/persagy/server/services/task/ModelScanTaskService.kt


+ 8 - 1
scanbuilding/src/main/kotlin/com/persagy/server/services/task/ScanTaskBaseService.kt

@@ -101,7 +101,14 @@ object ScanTaskBaseService : RService<ScanTaskBase>(SMybatisDao(ScanTaskBase::cl
              objTypeList.add("equipment")
              objTypeList.add("equipment")
              objTypeList.add("component")
              objTypeList.add("component")
              objTypes["\$in"] = objTypeList
              objTypes["\$in"] = objTypeList
-        }else{
+         }else if ("model" == type){
+             val objTypes = JSONObject()
+             val objTypeList: MutableList<String> = java.util.ArrayList()
+             objTypeList.add("equipment")
+             objTypeList.add("component")
+             objTypeList.add("model")
+             objTypes["\$in"] = objTypeList
+         }else{
              criteria["objType"] = type
              criteria["objType"] = type
          }
          }
         param["criteria"] = criteria
         param["criteria"] = criteria

+ 49 - 0
scanbuilding/src/main/kotlin/com/persagy/server/util/GeoToolsUtil.java

@@ -2,6 +2,7 @@ package com.persagy.server.util;
 
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.persagy.server.datacenter.models.entities.assistant.PointPosition;
 import org.geotools.geometry.jts.JTSFactoryFinder;
 import org.geotools.geometry.jts.JTSFactoryFinder;
 import org.locationtech.jts.geom.*;
 import org.locationtech.jts.geom.*;
 
 
@@ -42,6 +43,31 @@ public class GeoToolsUtil {
      * 创建面
      * 创建面
      * @param outLines
      * @param outLines
      */
      */
+    private static Polygon createPolygon(ArrayList<ArrayList<PointPosition>> outLines){
+        ArrayList<PointPosition> pointPositions = outLines.get(0);
+        GeometryFactory geometryFactory = JTSFactoryFinder.getGeometryFactory();
+        List<Coordinate> objects = new ArrayList<>();
+        for (PointPosition outLine : pointPositions) {
+            double x = outLine.getX();
+            double y = outLine.getY();
+            double z = outLine.getZ();
+            Coordinate coordinate = new Coordinate(x, y, z);
+            objects.add(coordinate);
+        }
+        //注意数据的闭合
+        Coordinate[] coordinates = objects.toArray(new Coordinate[0]);
+        LinearRing ring = geometryFactory.createLinearRing(coordinates);
+        LinearRing holes[] = null;
+        Polygon polygon = geometryFactory.createPolygon(ring, holes);
+
+        return polygon;
+    }
+
+
+    /**
+     * 创建面
+     * @param outLines
+     */
     private static Polygon createPolygon(List<LinkedHashMap<String,Object>> outLines){
     private static Polygon createPolygon(List<LinkedHashMap<String,Object>> outLines){
         GeometryFactory geometryFactory = JTSFactoryFinder.getGeometryFactory();
         GeometryFactory geometryFactory = JTSFactoryFinder.getGeometryFactory();
         List<Coordinate> objects = new ArrayList<>();
         List<Coordinate> objects = new ArrayList<>();
@@ -79,6 +105,29 @@ public class GeoToolsUtil {
         //判断点面包含关系
         //判断点面包含关系
         return polygon.contains(point);
         return polygon.contains(point);
     }
     }
+
+
+    /**
+     * 点面包含关系判断
+     * 用途:判断一个面是否包含一个点,即一个点是否在一个面内
+     * @param pointLocal 坐标点
+     * @param outLines 轮廓线
+     * @return
+     */
+    public static Boolean isPointInPoly(ObjectNode pointLocal, ArrayList<ArrayList<PointPosition>> outLines) {
+        if (null==pointLocal || CollUtil.isEmpty(outLines)){
+            return false;
+        }
+        //创建点
+        Point point = createPoint(pointLocal);
+        //创建面
+        Polygon polygon = createPolygon(outLines);
+        //判断点面包含关系
+        return polygon.contains(point);
+    }
+
+
+
     /**
     /**
      * 点面包含关系判断
      * 点面包含关系判断
      * 用途:判断一个面是否包含一个点,即一个点是否在一个面内
      * 用途:判断一个面是否包含一个点,即一个点是否在一个面内

+ 1 - 1
scheduler/build.gradle

@@ -58,7 +58,7 @@ dependencies {
     compile group: "org.springframework.boot", name: "spring-boot-starter-actuator", version: SPRING_BOOT_VERSION
     compile group: "org.springframework.boot", name: "spring-boot-starter-actuator", version: SPRING_BOOT_VERSION
     compile group: "org.springframework.boot", name: "spring-boot-starter-logging", version: SPRING_BOOT_VERSION
     compile group: "org.springframework.boot", name: "spring-boot-starter-logging", version: SPRING_BOOT_VERSION
     //消息
     //消息
-    compile group: "org.springframework.boot", name: "spring-boot-starter-activemq", version: SPRING_BOOT_VERSION
+   // compile group: "org.springframework.boot", name: "spring-boot-starter-activemq", version: SPRING_BOOT_VERSION
     providedCompile group: "org.springframework.boot", name:"spring-boot-starter-tomcat", version: SPRING_BOOT_VERSION
     providedCompile group: "org.springframework.boot", name:"spring-boot-starter-tomcat", version: SPRING_BOOT_VERSION
     // spring boot 缓存
     // spring boot 缓存
     compile group:"org.springframework.boot", name:"spring-boot-starter-cache", version: SPRING_BOOT_VERSION
     compile group:"org.springframework.boot", name:"spring-boot-starter-cache", version: SPRING_BOOT_VERSION

+ 8 - 8
scheduler/src/main/resources-dev/application.yml

@@ -62,14 +62,14 @@ spring:
 #    pool.enabled:                       false
 #    pool.enabled:                       false
 #    user:                               admin
 #    user:                               admin
 #    password:                           admin
 #    password:                           admin
-  activemq:
-    broker-url: failover:(tcp://192.168.64.15:61616)
-    in-memory: true
-    pool:
-      enabled: false
-    user: admin
-    password: admin
-    non-blocking-redelivery: true
+  #activemq:
+   # broker-url: failover:(tcp://192.168.64.15:61616)
+    #in-memory: true
+    #pool:
+     # enabled: false
+    #user: admin
+    #password: admin
+    #non-blocking-redelivery: true
 
 
   jms:
   jms:
     pub-sub-domain: true
     pub-sub-domain: true

+ 8 - 8
scheduler/src/main/resources-prod/application.yml

@@ -67,14 +67,14 @@ spring:
 #    pool.enabled:                       false
 #    pool.enabled:                       false
 #    user:                               admin
 #    user:                               admin
 #    password:                           admin
 #    password:                           admin
-  activemq:
-    broker-url: failover:(tcp://172.17.100.16:61616)
-    in-memory: true
-    pool:
-      enabled: false
-    user: admin
-    password: admin
-    non-blocking-redelivery: true
+      #activemq:
+      # broker-url: failover:(tcp://192.168.64.15:61616)
+      #in-memory: true
+      #pool:
+      # enabled: false
+    #user: admin
+    #password: admin
+    #non-blocking-redelivery: true
 
 
   jms:
   jms:
     pub-sub-domain: true
     pub-sub-domain: true

+ 8 - 8
scheduler/src/main/resources-prod/application60.yml

@@ -67,14 +67,14 @@ spring:
 #    pool.enabled:                       false
 #    pool.enabled:                       false
 #    user:                               admin
 #    user:                               admin
 #    password:                           admin
 #    password:                           admin
-  activemq:
-    broker-url: failover:(tcp://60.205.177.43:61616)
-    in-memory: true
-    pool:
-      enabled: false
-    user: admin
-    password: admin
-    non-blocking-redelivery: true
+      #activemq:
+      # broker-url: failover:(tcp://192.168.64.15:61616)
+      #in-memory: true
+      #pool:
+      # enabled: false
+    #user: admin
+    #password: admin
+    #non-blocking-redelivery: true
 
 
   jms:
   jms:
     pub-sub-domain: true
     pub-sub-domain: true

+ 8 - 8
scheduler/src/main/resources-test/application.yml

@@ -67,14 +67,14 @@ spring:
 #    pool.enabled:                       false
 #    pool.enabled:                       false
 #    user:                               admin
 #    user:                               admin
 #    password:                           admin
 #    password:                           admin
-  activemq:
-    broker-url: failover:(tcp://192.168.64.14:61616)
-    in-memory: true
-    pool:
-      enabled: false
-    user: admin
-    password: admin
-    non-blocking-redelivery: true
+      #activemq:
+      # broker-url: failover:(tcp://192.168.64.15:61616)
+      #in-memory: true
+      #pool:
+      # enabled: false
+    #user: admin
+    #password: admin
+    #non-blocking-redelivery: true
 
 
   jms:
   jms:
     pub-sub-domain: true
     pub-sub-domain: true

+ 8 - 8
scheduler/src/main/resources-test/application60.yml

@@ -67,14 +67,14 @@ spring:
 #    pool.enabled:                       false
 #    pool.enabled:                       false
 #    user:                               admin
 #    user:                               admin
 #    password:                           admin
 #    password:                           admin
-  activemq:
-    broker-url: failover:(tcp://60.205.177.43:61616)
-    in-memory: true
-    pool:
-      enabled: false
-    user: admin
-    password: admin
-    non-blocking-redelivery: true
+      #activemq:
+      # broker-url: failover:(tcp://192.168.64.15:61616)
+      #in-memory: true
+      #pool:
+      # enabled: false
+    #user: admin
+    #password: admin
+    #non-blocking-redelivery: true
 
 
   jms:
   jms:
     pub-sub-domain: true
     pub-sub-domain: true