|
@@ -31,11 +31,6 @@ import com.persagy.mybatis.SMybatisDao
|
|
|
import com.persagy.server.Opt
|
|
|
import com.persagy.server.datacenter.models.entities.graphtype.MPoint
|
|
|
import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
|
|
|
-<<<<<<< HEAD:datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/RelationCalcService.kt
|
|
|
-import com.persagy.server.datacenter.models.entities.rel.REq2Sp
|
|
|
-import com.persagy.server.datacenter.models.entities.rel.RSp2Sp
|
|
|
-=======
|
|
|
->>>>>>> 4f9446037d0c154f4028be83daa67ceef061bcfe:datacenter/src/main/kotlin/com/persagy/server/datacenter/services/relation_calc/RelationCalcService.kt
|
|
|
import com.persagy.server.jms.RabbitMqService
|
|
|
import com.persagy.server.mappers.IRelationCalcMapper
|
|
|
import com.persagy.server.models.`object`.TwicePoint
|
|
@@ -43,11 +38,8 @@ import com.persagy.server.models.service.BaseDataService
|
|
|
import com.persagy.server.services.assistant.RUpDateEquipAndSapceService
|
|
|
import com.persagy.server.services.base.RService
|
|
|
import com.persagy.server.services.objects.EquipmentService
|
|
|
-<<<<<<< HEAD:datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/RelationCalcService.kt
|
|
|
import com.persagy.server.services.objects.FloorService
|
|
|
import com.persagy.server.services.objects.ZoneSpaceBaseService
|
|
|
-=======
|
|
|
->>>>>>> 4f9446037d0c154f4028be83daa67ceef061bcfe:datacenter/src/main/kotlin/com/persagy/server/datacenter/services/relation_calc/RelationCalcService.kt
|
|
|
import com.persagy.server.services.rel.REq2SpService
|
|
|
import com.persagy.server.utils.IdUtils
|
|
|
import com.persagy.service.SBaseService
|