|
@@ -24,24 +24,23 @@
|
|
|
* *********************************************************************************************************************
|
|
|
*/
|
|
|
|
|
|
-package com.persagy.server.syn.controllers.obj
|
|
|
+package com.persagy.server.datacenter.syn.controllers.obj
|
|
|
|
|
|
import com.alibaba.fastjson.JSONArray
|
|
|
import com.alibaba.fastjson.JSONObject
|
|
|
import com.persagy.base.extensions.toJson
|
|
|
import com.persagy.database.SFilter
|
|
|
import com.persagy.mybatis.SMybatisDao
|
|
|
-import com.persagy.server.datacenter.datacenter.wanda.obj.ZoneSpace
|
|
|
import com.persagy.server.datacenter.models.entities.dictnew.DictProject
|
|
|
import com.persagy.server.datacenter.models.entities.objects.*
|
|
|
-import com.persagy.server.datacenter.wanda.obj.Equipment
|
|
|
+import com.persagy.server.datacenter.syn.models.tools.EquipUtil
|
|
|
+import com.persagy.server.datacenter.syn.models.tools.SpaceUtil
|
|
|
+import com.persagy.server.datacenter.wanda.obj.*
|
|
|
import com.persagy.server.syn.Configure
|
|
|
import com.persagy.server.syn.models.api.obj.BuildingApi
|
|
|
import com.persagy.server.syn.models.api.obj.EquipApi
|
|
|
import com.persagy.server.syn.models.api.obj.FloorApi
|
|
|
-import com.persagy.server.syn.models.tools.EquipUtil
|
|
|
import com.persagy.server.syn.models.tools.ShaftUtil
|
|
|
-import com.persagy.server.syn.models.tools.SpaceUtil
|
|
|
import com.persagy.server.syn.models.tools.SystemUtil
|
|
|
import com.persagy.service.SBaseService
|
|
|
import com.persagy.service.SObjectService
|
|
@@ -264,7 +263,7 @@ class ObjectToFromController {
|
|
|
// space.outline = spaceOutline.outline
|
|
|
// }
|
|
|
val createObj =
|
|
|
- EquipApi.createObj(dictProject!!.groupCode!!, projectId,SpaceUtil.spaceTools(projectId, space))
|
|
|
+ EquipApi.createObj(dictProject!!.groupCode!!, projectId, SpaceUtil.spaceTools(projectId, space))
|
|
|
if (!createObj) {
|
|
|
val updateObj =
|
|
|
EquipApi.updateObj(dictProject!!.groupCode!!, projectId,SpaceUtil.spaceTools(projectId, space))
|