Browse Source

Merge remote-tracking branch 'origin/master'

caiaf 4 years ago
parent
commit
33f4b4b375

+ 1 - 1
equip-component/src/main/kotlin/com/persagy/server/models/ComponentCascade.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.models
 
-import com.persagy.server.datacenter.datacenter.wanda.obj.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Table

+ 1 - 2
equip-component/src/main/kotlin/com/persagy/server/models/PropertySupplement.kt

@@ -31,9 +31,8 @@ import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.server.datacenter.models.entities.dict.EquipFamily
 import com.persagy.server.datacenter.models.entities.dict.EquipFamilyCategory
 import com.persagy.server.datacenter.models.entities.dict.Family
-import com.persagy.server.datacenter.datacenter.wanda.obj.Building
+import com.persagy.server.datacenter.wanda.obj.Building
 import com.persagy.server.datacenter.wanda.obj.Equipment
-import com.persagy.server.datacenter.models.entities.objects.Project
 import com.persagy.server.models.objects.FloorCompon
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 2
equip-component/src/main/kotlin/com/persagy/server/models/objects/FloorCompon.kt

@@ -28,8 +28,7 @@ package com.persagy.server.models.objects
 
 import com.persagy.server.datacenter.models.entities.assistant.PointPosition
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import com.persagy.server.datacenter.datacenter.wanda.obj.Building
-import com.persagy.server.datacenter.models.entities.objects.Project
+import com.persagy.server.datacenter.wanda.obj.Project
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column

+ 1 - 1
equip-component/src/main/kotlin/com/persagy/server/service/EquipmentORComService.kt

@@ -28,7 +28,7 @@ package com.persagy.server.service
 
 import com.persagy.database.SQueryBuilder
 import com.persagy.mybatis.SMybatisDao
