|
@@ -91,25 +91,27 @@ open class CalcSpecialService {
|
|
|
}
|
|
|
}
|
|
|
// 设置源
|
|
|
- val sourceType = mepSystemCalcService.setSourceType(projectId, calcName, null, systemName)
|
|
|
- if (!sourceType) {
|
|
|
- upDateBiaoji(projectId,relationType ,5)
|
|
|
- return SBaseResponse(SResponseType.success)
|
|
|
- }
|
|
|
+// val sourceType = mepSystemCalcService.setSourceType(projectId, calcName, null, systemName)
|
|
|
+//
|
|
|
+// if (!sourceType) {
|
|
|
+// upDateBiaoji(projectId,relationType ,5)
|
|
|
+// return SBaseResponse(SResponseType.success)
|
|
|
+// }
|
|
|
// 计算流向
|
|
|
- val exec = connectedBlockService.select(SFilter.eq("projectId", projectId), SFilter.inList("mepSystemType", systemName)).group("mepSystemType", "blockId").projection(arrayListOf("mepSystemType", "blockId")).exec()
|
|
|
- exec.forEach {
|
|
|
- val domain = toolsMap(it.mepSystemType!!)
|
|
|
- val result = mapper.sysDirection(projectId, buildingId, it.blockId!!, it.mepSystemType!!, domain, true)
|
|
|
- if (!result) {
|
|
|
- upDateBiaoji(projectId,relationType ,5)
|
|
|
- return SBaseResponse(SResponseType.success)
|
|
|
- }
|
|
|
- }
|
|
|
+// val exec = connectedBlockService.select(SFilter.eq("projectId", projectId), SFilter.inList("mepSystemType", systemName)).group("mepSystemType", "blockId").projection(arrayListOf("mepSystemType", "blockId")).exec()
|
|
|
+// exec.forEach {
|
|
|
+// val domain = toolsMap(it.mepSystemType!!)
|
|
|
+// val result = mapper.sysDirection(projectId, buildingId, it.blockId!!, it.mepSystemType!!, domain, true)
|
|
|
+// if (!result) {
|
|
|
+// upDateBiaoji(projectId,relationType ,5)
|
|
|
+// return SBaseResponse(SResponseType.success)
|
|
|
+// }
|
|
|
+// }
|
|
|
try {
|
|
|
// 生成数据中心使用的关系
|
|
|
- val generateRelation = mepSystemCalcService.generateRelation(projectId, relationType, null, systemName)
|
|
|
- generateRelation.addAll(mepSystemCalcService.generateNonDirectionalRelation(projectId, relationType, null, systemName))
|
|
|
+// val generateRelation = mepSystemCalcService.generateRelation(projectId, relationType, null, systemName)
|
|
|
+// generateRelation.addAll(mepSystemCalcService.generateNonDirectionalRelation(projectId, relationType, null, systemName))
|
|
|
+ val generateRelation = mepSystemCalcService.generateNonDirectionalRelation(projectId, relationType, null, systemName)
|
|
|
if (generateRelation.size>0){
|
|
|
val delete = rEq2EqService.delete(SFilter.eq("projectId", projectId), SFilter.eq("type", relationType), SFilter.eq("sign", 2))
|
|
|
|