|
@@ -41,6 +41,7 @@ import com.persagy.server.datacenter.models.entities.rel.REq2Sp
|
|
|
import com.persagy.server.models.planar.PlanarEquip
|
|
|
import com.persagy.server.models.requests.PlanarEquipRequests
|
|
|
import com.persagy.server.service.base.Service
|
|
|
+import com.persagy.server.service.labsl.CustomSqlLabslService
|
|
|
import com.persagy.server.service.objects.PropertyService
|
|
|
import com.persagy.server.utils.IdUtils
|
|
|
import com.persagy.server.utils.MatchingProperty
|
|
@@ -52,6 +53,7 @@ import com.persagy.service.models.requests.SQueryRequest
|
|
|
import com.persagy.service.models.requests.SUpdateRequest
|
|
|
import com.persagy.service.models.responses.SBaseResponse
|
|
|
import com.persagy.service.models.responses.SQueryResponse
|
|
|
+import com.persagy.service.utils.SSpringContextUtil
|
|
|
import org.slf4j.LoggerFactory
|
|
|
import java.util.*
|
|
|
import kotlin.collections.ArrayList
|
|
@@ -65,6 +67,12 @@ object EquipmentComService : Service<Equipment>(SMybatisDao(Equipment::class.jav
|
|
|
/** 日志 */
|
|
|
private val logger = LoggerFactory.getLogger(EquipmentComService::class.java)
|
|
|
|
|
|
+ /** MQ消息对象 */
|
|
|
+ val customSqlLabslService by lazy {
|
|
|
+ SSpringContextUtil.getBean(CustomSqlLabslService::class.java) as CustomSqlLabslService
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
/** 建筑服务 */
|
|
|
val buildingService = SObjectService(SMybatisDao(Building::class.java))
|
|
|
|
|
@@ -77,6 +85,8 @@ object EquipmentComService : Service<Equipment>(SMybatisDao(Equipment::class.jav
|
|
|
/** 平面图访问设备服务 */
|
|
|
private val planarEquipService = SObjectService(SMybatisDao(PlanarEquip::class.java))
|
|
|
|
|
|
+ /** 空间服务 */
|
|
|
+ val spaceService = SObjectService(SMybatisDao(ZoneSpace::class.java))
|
|
|
|
|
|
/**
|
|
|
* 查询之前操作
|
|
@@ -650,6 +660,15 @@ object EquipmentComService : Service<Equipment>(SMybatisDao(Equipment::class.jav
|
|
|
try {
|
|
|
sQueryResponse.result = SResponseType.success
|
|
|
if (!request.equipTypes.isNullOrEmpty()&&!request.zoneTypes.isNullOrEmpty()&&!request.funcTypes.isNullOrEmpty()) {
|
|
|
+ /** 先查询空间数据 */
|
|
|
+ if (!request.spaceIds.isNullOrEmpty()) {
|
|
|
+
|
|
|
+// spaceService.select(SFilter.eq())
|
|
|
+
|
|
|
+ } else {
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
} else if (!request.equipTypes.isNullOrEmpty()&&!request.zoneTypes.isNullOrEmpty()&&!request.funcTypes.isNullOrEmpty()){
|
|
|
|
|
@@ -665,17 +684,66 @@ object EquipmentComService : Service<Equipment>(SMybatisDao(Equipment::class.jav
|
|
|
).exec()
|
|
|
sQueryResponse.content = planarEquipList
|
|
|
}else {
|
|
|
-
|
|
|
sQueryResponse.result = SResponseType.failure
|
|
|
}
|
|
|
-
|
|
|
return sQueryResponse
|
|
|
} catch (e: Exception) {
|
|
|
return SQueryResponse(SResponseType.failure,e.message!!)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+ /**
|
|
|
+ * 查询设备类型统计数量
|
|
|
+ *
|
|
|
+ * @param request 请求条件
|
|
|
+ */
|
|
|
+// fun equipQueryCount(request: PlanarEquipRequests): SQueryResponse<EquipQueryCount> {
|
|
|
+//
|
|
|
+// val sQueryResponse = SQueryResponse<EquipQueryCount>()
|
|
|
+// try {
|
|
|
+// sQueryResponse.result = SResponseType.success
|
|
|
+// if (!request.equipTypes.isNullOrEmpty()&&!request.zoneTypes.isNullOrEmpty()&&!request.funcTypes.isNullOrEmpty()) {
|
|
|
+//
|
|
|
+// } else if (!request.equipTypes.isNullOrEmpty()&&!request.zoneTypes.isNullOrEmpty()&&!request.funcTypes.isNullOrEmpty()){
|
|
|
+// /** 空间类型 和功能区类型组合查询 */
|
|
|
+//
|
|
|
+// if (!request.spaceIds.isNullOrEmpty()) {
|
|
|
+//
|
|
|
+//
|
|
|
+//
|
|
|
+// } else {
|
|
|
+//
|
|
|
+// }
|
|
|
+//
|
|
|
+//
|
|
|
+//
|
|
|
+// } else if (!request.equipTypes.isNullOrEmpty()&&!request.zoneTypes.isNullOrEmpty()){
|
|
|
+//
|
|
|
+// } else if (!request.equipTypes.isNullOrEmpty()&&!request.funcTypes.isNullOrEmpty()){
|
|
|
+//
|
|
|
+//
|
|
|
+// }else if (!request.equipTypes.isNullOrEmpty()){
|
|
|
+//
|
|
|
+//// val planarEquipList = planarEquipService.select(
|
|
|
+//// SFilter.eq("buildingId", request.buildingId!!), SFilter.eq("floorId", request.floorId!!),
|
|
|
+//// SFilter.inList("classCode", request.equipTypes!!)
|
|
|
+//// ).exec()
|
|
|
+// val equipTypeCounts = customSqlLabslService.equipTypeCounts(
|
|
|
+// Opt.projectId!!,
|
|
|
+// request.buildingId!!,
|
|
|
+// request.floorId!!,
|
|
|
+// request.equipTypes!!
|
|
|
+// )
|
|
|
+// sQueryResponse.content = equipTypeCounts
|
|
|
+// }else {
|
|
|
+//
|
|
|
+// sQueryResponse.result = SResponseType.failure
|
|
|
+// }
|
|
|
+// return sQueryResponse
|
|
|
+// } catch (e: Exception) {
|
|
|
+// return SQueryResponse(SResponseType.failure,e.message!!)
|
|
|
+// }
|
|
|
+// }
|
|
|
|
|
|
|
|
|
} // Object EquipmentService
|