Pārlūkot izejas kodu

查询模型任务报错修复

linhuili 3 gadi atpakaļ
vecāks
revīzija
6270aeeeff

+ 30 - 9
scanbuilding/src/main/kotlin/com/persagy/server/services/task/ModelScanTaskQueryService.kt

@@ -26,16 +26,20 @@
 
 package com.persagy.server.services.task
 
+import com.alibaba.fastjson.JSONObject
 import com.persagy.database.SFilter
 import com.persagy.database.functions.SLength
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DefClass
 import com.persagy.server.datacenter.models.entities.task.ModelScanTaskQuery
+import com.persagy.server.services.DmpBaseService
 import com.persagy.server.services.base.RService
+import com.persagy.server.util.AdmEntityTransferUtil
 import com.persagy.service.SBaseService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.requests.SQueryRequest
 import com.persagy.service.models.responses.SQueryResponse
+import org.springframework.beans.factory.annotation.Autowired
 
 
 /**
@@ -46,7 +50,10 @@ import com.persagy.service.models.responses.SQueryResponse
 object ModelScanTaskQueryService : RService<ModelScanTaskQuery>(SMybatisDao(ModelScanTaskQuery::class.java))  {
 
     /** 字典平台对象类型 */
-    private val defClassService = SBaseService(SMybatisDao(DefClass::class.java))
+   // private val defClassService = SBaseService(SMybatisDao(DefClass::class.java))
+
+    @Autowired
+    private val dmpBaseService: DmpBaseService? = DmpBaseService()
 
     fun pageQuerys(request: SQueryRequest): SQueryResponse<ModelScanTaskQuery> {
         val projectId = SPageContext.getHeader("projectId").toString()
@@ -60,10 +67,17 @@ object ModelScanTaskQueryService : RService<ModelScanTaskQuery>(SMybatisDao(Mode
                 if (exec.size>0){
                     content.component = exec
                 }
-                val defClass =
-                    defClassService.select(SFilter.eq("projectId", projectId), SFilter.eq("code", content.classCode!!)).entity()
-                if (defClass!=null) {
-                    content.equipCategory = defClass
+                //查询中台类型数据,2021.10.25日中心中台整合调整
+                val param = JSONObject()
+                val criteria = JSONObject()
+                criteria["code"] = content.classCode!!
+                param["criteria"] = criteria
+                val dictTypes = dmpBaseService!!.queryDictType(param)
+                val defClass = AdmEntityTransferUtil.toAdmMultiEntity(dictTypes, null, DefClass::class.java)
+                /*   val defClass =
+                       defClassService.select(SFilter.eq("projectId", projectId), SFilter.eq("code", content.classCode!!)).entity()*/
+                if (defClass!=null && defClass.size>0) {
+                    content.equipCategory = defClass.get(0)
                 }
             }
         }
@@ -81,10 +95,17 @@ object ModelScanTaskQueryService : RService<ModelScanTaskQuery>(SMybatisDao(Mode
                 if (exec.size>0){
                     content.component = exec
                 }
-                val defClass =
-                    defClassService.select(SFilter.eq("projectId", projectId), SFilter.eq("code", content.classCode!!)).entity()
-                if (defClass!=null) {
-                    content.equipCategory = defClass
+                //查询中台类型数据,2021.10.25日中心中台整合调整
+                val param = JSONObject()
+                val criteria = JSONObject()
+                criteria["code"] = content.classCode!!
+                param["criteria"] = criteria
+                val dictTypes = dmpBaseService!!.queryDictType(param)
+                val defClass = AdmEntityTransferUtil.toAdmMultiEntity(dictTypes, null, DefClass::class.java)
+                /*   val defClass =
+                       defClassService.select(SFilter.eq("projectId", projectId), SFilter.eq("code", content.classCode!!)).entity()*/
+                if (defClass!=null && defClass.size>0) {
+                    content.equipCategory = defClass.get(0)
                 }
             }
         }