|
@@ -4,9 +4,11 @@ import com.alibaba.fastjson.JSONArray
|
|
import com.persagy.database.SFilter
|
|
import com.persagy.database.SFilter
|
|
import com.persagy.mybatis.SMybatisDao
|
|
import com.persagy.mybatis.SMybatisDao
|
|
import com.persagy.server.datacenter.models.entities.dictnew.DictProject
|
|
import com.persagy.server.datacenter.models.entities.dictnew.DictProject
|
|
|
|
+import com.persagy.server.datacenter.models.entities.objects.ZoneSpace
|
|
import com.persagy.server.datacenter.models.jms.SynchronousMessageRel
|
|
import com.persagy.server.datacenter.models.jms.SynchronousMessageRel
|
|
import com.persagy.server.syn.Configure
|
|
import com.persagy.server.syn.Configure
|
|
import com.persagy.server.syn.models.api.obj.EquipApi
|
|
import com.persagy.server.syn.models.api.obj.EquipApi
|
|
|
|
+import com.persagy.service.SBaseService
|
|
import com.persagy.service.SObjectService
|
|
import com.persagy.service.SObjectService
|
|
import org.slf4j.LoggerFactory
|
|
import org.slf4j.LoggerFactory
|
|
import org.springframework.stereotype.Service
|
|
import org.springframework.stereotype.Service
|
|
@@ -26,6 +28,8 @@ class EquipinSpaceSync {
|
|
var synchronousMessageRelService = SObjectService(SMybatisDao(SynchronousMessageRel::class.java))
|
|
var synchronousMessageRelService = SObjectService(SMybatisDao(SynchronousMessageRel::class.java))
|
|
/** 项目所属的集团 */
|
|
/** 项目所属的集团 */
|
|
private val dictProjectService = SObjectService(SMybatisDao(DictProject::class.java))
|
|
private val dictProjectService = SObjectService(SMybatisDao(DictProject::class.java))
|
|
|
|
+ /** 空间对象服务 */
|
|
|
|
+ private val zoneSpaceService = SBaseService(SMybatisDao(ZoneSpace::class.java))
|
|
|
|
|
|
/**
|
|
/**
|
|
* 创建关系
|
|
* 创建关系
|
|
@@ -42,11 +46,19 @@ class EquipinSpaceSync {
|
|
synchronousMessageRel.sign = 0
|
|
synchronousMessageRel.sign = 0
|
|
val toJsonObjArray :JSONArray
|
|
val toJsonObjArray :JSONArray
|
|
if (!fromIds.isNullOrEmpty()){
|
|
if (!fromIds.isNullOrEmpty()){
|
|
- /** 关系列表 */
|
|
|
|
- toJsonObjArray= Configure.toJsonObjFromList(graphCode, relCode, fromIds, synchronousMessageRel.fromId!!)
|
|
|
|
|
|
+ /** 关系列表 */
|
|
|
|
+ val zoneSpace = zoneSpaceService.select(
|
|
|
|
+ SFilter.eq("projectId", synchronousMessageRel.projectId!!),
|
|
|
|
+ SFilter.eq("id", synchronousMessageRel.fromId!!)
|
|
|
|
+ ).entity()
|
|
|
|
+ toJsonObjArray= Configure.toJsonObjFromList(graphCode, relCode, fromIds, synchronousMessageRel.fromId!!,zoneSpace?.classCode)
|
|
} else {
|
|
} else {
|
|
- /** 关系列表 */
|
|
|
|
- toJsonObjArray = Configure.toJsonObjArray(graphCode, relCode, synchronousMessageRel.fromId!!, synchronousMessageRel.toId!!)
|
|
|
|
|
|
+ val zoneSpace = zoneSpaceService.select(
|
|
|
|
+ SFilter.eq("projectId", synchronousMessageRel.projectId!!),
|
|
|
|
+ SFilter.eq("id", synchronousMessageRel.toId!!)
|
|
|
|
+ ).entity()
|
|
|
|
+ /** 关系列表 */
|
|
|
|
+ toJsonObjArray = Configure.toJsonObjArray(graphCode, relCode, synchronousMessageRel.fromId!!, synchronousMessageRel.toId!!,zoneSpace?.classCode)
|
|
}
|
|
}
|
|
|
|
|
|
val createRel = EquipApi.createRel(dictProject.groupCode!!, synchronousMessageRel.projectId!!, toJsonObjArray)
|
|
val createRel = EquipApi.createRel(dictProject.groupCode!!, synchronousMessageRel.projectId!!, toJsonObjArray)
|
|
@@ -145,9 +157,13 @@ class EquipinSpaceSync {
|
|
val toJsonObj = Configure.toJsonObj(graphCode, relCode, synchronousMessageRel.fromId!!, null)
|
|
val toJsonObj = Configure.toJsonObj(graphCode, relCode, synchronousMessageRel.fromId!!, null)
|
|
val delRel = EquipApi.delRel(dictProject.groupCode!!, synchronousMessageRel.projectId!!, toJsonObj)
|
|
val delRel = EquipApi.delRel(dictProject.groupCode!!, synchronousMessageRel.projectId!!, toJsonObj)
|
|
if (delRel) {
|
|
if (delRel) {
|
|
|
|
+ val zoneSpace = zoneSpaceService.select(
|
|
|
|
+ SFilter.eq("projectId", synchronousMessageRel.projectId!!),
|
|
|
|
+ SFilter.eq("id", toIds[0])
|
|
|
|
+ ).entity()
|
|
/** 关系列表 */
|
|
/** 关系列表 */
|
|
val toJsonObjArray =
|
|
val toJsonObjArray =
|
|
- Configure.toJsonObjList(graphCode, relCode, synchronousMessageRel.fromId!!, toIds)
|
|
|
|
|
|
+ Configure.toJsonObjList(graphCode, relCode, synchronousMessageRel.fromId!!, toIds,zoneSpace?.classCode)
|
|
|
|
|
|
val createRel = EquipApi.createRel(dictProject.groupCode!!, synchronousMessageRel.projectId!!, toJsonObjArray)
|
|
val createRel = EquipApi.createRel(dictProject.groupCode!!, synchronousMessageRel.projectId!!, toJsonObjArray)
|
|
if (!createRel ){
|
|
if (!createRel ){
|
|
@@ -158,8 +174,7 @@ class EquipinSpaceSync {
|
|
synchronousMessageRel.sign = 2
|
|
synchronousMessageRel.sign = 2
|
|
synchronousMessageRel.count +1
|
|
synchronousMessageRel.count +1
|
|
}
|
|
}
|
|
- /** 更改标记 */
|
|
|
|
- synchronousMessageRelService.update(synchronousMessageRel, arrayListOf("sign","count"))
|
|
|
|
|
|
+
|
|
|
|
|
|
} else {
|
|
} else {
|
|
synchronousMessageRel.sign = 2
|
|
synchronousMessageRel.sign = 2
|
|
@@ -167,7 +182,11 @@ class EquipinSpaceSync {
|
|
}
|
|
}
|
|
} catch (e: Exception) {
|
|
} catch (e: Exception) {
|
|
e.printStackTrace()
|
|
e.printStackTrace()
|
|
|
|
+ synchronousMessageRel.sign = 2
|
|
|
|
+ synchronousMessageRel.count +1
|
|
}
|
|
}
|
|
|
|
+ /** 更改标记 */
|
|
|
|
+ synchronousMessageRelService.update(synchronousMessageRel, arrayListOf("sign","count"))
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -189,9 +208,13 @@ class EquipinSpaceSync {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (synchronousMessageRel.sign == 0){
|
|
if (synchronousMessageRel.sign == 0){
|
|
|
|
+ val zoneSpace = zoneSpaceService.select(
|
|
|
|
+ SFilter.eq("projectId", synchronousMessageRel.projectId!!),
|
|
|
|
+ SFilter.eq("id", synchronousMessageRel.toId!!)
|
|
|
|
+ ).entity()
|
|
/** 关系列表 */
|
|
/** 关系列表 */
|
|
val toJsonObjArray =
|
|
val toJsonObjArray =
|
|
- Configure.toJsonObjFromList(graphCode, relCode, fromIds, synchronousMessageRel.toId!!)
|
|
|
|
|
|
+ Configure.toJsonObjFromList(graphCode, relCode, fromIds, synchronousMessageRel.toId!!,zoneSpace?.classCode)
|
|
|
|
|
|
val createRel = EquipApi.createRel(dictProject.groupCode!!, synchronousMessageRel.projectId!!, toJsonObjArray)
|
|
val createRel = EquipApi.createRel(dictProject.groupCode!!, synchronousMessageRel.projectId!!, toJsonObjArray)
|
|
if (!createRel ){
|
|
if (!createRel ){
|