caiaf 4 år sedan
förälder
incheckning
dc0b8783e2

+ 8 - 1
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/relation_calc/CalcSpecialService.kt

@@ -291,7 +291,11 @@ open class CalcSpecialService {
                                 val rEq2Eq = REq2Eq()
                                 rEq2Eq.id1 = id1
                                 rEq2Eq.id2 = id2
-
+                                rEq2Eq.sign = 1
+                                rEq2Eq.projectId = projectId
+                                rEq2Eq.hasDirection = false
+                                rEq2Eq.type = ""
+                                rEq2Eqs.add(rEq2Eq)
                             }
 
 
@@ -303,6 +307,9 @@ open class CalcSpecialService {
             }
 
         }
+        val request = SCreateRequest<REq2Eq>()
+        request.content = rEq2Eqs
+        rEq2EqService.createList(request)
         return SBaseResponse(SResponseType.failure, "e.message!!")
 
     }

+ 0 - 8
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/relation_calc/RelationCalcService.kt

@@ -31,11 +31,6 @@ import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opt
 import com.persagy.server.datacenter.models.entities.graphtype.MPoint
 import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
-<<<<<<< HEAD:datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/RelationCalcService.kt
-import com.persagy.server.datacenter.models.entities.rel.REq2Sp
-import com.persagy.server.datacenter.models.entities.rel.RSp2Sp
-=======
->>>>>>> 4f9446037d0c154f4028be83daa67ceef061bcfe:datacenter/src/main/kotlin/com/persagy/server/datacenter/services/relation_calc/RelationCalcService.kt
 import com.persagy.server.jms.RabbitMqService
 import com.persagy.server.mappers.IRelationCalcMapper
 import com.persagy.server.models.`object`.TwicePoint
@@ -43,11 +38,8 @@ import com.persagy.server.models.service.BaseDataService
 import com.persagy.server.services.assistant.RUpDateEquipAndSapceService
 import com.persagy.server.services.base.RService
 import com.persagy.server.services.objects.EquipmentService
-<<<<<<< HEAD:datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/RelationCalcService.kt
 import com.persagy.server.services.objects.FloorService
 import com.persagy.server.services.objects.ZoneSpaceBaseService
-=======
->>>>>>> 4f9446037d0c154f4028be83daa67ceef061bcfe:datacenter/src/main/kotlin/com/persagy/server/datacenter/services/relation_calc/RelationCalcService.kt
 import com.persagy.server.services.rel.REq2SpService
 import com.persagy.server.utils.IdUtils
 import com.persagy.service.SBaseService