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

******************************************* wx *****************
修改接口

zhangweixin преди 4 години
родител
ревизия
fc7ac590c4

+ 2 - 2
datacenter/src/main/resources/application-dev.yml

@@ -33,8 +33,8 @@ spring:
     name:                               revit-algorithm
     type:                               com.alibaba.druid.pool.DruidDataSource
     driver-class-name:                  org.postgresql.Driver
-#    url:                                jdbc:postgresql://60.205.177.43:5432/datacenterlabsl
-    url:                                jdbc:postgresql://39.102.40.239:5432/datacenter
+    url:                                jdbc:postgresql://60.205.177.43:5432/datacenterlabsl
+#    url:                                jdbc:postgresql://39.102.40.239:5432/datacenter
     username:                           postgres
 #    password:                           persagy_2020qwe!@#
     password:                           cGVyc2FneV8yMDIwcXdlIUAj

+ 18 - 14
equip-component/src/main/kotlin/com/persagy/server/service/objects/ZoneSpaceBaseService.kt

@@ -137,16 +137,18 @@ object ZoneSpaceBaseService : SObjectService<ZoneSpace>(SMybatisDao(ZoneSpace::c
     fun spaceQuery(request: PlanarEquipRequests): SQueryResponse<PlanarSpace> {
         try {
             val sQueryResponse = SQueryResponse<PlanarSpace>(SResponseType.success)
-            if (request.spaceIds.isNullOrEmpty()){
-                request.spaceIds = ArrayList()
-            }
+
             if (!request.zoneTypes.isNullOrEmpty()&&!request.funcTypes.isNullOrEmpty()){
-                val spInFlList = spInFlService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.inList("objectType", request.zoneTypes!!),
+                if (request.spaceIds.isNullOrEmpty()){
+                    request.spaceIds = ArrayList()
+
+                    val spInFlList = spInFlService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.inList("objectType", request.zoneTypes!!),
                         SFilter.eq("buildingId", request.buildingId!!), SFilter.eq("floorId", request.floorId!!)).exec()
-                if (!spInFlList.isNullOrEmpty()) {
-                    val setIds = HashSet<String>()
-                    for (spInFl in spInFlList){
-                        request.spaceIds!!.add(spInFl.spaceId!!)
+                    if (!spInFlList.isNullOrEmpty()) {
+                        val setIds = HashSet<String>()
+                        for (spInFl in spInFlList){
+                            request.spaceIds!!.add(spInFl.spaceId!!)
+                        }
                     }
                 }
                 if (!request.spaceIds.isNullOrEmpty()) {
@@ -161,12 +163,14 @@ object ZoneSpaceBaseService : SObjectService<ZoneSpace>(SMybatisDao(ZoneSpace::c
                 }
 
             } else if (!request.zoneTypes.isNullOrEmpty()){
-                val spInFlList = spInFlService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.inList("objectType", request.zoneTypes!!),
-                    SFilter.eq("buildingId", request.buildingId!!), SFilter.eq("floorId", request.floorId!!)).exec()
-                if (!spInFlList.isNullOrEmpty()) {
-                    val setIds = HashSet<String>()
-                    for (spInFl in spInFlList){
-                        request.spaceIds!!.add(spInFl.spaceId!!)
+                if (request.spaceIds.isNullOrEmpty()){
+                    val spInFlList = spInFlService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.inList("objectType", request.zoneTypes!!),
+                        SFilter.eq("buildingId", request.buildingId!!), SFilter.eq("floorId", request.floorId!!)).exec()
+                    if (!spInFlList.isNullOrEmpty()) {
+                        val setIds = HashSet<String>()
+                        for (spInFl in spInFlList){
+                            request.spaceIds!!.add(spInFl.spaceId!!)
+                        }
                     }
                 }
                 if (!request.spaceIds.isNullOrEmpty()) {