|
@@ -29,6 +29,7 @@ package com.persagy.server.service
|
|
|
import com.persagy.database.SFilter
|
|
|
import com.persagy.database.extensions.keyValue
|
|
|
import com.persagy.mybatis.SMybatisDao
|
|
|
+import com.persagy.server.datacenter.models.entities.dictnew.DefClass
|
|
|
import com.persagy.server.datacenter.models.entities.objects.Property
|
|
|
import com.persagy.server.datacenter.models.entities.rel.RSyEq
|
|
|
import com.persagy.server.models.EquipmentProSy
|
|
@@ -37,6 +38,7 @@ import com.persagy.server.service.objects.PropertyService
|
|
|
import com.persagy.server.synchronize.MessageHandler
|
|
|
import com.persagy.server.utils.IdUtils
|
|
|
import com.persagy.server.utils.ShaftNameUtil
|
|
|
+import com.persagy.service.SObjectService
|
|
|
import com.persagy.service.SPageContext
|
|
|
import com.persagy.service.models.requests.SCreateRequest
|
|
|
import com.persagy.service.utils.SSpringContextUtil
|
|
@@ -57,7 +59,8 @@ object EquipmentProSyService : Service<EquipmentProSy>(SMybatisDao(EquipmentProS
|
|
|
private val messageHandler by lazy {
|
|
|
SSpringContextUtil.getBean(MessageHandler::class.java) as MessageHandler
|
|
|
}
|
|
|
-
|
|
|
+ /** 平台集团对象类型 */
|
|
|
+ val defClassService = SObjectService(SMybatisDao(DefClass::class.java))
|
|
|
|
|
|
override fun onCreateBefore(equip: EquipmentProSy): Boolean {
|
|
|
try {
|
|
@@ -77,7 +80,15 @@ object EquipmentProSyService : Service<EquipmentProSy>(SMybatisDao(EquipmentProS
|
|
|
equip.projectId = projectId
|
|
|
/** 设备名字 */
|
|
|
if (equip.name.isNullOrEmpty()) {
|
|
|
- equip.name = ShaftNameUtil.shaftName("设备-")
|
|
|
+ val entity = defClassService.select(
|
|
|
+ SFilter.eq("projectId", equip.projectId!!),
|
|
|
+ SFilter.eq("code", equip.classCode!!)
|
|
|
+ ).entity()
|
|
|
+ if (entity!=null) {
|
|
|
+ equip.name = ShaftNameUtil.shaftName(entity.name+"-")
|
|
|
+ }else {
|
|
|
+ equip.name = ShaftNameUtil.shaftName("设备-")
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
} catch (e: Exception) {
|