Просмотр исходного кода

feat(adm-diagram): 查询条件添加

liyang 2 лет назад
Родитель
Сommit
af65f64513

+ 4 - 4
adm-business/adm-diagram/pom.xml

@@ -45,10 +45,10 @@
             <groupId>com.persagy</groupId>
             <artifactId>dmp-digital-starter</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.persagy</groupId>
-            <artifactId>dmp-file-starter</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.persagy</groupId>-->
+<!--            <artifactId>dmp-file-starter</artifactId>-->
+<!--        </dependency>-->
 
 
         <dependency>

+ 1 - 0
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/core/impl/DataStrategyImpl.java

@@ -307,6 +307,7 @@ public class DataStrategyImpl implements DataStrategy {
 
         if (StrUtil.isNotBlank(systemId)) {
             ObjectNode on = JsonNodeFactory.instance.objectNode();
+            on.put(ObjectRelation.GRAPH_CODE_HUM, "MechSubset");
             on.put(ObjectRelation.REL_CODE_HUM, "Sy2Eq");
             on.put(ObjectRelation.OBJ_FROM_HUM, systemId);
             criteria.getCriteria().set(QueryOperator.RELATION_TO.getIndex(), on);

+ 18 - 1
adm-business/adm-diagram/src/main/resources/bootstrap.yml

@@ -5,7 +5,24 @@ spring:
     # 应用名称
     name: adm-diagram
   datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
+    dynamic:
+      datasource:
+        master:
+          username: root
+          password: 123456
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://localhost:3306/adm_diagram
+persagy:
+  common:
+    token:
+      enabled: false
+  bdtp:
+    rwd:
+      service: http://develop.ysbdtp.com/dmp-rwd
+    dic:
+      service: http://develop.ysbdtp.com/dmp-dic
+
+#    driver-class-name: com.mysql.cj.jdbc.Driver
 #  datasource:
 #    druid:
 #      filters: stat,slf4j

+ 4 - 4
adm-business/adm-server/pom.xml

@@ -30,9 +30,9 @@
             <groupId>com.persagy</groupId>
             <artifactId>dmp-digital-starter</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.persagy</groupId>
-            <artifactId>dmp-file-starter</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.persagy</groupId>-->
+<!--            <artifactId>dmp-file-starter</artifactId>-->
+<!--        </dependency>-->
     </dependencies>
 </project>