|
@@ -24,21 +24,17 @@
|
|
|
* *********************************************************************************************************************
|
|
|
*/
|
|
|
|
|
|
-package com.persagy.server.services.relation_calc
|
|
|
+package com.persagy.server.datacenter.services.relation_calc
|
|
|
|
|
|
-import com.persagy.base.extensions.toJson
|
|
|
import com.persagy.database.SFilter
|
|
|
import com.persagy.mybatis.SMybatisDao
|
|
|
import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
|
|
|
import com.persagy.server.datacenter.models.entities.graphtype.block.ConnectedBlock
|
|
|
import com.persagy.server.datacenter.wanda.rel.REq2Eq
|
|
|
import com.persagy.server.mappers.ICalcSpecialMapper
|
|
|
-import com.persagy.server.models.`object`.ClassCodeEnum
|
|
|
import com.persagy.server.models.`object`.NetWork
|
|
|
import com.persagy.server.models.entities.Connector
|
|
|
-import com.persagy.server.models.service.BaseDataService
|
|
|
import com.persagy.server.services.assistant.RUpDateEquipAndSapceService
|
|
|
-import com.persagy.server.services.objects.EquipmentService
|
|
|
import com.persagy.server.services.objects.FloorService
|
|
|
import com.persagy.server.utils.IdUtils
|
|
|
import com.persagy.service.SBaseService
|
|
@@ -50,7 +46,6 @@ import com.persagy.service.models.responses.SBaseResponse
|
|
|
import org.json.JSONObject
|
|
|
import org.springframework.beans.factory.annotation.Autowired
|
|
|
import org.springframework.stereotype.Service
|
|
|
-import org.springframework.web.bind.annotation.RequestParam
|
|
|
|
|
|
/**
|
|
|
* 关系计算-管网
|
|
@@ -434,7 +429,7 @@ open class CalcSpecialService {
|
|
|
if(beforeList.containsAll(list)){
|
|
|
return NetWork(list,directList)
|
|
|
}else{
|
|
|
- newList.remove(beforeList)
|
|
|
+ newList.removeAll(beforeList)
|
|
|
return dist(list,beforeList,belongMap,typeMap,newList)
|
|
|
}
|
|
|
|