Переглянути джерело

Merge remote-tracking branch 'origin/master'

zhangweixin 4 роки тому
батько
коміт
b1e86edc69

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/RelationCalcService.kt

@@ -1144,7 +1144,7 @@ open class RelationCalcService {
                     }
                     val rEq2SpList = REq2SpService.select(SFilter.eq("projectId", projectId),
                             SFilter.inList("id1", listId)
-                            , SFilter.eq("type", "eq2sp_in"), SFilter.eq("type", "AirConditioningZone")).exec()
+                            , SFilter.eq("type", "eq2sp_in"), SFilter.eq("zoneType", "AirConditioningZone")).exec()
                     logger.debug("关系长度: ${rEq2SpList.size}")
                     if (rEq2SpList.size > 0) {
                         for (rEq2Sp in rEq2SpList) {

+ 1 - 0
datacenter/src/main/resources/application-prod.yml

@@ -43,6 +43,7 @@ spring:
 #    password:                           persagy_2020qwe!@#
     password:                           cGVyc2FneV8yMDIwcXdlIUAj
 
+
   rabbitmq:
     host: 39.102.43.179
     port: 9936