caiaf 4 rokov pred
rodič
commit
a1dd57497c

+ 4 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/block/MepSourceTypeEntity.kt

@@ -67,4 +67,8 @@ class MepSourceTypeEntity {
     @Schema(description = "创建时间")
     @Column(name = "create_time")
     var createTime: Date? = null
+
+    /** 源类型 */
+    @Schema(description = "源设备类型")
+    var sourceCount: Int? = null
 }

+ 23 - 7
datacenter/src/main/kotlin/com/persagy/server/controllers/relation_calc/MepSystemCalcController.kt

@@ -28,8 +28,10 @@ package com.persagy.server.controllers.relation_calc
 
 import com.persagy.database.SFilter
 import com.persagy.server.datacenter.models.entities.graphtype.block.MepSourceTypeEntity
+import com.persagy.server.services.objects.EquipmentService
 import com.persagy.server.services.relation_calc.MepSystemCalcService
 import com.persagy.service.SPageContext
+import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.requests.SCreateRequest
 import com.persagy.service.models.requests.SQueryRequest
 import com.persagy.service.models.responses.SCreateResponse
@@ -37,10 +39,7 @@ import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.RequestBody
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
+import org.springframework.web.bind.annotation.*
 
 
 /**
@@ -64,13 +63,18 @@ class MepSystemCalcController {
     fun query(@RequestBody entity: SCreateRequest<MepSourceTypeEntity>): SCreateResponse<MepSourceTypeEntity> {
         val projectId = SPageContext.getHeader("projectId").toString()
         var calcName : String? = null
+        var sourceType : String? = null
         entity.content.forEach {
             if(it.projectId.isNullOrBlank())
                 it.projectId = projectId
             calcName = it.calcName
+            sourceType = it.sourceType
         }
         // 删除以前卡片的源设备记录
         mepSystemCalc.mepSourceTypeService.delete(SFilter.and(SFilter.eq("projectId", projectId), SFilter.eq("calcName", calcName!!)))
+        if(sourceType == null){
+            return SCreateResponse<MepSourceTypeEntity>(SResponseType.success,"")
+        }
         return mepSystemCalc.mepSourceTypeService.createList(entity)
     } // Fun
 
@@ -78,8 +82,20 @@ class MepSystemCalcController {
      * 添加关系
      */
     @Operation(summary = "查看源设备", description = "")
-    @PostMapping(value = ["/source/query"])
-    fun addRels(@RequestBody request: SQueryRequest): SQueryResponse<MepSourceTypeEntity> {
-        return mepSystemCalc.mepSourceTypeService.pageQuery(request)
+    @GetMapping(value = ["/source/query"])
+    fun addRels(@RequestParam calcName: String): SQueryResponse<MepSourceTypeEntity> {
+        val projectId = SPageContext.getHeader("projectId").toString()
+        val mems = mepSystemCalc.mepSourceTypeService.select(SFilter.eq("projectId", projectId), SFilter.eq("calcName", calcName!!)).exec()
+        for (mem in mems) {
+            val eCounts = EquipmentService.select(SFilter.eq("projectId", projectId),SFilter.eq("classCode", mem.sourceType!!)).count
+            if(eCounts != null){
+                mem.sourceCount = eCounts
+            }else {
+                mem.sourceCount = 0
+            }
+        }
+        val response = SQueryResponse<MepSourceTypeEntity>()
+        response.content = mems
+        return  response
     } // Fun
 }

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

@@ -45,10 +45,8 @@ import com.persagy.server.services.rel.REq2SpService
 import com.persagy.server.utils.IdUtils
 import com.persagy.service.SBaseService
 import com.persagy.service.models.enums.SResponseType
-import com.persagy.service.models.requests.SCreateRequest
 import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.utils.SSpringContextUtil
-import com.vividsolutions.jts.geom.GeometryFactory
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service