|
@@ -1190,6 +1190,7 @@ open class RelationCalcService {
|
|
|
val entity = relationTypeProjectservice.select(SFilter.eq("projectId", projectId), SFilter.eq("relationType", "eq2sp_for"), SFilter.eq("zoneType", tables!!)).entity()
|
|
|
if (entity != null) {
|
|
|
entity.computationalState = 1
|
|
|
+ entity.computingTime = IdUtils.time()
|
|
|
relationTypeProjectservice.update(entity)
|
|
|
}
|
|
|
} catch (e: Exception) {
|
|
@@ -1198,24 +1199,24 @@ open class RelationCalcService {
|
|
|
|
|
|
|
|
|
/** 处理关系 */
|
|
|
- val equipmentList = EquipmentService.select(SFilter.eq("projectId", projectId),
|
|
|
- SFilter.inList("classCode",
|
|
|
- arrayListOf("ATIO", "VTIO"))).exec()
|
|
|
- if (equipmentList.size > 0) {
|
|
|
- var listId = ArrayList<String>()
|
|
|
- for (equipment in equipmentList) {
|
|
|
- listId.add(equipment.id!!)
|
|
|
- }
|
|
|
- val rEq2SpList = REq2SpService.select(SFilter.eq("projectId", projectId),
|
|
|
- SFilter.inList("id1", listId)
|
|
|
- , SFilter.eq("type", "eq2sp_in")).exec()
|
|
|
- if (rEq2SpList.size > 0) {
|
|
|
- for (rEq2Sp in rEq2SpList) {
|
|
|
- rEq2Sp.type = "eq2sp_for"
|
|
|
- REq2SpService.replace(rEq2Sp)
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+// val equipmentList = EquipmentService.select(SFilter.eq("projectId", projectId),
|
|
|
+// SFilter.inList("classCode",
|
|
|
+// arrayListOf("ATIO", "VTIO"))).exec()
|
|
|
+// if (equipmentList.size > 0) {
|
|
|
+// var listId = ArrayList<String>()
|
|
|
+// for (equipment in equipmentList) {
|
|
|
+// listId.add(equipment.id!!)
|
|
|
+// }
|
|
|
+// val rEq2SpList = REq2SpService.select(SFilter.eq("projectId", projectId),
|
|
|
+// SFilter.inList("id1", listId)
|
|
|
+// , SFilter.eq("type", "eq2sp_in")).exec()
|
|
|
+// if (rEq2SpList.size > 0) {
|
|
|
+// for (rEq2Sp in rEq2SpList) {
|
|
|
+// rEq2Sp.type = "eq2sp_for"
|
|
|
+// REq2SpService.replace(rEq2Sp)
|
|
|
+// }
|
|
|
+// }
|
|
|
+// }
|
|
|
/** 发送消息 */
|
|
|
rabbitMqService.sendRel(Opt.projectId!!, "fengkou_for", "20", "123", "456")
|
|
|
return SBaseResponse(SResponseType.success)
|
|
@@ -1225,6 +1226,7 @@ open class RelationCalcService {
|
|
|
val entity = relationTypeProjectservice.select(SFilter.eq("projectId", projectId), SFilter.eq("relationType", "eq2sp_for"), SFilter.eq("zoneType", tables!!)).entity()
|
|
|
if (entity != null) {
|
|
|
entity.computationalState = 5
|
|
|
+ entity.computingTime = IdUtils.time()
|
|
|
relationTypeProjectservice.update(entity)
|
|
|
}
|
|
|
}
|