|
@@ -163,7 +163,7 @@ open class RelationCalcService {
|
|
|
upDate(projectId, "bd2sp")
|
|
|
// upDate(projectId,"fl2sp")
|
|
|
/** 发送消息 */
|
|
|
- rabbitMqService.sendRel(Opt.projectId!!, "Bd2Sp", "20", "123", "456")
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, null,"Bd2Sp", "20", "123", "456")
|
|
|
return SBaseResponse(SResponseType.success)
|
|
|
} else {
|
|
|
upDateBiaoji(projectId, "bd2sp", 5)
|
|
@@ -184,7 +184,7 @@ open class RelationCalcService {
|
|
|
val result = mapper.calcEq2Bd(projectId)
|
|
|
if (result != null && result == 0) {
|
|
|
/** 发送消息 */
|
|
|
- rabbitMqService.sendRel(Opt.projectId!!, "Eq2Bd_in", "20", "123", "456")
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, null,"Eq2Bd_in", "20", "123", "456")
|
|
|
return SBaseResponse(SResponseType.success)
|
|
|
}
|
|
|
return SBaseResponse(SResponseType.failure)
|
|
@@ -205,7 +205,7 @@ open class RelationCalcService {
|
|
|
if (result != null && result == 0) {
|
|
|
upDate(projectId, "eq2fl")
|
|
|
/** 发送消息 */
|
|
|
- rabbitMqService.sendRel(Opt.projectId!!, "Eq2Bd_in", "20", "123", "456")
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, null,"Eq2Bd_in", "20", "123", "456")
|
|
|
return SBaseResponse(SResponseType.success)
|
|
|
} else {
|
|
|
upDateBiaoji(projectId, "eq2fl", 5)
|
|
@@ -234,7 +234,7 @@ open class RelationCalcService {
|
|
|
val result = mapper.calcEq2Sh(projectId)
|
|
|
if (result != null && result == 0) {
|
|
|
/** 发送消息 */
|
|
|
- rabbitMqService.sendRel(Opt.projectId!!, "Eq2Sh_in", "20", "123", "456")
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, null,"Eq2Sh_in", "20", "123", "456")
|
|
|
upDate(projectId, "eq2sh")
|
|
|
upDate(projectId, "eq2sp_in")
|
|
|
upDate(projectId, "fl2sp")
|
|
@@ -380,7 +380,7 @@ open class RelationCalcService {
|
|
|
if (result != null && result == 0) {
|
|
|
try {
|
|
|
/** 发送消息 */
|
|
|
- rabbitMqService.sendRel(Opt.projectId!!, "Eq2Sp_in", "20", tables!!, "456")
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, null,"Eq2Sp_in", "20", tables!!, "456")
|
|
|
upDate(projectId, "fl2sp")
|
|
|
upDate(projectId, "eq2fl")
|
|
|
val entity = relationTypeProjectservice.select(SFilter.eq("projectId", projectId), SFilter.eq("relationType", relType
|
|
@@ -426,7 +426,7 @@ open class RelationCalcService {
|
|
|
if (result != null && result == 0) {
|
|
|
try {
|
|
|
/** 发送消息 */
|
|
|
- rabbitMqService.sendRel(Opt.projectId!!, "Fl2Fl_Through", "20", "123", "456")
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, null,"Fl2Fl_Through", "20", "123", "456")
|
|
|
val entity = RUpDateEquipAndSapceService.relationTypeProjectservice.select(SFilter.eq("projectId", projectId), SFilter.eq("relationTypeCode", "Fl2Fl")).entity()
|
|
|
if (entity != null) {
|
|
|
entity.computationalState = 1
|
|
@@ -522,7 +522,7 @@ open class RelationCalcService {
|
|
|
val result = mapper.calcFl2Sp(tablesName, projectId)
|
|
|
if (result != null && result == 0) {
|
|
|
/** 发送消息 */
|
|
|
- rabbitMqService.sendRel(Opt.projectId!!, "Fl2Sp_in", "20", tables!!, "456")
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!,null, "Fl2Sp_in", "20", tables!!, "456")
|
|
|
upDate(projectId, "fl2sp")
|
|
|
return SBaseResponse(SResponseType.success)
|
|
|
} else {
|
|
@@ -664,7 +664,7 @@ open class RelationCalcService {
|
|
|
val result = mapper.calcSh2Bd(projectId)
|
|
|
if (result != null && result == 0) {
|
|
|
/** 发送消息 */
|
|
|
- rabbitMqService.sendRel(Opt.projectId!!, "Bd2Sh_in", "20", "123", "456")
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, null,"Bd2Sh_in", "20", "123", "456")
|
|
|
upDate(projectId, "sh2bd")
|
|
|
return SBaseResponse(SResponseType.success)
|
|
|
} else {
|
|
@@ -688,7 +688,7 @@ open class RelationCalcService {
|
|
|
val result = mapper.calcSh2Sh(projectId)
|
|
|
if (result != null && result == 0) {
|
|
|
/** 发送消息 */
|
|
|
- rabbitMqService.sendRel(Opt.projectId!!, "Sh2Sh_Through", "20", "123", "456")
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, null,"Sh2Sh_Through", "20", "123", "456")
|
|
|
upDate(projectId, "sh2sh")
|
|
|
return SBaseResponse(SResponseType.success)
|
|
|
} else {
|
|
@@ -717,7 +717,7 @@ open class RelationCalcService {
|
|
|
logger.debug("系统= ${resultSy}")
|
|
|
if (resultEq != null && resultSy != null && resultEq == 0 && resultSy == 0) {
|
|
|
/** 发送消息 */
|
|
|
- rabbitMqService.sendRel(Opt.projectId!!, "syeq2bd", "20", "123", "456")
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, null,"syeq2bd", "20", "123", "456")
|
|
|
upDate(projectId, "syeq2bd")
|
|
|
upDate(projectId, "eq2fl")
|
|
|
return SBaseResponse(SResponseType.success)
|
|
@@ -743,7 +743,7 @@ open class RelationCalcService {
|
|
|
if (result != null && result == 0) {
|
|
|
// upDate(projectId,"sh2sh")
|
|
|
/** 发送消息 */
|
|
|
- rabbitMqService.sendRel(Opt.projectId!!, "syeq2bd", "20", "123", "456")
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, null,"syeq2bd", "20", "123", "456")
|
|
|
return SBaseResponse(SResponseType.success)
|
|
|
}
|
|
|
return SBaseResponse(SResponseType.failure)
|
|
@@ -765,7 +765,7 @@ open class RelationCalcService {
|
|
|
val result = mapper.calcSy2Fl(projectId)
|
|
|
if (result != null && result == 0) {
|
|
|
/** 发送消息 */
|
|
|
- rabbitMqService.sendRel(Opt.projectId!!, "Sy2Fl_in", "20", "123", "456")
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!,"", "Sy2Fl_in", "20", "123", "456")
|
|
|
upDate(projectId, "sy2fl")
|
|
|
upDate(projectId, "eq2fl")
|
|
|
return SBaseResponse(SResponseType.success)
|
|
@@ -795,7 +795,7 @@ open class RelationCalcService {
|
|
|
val result = mapper.calcSy2Sh(projectId)
|
|
|
if (result != null && result == 0) {
|
|
|
/** 发送消息 */
|
|
|
- rabbitMqService.sendRel(Opt.projectId!!, "Sy2Sh_in", "20", "123", "456")
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, null,"Sy2Sh_in", "20", "123", "456")
|
|
|
upDate(projectId, "sy2sh")
|
|
|
upDate(projectId, "eq2sh")
|
|
|
upDate(projectId, "eq2fl")
|
|
@@ -830,7 +830,7 @@ open class RelationCalcService {
|
|
|
val result = mapper.calcSy2Sp(projectId)
|
|
|
if (result != null && result == 0) {
|
|
|
/** 发送消息 */
|
|
|
- rabbitMqService.sendRel(Opt.projectId!!, "Sy2Sp_in", "20", "123", "456")
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, null,"Sy2Sp_in", "20", "123", "456")
|
|
|
upDate(projectId, "sy2sp")
|
|
|
upDate(projectId, "fl2sp")
|
|
|
upDate(projectId, "sy2sp")
|
|
@@ -859,7 +859,7 @@ open class RelationCalcService {
|
|
|
val result = mapper.calcsp2spTransport(projectId)
|
|
|
if (result != null && result == 0) {
|
|
|
/** 发送消息 */
|
|
|
- rabbitMqService.sendRel(Opt.projectId!!, "sp2sp_TrafficNetwork_1", "20", "123", "456")
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, null,"sp2sp_TrafficNetwork_1", "20", "123", "456")
|
|
|
upDate(projectId, "sp2sp_TrafficNetwork_1")
|
|
|
return SBaseResponse(SResponseType.success)
|
|
|
} else {
|
|
@@ -881,7 +881,7 @@ open class RelationCalcService {
|
|
|
val result = mapper.calcsp2spLight(projectId)
|
|
|
if (result != null && result == 0) {
|
|
|
/** 发送消息 */
|
|
|
- rabbitMqService.sendRel(Opt.projectId!!, "sp2sp_RadiationNetwork_1", "20", "123", "456")
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, null,"sp2sp_RadiationNetwork_1", "20", "123", "456")
|
|
|
upDate(projectId, "sp2sp_RadiationNetwork_1")
|
|
|
return SBaseResponse(SResponseType.success)
|
|
|
} else {
|
|
@@ -903,7 +903,7 @@ open class RelationCalcService {
|
|
|
val result = mapper.calcsp2spConvection(projectId)
|
|
|
if (result != null && result == 0) {
|
|
|
/** 发送消息 */
|
|
|
- rabbitMqService.sendRel(Opt.projectId!!, "sp2sp_ConvectionNetwork_1", "20", "123", "456")
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, null,"sp2sp_ConvectionNetwork_1", "20", "123", "456")
|
|
|
upDate(projectId, "sp2sp_ConvectionNetwork_1")
|
|
|
return SBaseResponse(SResponseType.success)
|
|
|
} else {
|
|
@@ -925,7 +925,7 @@ open class RelationCalcService {
|
|
|
val result = mapper.calcsp2spV2(projectId)
|
|
|
if (result != null && result == 0) {
|
|
|
/** 发送消息 */
|
|
|
- rabbitMqService.sendRel(Opt.projectId!!, "sp2sp_SpaceNeighborhood_5", "20", "123", "456")
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, null,"sp2sp_SpaceNeighborhood_5", "20", "123", "456")
|
|
|
upDate(projectId, "sp2sp_SpaceNeighborhood_5")
|
|
|
return SBaseResponse(SResponseType.success)
|
|
|
} else {
|
|
@@ -1046,7 +1046,7 @@ open class RelationCalcService {
|
|
|
if (result != null && result == 0) {
|
|
|
try {
|
|
|
/** 发送消息 */
|
|
|
- rabbitMqService.sendRel(Opt.projectId!!, "eq2eq_SensorRelationship_ss2eq", "20", "123", "456")
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, null,"eq2eq_SensorRelationship_ss2eq", "20", "123", "456")
|
|
|
upDate(projectId, "fl2sp")
|
|
|
upDate(projectId, "eq2fl")
|
|
|
val entity = relationTypeProjectservice.select(SFilter.eq("projectId", projectId), SFilter.eq("relationType", "eq2sp_SensorRelationship_ss2sp")).entity()
|
|
@@ -1353,7 +1353,7 @@ open class RelationCalcService {
|
|
|
|
|
|
}
|
|
|
/** 发送消息 */
|
|
|
- rabbitMqService.sendRel(Opt.projectId!!, "fengkou_for", "20", "123", "456")
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, graphCode,relType, "20", "123", "456")
|
|
|
return SBaseResponse(SResponseType.success)
|
|
|
} else {
|
|
|
// upDateBiaoji(projectId, "eq2fl", 1)
|