|
@@ -27,8 +27,6 @@
|
|
|
package com.persagy.server.services.task
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject
|
|
|
-import com.google.gson.Gson
|
|
|
-import com.google.gson.reflect.TypeToken
|
|
|
import com.persagy.database.SFilter
|
|
|
import com.persagy.database.SPageQueryInfo
|
|
|
import com.persagy.mybatis.SMybatisDao
|
|
@@ -38,7 +36,6 @@ import com.persagy.server.mappers.StatisticsCountMapper
|
|
|
import com.persagy.server.services.AdmBaseService
|
|
|
import com.persagy.server.services.DmpBaseService
|
|
|
import com.persagy.server.services.base.RService
|
|
|
-import com.persagy.service.SBaseService
|
|
|
import com.persagy.service.SPageContext
|
|
|
import com.persagy.service.models.SCascadeQuery
|
|
|
import com.persagy.service.models.enums.SResponseType
|
|
@@ -70,13 +67,12 @@ object ScanTaskBaseService : RService<ScanTaskBase>(SMybatisDao(ScanTaskBase::cl
|
|
|
*/
|
|
|
fun equipCategoryQuery(type: String): SQueryResponse<EquipCategoryDic> {
|
|
|
val sQueryResponse = SQueryResponse<EquipCategoryDic>(SResponseType.success)
|
|
|
- val projectId = SPageContext.getHeader("projectId").toString()
|
|
|
var request = SQueryRequest()
|
|
|
request.filters = "ProjectId = '${SPageContext.getHeader("ProjectId")}'";
|
|
|
-
|
|
|
- request.projection = arrayListOf("category")
|
|
|
+ request.projection = arrayListOf("classCode")
|
|
|
request.distinct = true
|
|
|
val tasks = ArrayList<ScanTaskBase>()
|
|
|
+ //查询设备,资产,模型文件现有的数据
|
|
|
if(type == "equip") {
|
|
|
// 如果是equip
|
|
|
val response = EquipScanTaskService.pageQuery(request, null)
|
|
@@ -90,31 +86,60 @@ object ScanTaskBaseService : RService<ScanTaskBase>(SMybatisDao(ScanTaskBase::cl
|
|
|
val response = ModelScanTaskService.pageQuery(request, null)
|
|
|
tasks.addAll(response.content!!)
|
|
|
}
|
|
|
- /*val pageQuery: SPageQueryInfo<EquipCategoryDic>
|
|
|
- return try {
|
|
|
- val equipCategoryDicService = SBaseService(SMybatisDao(EquipCategoryDic::class.java))
|
|
|
- var request = SQueryRequest()
|
|
|
- val queryBuilder = equipCategoryDicService.select(request.filters)
|
|
|
-
|
|
|
- val projectId = SPageContext.getHeader("projectId").toString()
|
|
|
- queryBuilder.tableName = "scantask.f_get_category('$type','$projectId')"
|
|
|
- pageQuery = queryBuilder.pageQuery(1, 1000)
|
|
|
- SQueryResponse(pageQuery)
|
|
|
- } catch (e: Exception) {
|
|
|
- e.printStackTrace()
|
|
|
- SQueryResponse(SResponseType.failure, e.message!!)
|
|
|
- }*/
|
|
|
+ //查询中台类型数据
|
|
|
val param = JSONObject()
|
|
|
val criteria = JSONObject()
|
|
|
if ("equip" == type) {
|
|
|
- criteria["objType"] = "equipment"
|
|
|
+ val objTypes = JSONObject()
|
|
|
+ val objTypeList: MutableList<String> = java.util.ArrayList()
|
|
|
+ objTypeList.add("equipment")
|
|
|
+ objTypeList.add("component")
|
|
|
+ objTypes["\$in"] = objTypeList
|
|
|
}else{
|
|
|
criteria["objType"] = type
|
|
|
}
|
|
|
param["criteria"] = criteria
|
|
|
val queryDictType = dmpBaseService!!.queryDictType(param)
|
|
|
- sQueryResponse.content = queryDictType
|
|
|
+ if(queryDictType == null || queryDictType.size<=0){
|
|
|
+ return sQueryResponse
|
|
|
+ }
|
|
|
+ val queryDictMap = HashMap<String, String>()
|
|
|
+ for (dict in queryDictType){
|
|
|
+ dict.code?.let { dict.name?.let { it1 -> queryDictMap.put(it, it1) } }
|
|
|
+ }
|
|
|
+
|
|
|
+ //结果集封装
|
|
|
+ val equipCategoryList = ArrayList<EquipCategoryDic>()
|
|
|
+ for(task in tasks!!){
|
|
|
+ val equipCategoryDic = EquipCategoryDic()
|
|
|
+ equipCategoryDic.code = task.classCode
|
|
|
+ if(queryDictMap.get(task.classCode) == null){
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ equipCategoryDic.name = queryDictMap.get(task.classCode)
|
|
|
+ equipCategoryList.add(equipCategoryDic)
|
|
|
+ }
|
|
|
+
|
|
|
+ //历史逻辑:
|
|
|
+ /*val pageQuery: SPageQueryInfo<EquipCategoryDic>
|
|
|
+ return try {
|
|
|
+ val equipCategoryDicService = SBaseService(SMybatisDao(EquipCategoryDic::class.java))
|
|
|
+ var request = SQueryRequest()
|
|
|
+ val queryBuilder = equipCategoryDicService.select(request.filters)
|
|
|
+
|
|
|
+ val projectId = SPageContext.getHeader("projectId").toString()
|
|
|
+ queryBuilder.tableName = "scantask.f_get_category('$type','$projectId')"
|
|
|
+ pageQuery = queryBuilder.pageQuery(1, 1000)
|
|
|
+ SQueryResponse(pageQuery)
|
|
|
+ } catch (e: Exception) {
|
|
|
+ e.printStackTrace()
|
|
|
+ SQueryResponse(SResponseType.failure, e.message!!)
|
|
|
+ }*/
|
|
|
+
|
|
|
+ sQueryResponse.content = equipCategoryList
|
|
|
return sQueryResponse
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
/**
|