|
@@ -26,6 +26,7 @@
|
|
|
|
|
|
package com.persagy.server.services.task
|
|
package com.persagy.server.services.task
|
|
|
|
|
|
|
|
+import com.alibaba.fastjson.JSONObject
|
|
import com.google.gson.Gson
|
|
import com.google.gson.Gson
|
|
import com.google.gson.reflect.TypeToken
|
|
import com.google.gson.reflect.TypeToken
|
|
import com.persagy.database.SFilter
|
|
import com.persagy.database.SFilter
|
|
@@ -34,6 +35,7 @@ import com.persagy.mybatis.SMybatisDao
|
|
import com.persagy.server.datacenter.models.entities.task.*
|
|
import com.persagy.server.datacenter.models.entities.task.*
|
|
import com.persagy.server.datacenter.models.entities.task.base.ScanTaskBase
|
|
import com.persagy.server.datacenter.models.entities.task.base.ScanTaskBase
|
|
import com.persagy.server.mappers.StatisticsCountMapper
|
|
import com.persagy.server.mappers.StatisticsCountMapper
|
|
|
|
+import com.persagy.server.services.DmpBaseService
|
|
import com.persagy.server.services.base.RService
|
|
import com.persagy.server.services.base.RService
|
|
import com.persagy.service.SBaseService
|
|
import com.persagy.service.SBaseService
|
|
import com.persagy.service.SPageContext
|
|
import com.persagy.service.SPageContext
|
|
@@ -41,6 +43,7 @@ import com.persagy.service.models.enums.SResponseType
|
|
import com.persagy.service.models.requests.SQueryRequest
|
|
import com.persagy.service.models.requests.SQueryRequest
|
|
import com.persagy.service.models.responses.SQueryResponse
|
|
import com.persagy.service.models.responses.SQueryResponse
|
|
import com.persagy.service.utils.SSpringContextUtil
|
|
import com.persagy.service.utils.SSpringContextUtil
|
|
|
|
+import org.springframework.beans.factory.annotation.Autowired
|
|
|
|
|
|
/**
|
|
/**
|
|
* 任务父表
|
|
* 任务父表
|
|
@@ -54,25 +57,40 @@ object ScanTaskBaseService : RService<ScanTaskBase>(SMybatisDao(ScanTaskBase::cl
|
|
SSpringContextUtil.getBean(StatisticsCountMapper::class.java) as StatisticsCountMapper
|
|
SSpringContextUtil.getBean(StatisticsCountMapper::class.java) as StatisticsCountMapper
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private val dmpBaseService: DmpBaseService? = DmpBaseService()
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 查询所有设备类型或设备族
|
|
* 查询所有设备类型或设备族
|
|
*/
|
|
*/
|
|
fun equipCategoryQuery(type: String): SQueryResponse<EquipCategoryDic> {
|
|
fun equipCategoryQuery(type: String): SQueryResponse<EquipCategoryDic> {
|
|
- val pageQuery: SPageQueryInfo<EquipCategoryDic>
|
|
|
|
|
|
+ /*val pageQuery: SPageQueryInfo<EquipCategoryDic>
|
|
return try {
|
|
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!!)
|
|
|
|
- }
|
|
|
|
- } // Fun equipCategoryQuery
|
|
|
|
|
|
+ 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 sQueryResponse = SQueryResponse<EquipCategoryDic>(SResponseType.success)
|
|
|
|
+ val param = JSONObject()
|
|
|
|
+ val criteria = JSONObject()
|
|
|
|
+ if ("equip" == type) {
|
|
|
|
+ criteria["objType"] = "equipment"
|
|
|
|
+ }else{
|
|
|
|
+ criteria["objType"] = type
|
|
|
|
+ }
|
|
|
|
+ param["criteria"] = criteria
|
|
|
|
+ val queryDictType = dmpBaseService!!.queryDictType(param)
|
|
|
|
+ sQueryResponse.content = queryDictType
|
|
|
|
+ return sQueryResponse
|
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
/**
|
|
* 查询所有建筑和楼层
|
|
* 查询所有建筑和楼层
|