-import com.persagy.server.datacenter.datacenter.wanda.obj.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.service.base.Service
 
 /**

+ 14 - 14
equip-component/src/main/kotlin/com/persagy/server/service/dict/DictDefClassService.kt

@@ -202,22 +202,22 @@ object DefFuncIdService: SObjectService<DefFuncId>(SMybatisDao(DefFuncId::class.
                 for (equipTypeProject in equipTypeProjectList){
                     equipTypeList.add(equipTypeProject.classCode!!)
                 }
-                val dictInfosWanDaGroupList = dictInfosWanDaService.select(SFilter.eq("groupCode", Opt.groupCode!!), SFilter.eq("projectId", "0"),SFilter.inList("classCode", equipTypeList)).exec()
-                val dictInfosWanDaProjectList = dictInfosWanDaService.select(SFilter.eq("groupCode", Opt.groupCode!!), SFilter.eq("projectId", Opt.projectId!!),SFilter.inList("classCode", equipTypeList)).exec()
-                val setCode = HashSet<String>()
-                for (dictInfosWanDaGroup in dictInfosWanDaGroupList){
-                    setCode.add(dictInfosWanDaGroup.classCode!!)
-                }
-                if (dictInfosWanDaProjectList.size>0){
-                    for (dictInfosWanDaProject in dictInfosWanDaProjectList){
-                        setCode.add(dictInfosWanDaProject.classCode!!)
-                    }
-                }
-                var defClassList = defClassService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.inList("code", setCode.toList())).order("code").exec()
+//                val dictInfosWanDaGroupList = dictInfosWanDaService.select(SFilter.eq("groupCode", Opt.groupCode!!), SFilter.eq("projectId", "0"),SFilter.inList("classCode", equipTypeList)).exec()
+//                val dictInfosWanDaProjectList = dictInfosWanDaService.select(SFilter.eq("groupCode", Opt.groupCode!!), SFilter.eq("projectId", Opt.projectId!!),SFilter.inList("classCode", equipTypeList)).exec()
+//                val setCode = HashSet<String>()
+//                for (dictInfosWanDaGroup in dictInfosWanDaGroupList){
+//                    setCode.add(dictInfosWanDaGroup.classCode!!)
+//                }
+//                if (dictInfosWanDaProjectList.size>0){
+//                    for (dictInfosWanDaProject in dictInfosWanDaProjectList){
+//                        setCode.add(dictInfosWanDaProject.classCode!!)
+//                    }
+//                }
+                var defClassList = defClassService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.inList("code", equipTypeList)).order("code").exec()
                 if (defClassList.size == 0){
-                    defClassList = defClassService.select(SFilter.eq("type","group"), SFilter.eq("groupCode",Opt.groupCode!!),SFilter.inList("code", setCode.toList())).order("code").exec()
+                    defClassList = defClassService.select(SFilter.eq("type","group"), SFilter.eq("groupCode",Opt.groupCode!!),SFilter.inList("code", equipTypeList)).order("code").exec()
                     if (defClassList.size == 0){
-                        defClassList = defClassService.select(SFilter.eq("type", "common"), SFilter.inList("code", setCode.toList())).order("code").exec()
+                        defClassList = defClassService.select(SFilter.eq("type", "common"), SFilter.inList("code", equipTypeList)).order("code").exec()
                     }
                 }
                if (defClassList.size>0){

+ 1 - 1
equip-component/src/main/kotlin/com/persagy/server/service/labsl/CustomSqlLabslService.kt

@@ -33,7 +33,7 @@ import com.persagy.server.datacenter.datacenter.models.entities.dictnew.DefClass
 import com.persagy.server.datacenter.datacenter.models.entities.dictnew.DictMajor
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
 import com.persagy.server.datacenter.wanda.obj.Building
-import com.persagy.server.datacenter.models.entities.objects.Floor
+import com.persagy.server.datacenter.wanda.obj.Floor
 import com.persagy.server.models.mappers.CustomSqlLabsl
 import com.persagy.server.models.responses.EquipQueryCount
 import com.persagy.service.SBaseService

+ 3 - 3
equip-component/src/main/kotlin/com/persagy/server/service/objects/EquipmentService.kt

@@ -35,13 +35,13 @@ import com.persagy.server.Opt
 import com.persagy.server.dao.mappers.CustomSql
 import com.persagy.server.datacenter.models.entities.dict.EquipFamily
 import com.persagy.server.datacenter.datacenter.models.entities.dictnew.DefClass
+import com.persagy.server.datacenter.datacenter.models.entities.objects.Property
 import com.persagy.server.datacenter.wanda.obj.Equipment
-import com.persagy.server.datacenter.models.entities.objects.Property
-import com.persagy.server.datacenter.datacenter.models.entities.objects.ZoneSpace
-import com.persagy.server.datacenter.datacenter.models.entities.rel.REq2Sp
 import com.persagy.server.datacenter.models.entities.rel.RSpinBd
 import com.persagy.server.datacenter.models.entities.rel.RSpinFl
 import com.persagy.server.datacenter.models.response.EquipAssetComponentsReqponse
+import com.persagy.server.datacenter.wanda.obj.ZoneSpace
+import com.persagy.server.datacenter.wanda.rel.REq2Sp
 import com.persagy.server.models.ComponentProperty
 import com.persagy.server.models.EquipComDel
 import com.persagy.server.models.PropertySupplement

+ 2 - 2
equip-component/src/main/kotlin/com/persagy/server/service/objects/GeneralSystemService.kt

@@ -28,8 +28,8 @@ package com.persagy.server.service.objects
 
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
-import com.persagy.server.datacenter.models.entities.objects.GeneralSystem
-import com.persagy.server.datacenter.datacenter.wanda.rel.RSy2Sp
+import com.persagy.server.datacenter.wanda.obj.GeneralSystem
+import com.persagy.server.datacenter.wanda.rel.RSy2Sp
 import com.persagy.server.service.RSyInShService
 import com.persagy.server.service.base.Service
 import com.persagy.service.SBaseService

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

@@ -30,10 +30,10 @@ import com.persagy.database.SFilter
 import com.persagy.database.SQueryBuilder
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opt
-import com.persagy.server.datacenter.models.entities.objects.ZoneIspace
 import com.persagy.server.datacenter.wanda.obj.ZoneSpace
 import com.persagy.server.datacenter.models.entities.rel.RSpatialConnection
 import com.persagy.server.datacenter.models.entities.rel.RSpinFl
+import com.persagy.server.datacenter.wanda.obj.ZoneIspace
 import com.persagy.server.models.planar.PlanarSpace
 import com.persagy.server.models.requests.PlanarEquipRequests
 import com.persagy.server.models.requests.SpatialRelationship

+ 1 - 1
equip-component/src/main/kotlin/com/persagy/server/service/objects/ZoneSpaceService.kt

@@ -31,8 +31,8 @@ import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.dao.mappers.ZoneSpaceMapper
 import com.persagy.server.datacenter.datacenter.models.entities.dictnew.DefClass
-import com.persagy.server.datacenter.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.server.datacenter.models.requests.UpZoneSpaceBaseRequest
+import com.persagy.server.datacenter.wanda.obj.ZoneSpace
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType

+ 2 - 2
equip-component/src/main/kotlin/com/persagy/server/utils/MatchingProperty.kt

@@ -31,9 +31,9 @@ import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.persagy.base.extensions.eq
 import com.persagy.server.dao.mappers.EquipmentZoneMapper
+import com.persagy.server.datacenter.datacenter.models.entities.objects.Property
 import com.persagy.server.datacenter.models.entities.assistant.PointD
-import com.persagy.server.datacenter.datacenter.wanda.obj.Equipment
-import com.persagy.server.datacenter.models.entities.objects.Property
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.models.SimilarityDegree
 import com.persagy.service.utils.SSpringContextUtil
 import org.slf4j.LoggerFactory

+ 2 - 0
equip-component/src/main/resources/application-test.yml

@@ -22,3 +22,5 @@ spring:
     password:                           cGVyc2FneV8yMDIwcXdlIUAj
 
 
+
+