Przeglądaj źródła

扫楼:查询/更新设备,资产等转化为通过adm查询/更新对象信息

linhuili 3 lat temu
rodzic
commit
39b10d4de5

+ 4 - 2
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Equipment.kt

@@ -27,6 +27,7 @@
 package com.persagy.server.datacenter.models.entities.objects
 
 import com.alibaba.fastjson.annotation.JSONField
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.persagy.server.datacenter.models.entities.assistant.BIMLocation
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.server.datacenter.models.entities.dict.EquipCategory
@@ -43,7 +44,8 @@ import javax.persistence.Table
  * @author  张维新
  */
 @Schema(description = "设备信息实体类")
-@Table(name = "equipment")
+//@Table(name = "equipment")
+@JsonIgnoreProperties(ignoreUnknown = true)
 open class Equipment : BaseInfo() {
 
     /** 设备id */
@@ -282,6 +284,6 @@ open class Equipment : BaseInfo() {
     /** 级联-部件   table  对应关系表   idColumn 对应 本类的id    childIdColumn 级联对象的关系id */
     @Schema(description = "级联-部件")
     @SCascade(table="equipment", idColumn="parent_id", childIdColumn="id")
-    var component: ArrayList<Equipment>? = null
+    var component: ArrayList<Component>? = null
 
 }

+ 5 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/task/EquipCategoryDic.kt

@@ -47,4 +47,9 @@ class EquipCategoryDic : Serializable {
     @Schema(description = "name")
     @Column(name = "name")
     var name: String? = null
+
+    /** 名称 */
+    @Schema(description = "classCode")
+    @Column(name = "classCode")
+    var classCode: String? = null
 }

+ 47 - 1
scanbuilding/src/main/kotlin/com/persagy/server/client/AdmMiddlewareClient.kt

@@ -1,18 +1,25 @@
 package com.persagy.server.client
 
+import com.alibaba.fastjson.JSONArray
+import com.alibaba.fastjson.JSONObject
+import com.fasterxml.jackson.databind.node.ArrayNode
 import com.persagy.dmp.basic.config.DigitalFeignConfig
 import com.persagy.server.Opts
 import com.persagy.server.constant.AdmMiddlewareUrlConstant
 import com.persagy.server.datacenter.models.entities.objects.Building
+import com.persagy.server.datacenter.models.entities.objects.Component
 import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.models.entities.objects.Property
 import com.persagy.server.datacenter.models.entities.task.BuildingDic
 import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.requests.SUpdateRequest
 import com.persagy.service.models.responses.SQueryResponse
 import org.springframework.cloud.openfeign.FeignClient
 import org.springframework.cloud.openfeign.SpringQueryMap
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestHeader
+import javax.swing.text.html.parser.Entity
 
 /**
  * @description:数据中台dmp-rwd 物理世界、数据字典、IOT 接口feign
@@ -37,7 +44,46 @@ interface AdmMiddlewareClient{
      * @return: com.persagy.dmp.common.DmpResult
      */
     @PostMapping(AdmMiddlewareUrlConstant.EQUIP_QUERY)
-    fun queryEquip(@RequestHeader(defaultValue = "0" ) groupCode: String?, @RequestHeader(defaultValue = "0" ) projectId: String?,@RequestBody criteria: SQueryRequest?): SQueryResponse<Equipment>?
+    fun queryEquip(@RequestHeader(defaultValue = "0" ) groupCode: String?, @RequestHeader(defaultValue = "0" ) projectId: String?,@RequestBody criteria: SQueryRequest?): SQueryResponse<JSONObject>?
 
 
+    /**
+     * @description: 更新设备列表
+     * @param: objectUrlParam 对象请求url通用参数
+     * @param: criteria post请求参数
+     * @return: com.persagy.dmp.common.DmpResult
+     */
+    @PostMapping(AdmMiddlewareUrlConstant.EQUIP_UPDATE)
+    fun updateEquip(@RequestHeader(defaultValue = "0" ) groupCode: String?, @RequestHeader(defaultValue = "0" ) projectId: String?, @RequestBody criteria: SUpdateRequest<Equipment>): SUpdateRequest<Equipment>?
+
+
+    /**
+     * @description: 更新设备列表
+     * @param: objectUrlParam 对象请求url通用参数
+     * @param: criteria post请求参数
+     * @return: com.persagy.dmp.common.DmpResult
+     */
+    @PostMapping(AdmMiddlewareUrlConstant.COMPONENT_UPDATE)
+    fun updateComponent(@RequestHeader(defaultValue = "0" ) groupCode: String?, @RequestHeader(defaultValue = "0" ) projectId: String?, @RequestBody criteria: SUpdateRequest<Component>): SUpdateRequest<Component>?
+
+
+    /**
+     * @description: 查询资产列表
+     * @param: objectUrlParam 对象请求url通用参数
+     * @param: criteria post请求参数
+     * @return: com.persagy.dmp.common.DmpResult
+     */
+    @PostMapping(AdmMiddlewareUrlConstant.PROPERTY_QUERY)
+    fun queryProperty(@RequestHeader(defaultValue = "0" ) groupCode: String?, @RequestHeader(defaultValue = "0" ) projectId: String?,@RequestBody criteria: SQueryRequest?): SQueryResponse<JSONObject>?
+
+
+    /**
+     * @description: 更新资产列表
+     * @param: objectUrlParam 对象请求url通用参数
+     * @param: criteria post请求参数
+     * @return: com.persagy.dmp.common.DmpResult
+     */
+    @PostMapping(AdmMiddlewareUrlConstant.PROPERTY_UPDATE)
+    fun updateProperty(@RequestHeader(defaultValue = "0" ) groupCode: String?, @RequestHeader(defaultValue = "0" ) projectId: String?, @RequestBody criteria: SUpdateRequest<Property>): SUpdateRequest<Property>?
+
 }

+ 21 - 1
scanbuilding/src/main/kotlin/com/persagy/server/constant/AdmMiddlewareUrlConstant.java

@@ -14,9 +14,29 @@ public class AdmMiddlewareUrlConstant {
     public final static String BUILDING_QUERY = "/object/building/query";
 
 
-
     /**
      * 设备查询
      */
     public final static String EQUIP_QUERY = "/object/equip/query";
+
+    /**
+     * 设备更新
+     */
+    public final static String EQUIP_UPDATE = "/object/equip/update";
+
+    /**
+     * 部件更新
+     */
+    public final static String COMPONENT_UPDATE = "/object/component/update";
+
+
+    /**
+     * 资产查询
+     */
+    public final static String PROPERTY_QUERY = "/object/property/query";
+
+    /**
+     * 资产更新
+     */
+    public final static String PROPERTY_UPDATE = "/object/property/update";
 }

+ 121 - 3
scanbuilding/src/main/kotlin/com/persagy/server/services/AdmBaseService.kt

@@ -1,14 +1,22 @@
 package com.persagy.server.services
 
 import cn.hutool.core.collection.CollUtil
+import com.alibaba.fastjson.JSON
+import com.alibaba.fastjson.JSONObject
 import com.persagy.server.Opts
 import com.persagy.server.client.AdmMiddlewareClient
 import com.persagy.server.datacenter.models.entities.objects.Building
+import com.persagy.server.datacenter.models.entities.objects.Component
 import com.persagy.server.datacenter.models.entities.objects.Equipment
-import com.persagy.server.datacenter.models.entities.task.BuildingDic
+import com.persagy.server.datacenter.models.entities.objects.Property
+
+import com.persagy.service.models.SCascadeQuery
 import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.requests.SUpdateRequest
 import com.persagy.service.utils.SSpringContextUtil
 import org.springframework.stereotype.Service
+import java.util.*
+import kotlin.collections.ArrayList
 
 /**
  * ADM基础接口查询
@@ -40,14 +48,124 @@ class AdmBaseService {
     /**
      * 查询设备
      */
-    fun queryEquip(criteria: SQueryRequest?):List<Equipment>?{
+    fun queryEquip(criteria: SQueryRequest?): List<Equipment>? {
         //查询对象信息
         val result = admMiddlewareClient!!.queryEquip(Opts.groupCode,Opts.projectId,criteria) ?: return ArrayList()
         if(CollUtil.isEmpty(result.content)){
             return ArrayList<Equipment>()
         }
-        return result.content
+        return result.content?.let { entityAttributeConvert(it) }
+    }
+
+
+    /**
+     * 更新设备
+     */
+    fun updateEquip(equipments: ArrayList<Equipment>){
+        val sUpdateRequest = SUpdateRequest<Equipment>()
+        sUpdateRequest.content = equipments
+        val updateEquip = admMiddlewareClient.updateEquip(Opts.groupCode, Opts.projectId, sUpdateRequest)
+    }
+
+
+    /**
+     * 更新部件
+     */
+    fun updateComponent(components: ArrayList<Component>){
+        val sUpdateRequest = SUpdateRequest<Component>()
+        sUpdateRequest.content = components
+        val updateEquip = admMiddlewareClient.updateComponent(Opts.groupCode, Opts.projectId, sUpdateRequest)
+    }
+
+    /**
+     * 查询资产
+     */
+    fun queryProperty(criteria: SQueryRequest?): List<Property>? {
+        //查询对象信息
+        val result = admMiddlewareClient!!.queryProperty(Opts.groupCode,Opts.projectId,criteria) ?: return ArrayList()
+        if(CollUtil.isEmpty(result.content)){
+            return ArrayList<Property>()
+        }
+        return result.content?.let { propertyAttributeConvert(it) }
     }
 
 
+    /**
+     * 更新资产
+     */
+    fun updateProperty(properties: ArrayList<Property>){
+        val sUpdateRequest = SUpdateRequest<Property>()
+        sUpdateRequest.content = properties
+        val updateEquip = admMiddlewareClient.updateProperty(Opts.groupCode, Opts.projectId, sUpdateRequest)
+    }
+
+
+    /**
+     * 实体属性转换
+     */
+    fun entityAttributeConvert(objects:List<JSONObject>): List<Equipment>? {
+        val result = ArrayList<Equipment>()
+        if(objects == null){
+            return result
+        }
+        for(obj in objects){
+            val equipment = JSON.toJavaObject(obj, Equipment::class.java)
+            result.add(equipment)
+        }
+        return result
+    }
+
+
+    /**
+     * 根据设备id查询部件
+     */
+    fun queryComponyByEquipId(id:String): ArrayList<Component>? {
+        var equipRequest = SQueryRequest()
+        equipRequest.filters = "id = '"+id+"'"
+        //级联查询部件
+        var cascade = SCascadeQuery()
+        cascade.name = "component"
+        equipRequest.cascade = arrayListOf(cascade)
+
+        val equipmentList = queryEquip(equipRequest)
+        if(CollUtil.isEmpty(equipmentList)){
+            return ArrayList();
+        }
+        val equipment = equipmentList?.get(0)
+
+        return equipment?.component
+    }
+
+    /**
+     * 根据设备id查询设备信息
+     */
+    fun queryEquipById(id:String): List<Equipment>? {
+        var equipRequest = SQueryRequest()
+        equipRequest.filters = "id = '"+id+"'"
+        return queryEquip(equipRequest)
+    }
+
+    /**
+     * 实体属性转换
+     */
+    fun propertyAttributeConvert(objects:List<JSONObject>): List<Property>? {
+        val result = ArrayList<Property>()
+        if(objects == null){
+            return result
+        }
+        for(obj in objects){
+            val equipment = JSON.toJavaObject(obj, Property::class.java)
+            result.add(equipment)
+        }
+        return result
+    }
+
+    /**
+     * 根据设备id查询设备信息
+     */
+    fun queryPropertyById(id:String): List<Property>? {
+        var equipRequest = SQueryRequest()
+        equipRequest.filters = "id = '"+id+"'"
+        return queryProperty(equipRequest)
+    }
 }

+ 19 - 1
scanbuilding/src/main/kotlin/com/persagy/server/services/DmpBaseService.kt

@@ -1,10 +1,12 @@
 package com.persagy.server.services
 
 import cn.hutool.core.collection.CollUtil
-import com.alibaba.fastjson.JSONArray
 import com.alibaba.fastjson.JSONObject
+import com.persagy.dmp.basic.utils.JsonNodeUtils
+import com.persagy.dmp.digital.entity.ObjectDigital
 import com.persagy.server.Opts
 import com.persagy.server.client.DmpDicClient
+import com.persagy.server.datacenter.models.entities.dict.EquipCategory
 import com.persagy.server.datacenter.models.entities.task.EquipCategoryDic
 import com.persagy.server.entities.request.InstanceUrlParam
 import com.persagy.server.util.AdmEntityTransferUtil
@@ -42,5 +44,21 @@ class DmpBaseService {
         return AdmEntityTransferUtil.toAdmMultiEntity(dmpResult.data, null, EquipCategoryDic::class.java)
     }
 
+    /**
+     * 查询设备类型
+     */
+    fun getEquipCategory(classCode:String): List<EquipCategory>? {
+        //查询中台类型数据,2021.10.25日中心中台整合调整
+        val param = JSONObject()
+        val criteria = JSONObject()
+        criteria["code"] = classCode!!
+        param["criteria"] = criteria
+        val dictTypes = queryDictType(param)
+        return AdmEntityTransferUtil.toAdmMultiEntity(dictTypes, null, EquipCategory::class.java)
+
+    }
+
+
+
 
 }

+ 80 - 47
scanbuilding/src/main/kotlin/com/persagy/server/services/task/EquipScanTaskService.kt

@@ -36,6 +36,7 @@ import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opts
 import com.persagy.server.datacenter.models.entities.assistant.TaskPic
+import com.persagy.server.datacenter.models.entities.objects.Component
 import com.persagy.server.datacenter.models.entities.objects.Equipment
 import com.persagy.server.datacenter.models.entities.task.EquipScanTask
 import com.persagy.server.datacenter.models.entities.task.SchemeUtils
@@ -43,7 +44,6 @@ import com.persagy.server.scanbuilding.UserLog
 import com.persagy.server.services.AdmBaseService
 import com.persagy.server.services.EquipmentService
 import com.persagy.server.services.base.RService
-
 import com.persagy.server.util.IdUtils
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
@@ -51,6 +51,7 @@ import com.persagy.service.SPageContext
 import com.persagy.service.models.SCascadeQuery
 import com.persagy.service.models.requests.SCreateRequest
 import com.persagy.service.models.requests.SQueryRequest
+import org.omg.CORBA.INTERNAL
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.web.bind.annotation.RequestBody
@@ -121,10 +122,7 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
                /* val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
                 val equipment = equipmentService.select(SFilter.eq("id", equipScanTask.equipId!!)).entity()*/
                 //2021.10.26调整为从中间件查询设备信息
-                var equipRequest = SQueryRequest()
-                equipRequest.filters = "id = '"+equipScanTask.equipId+"'"
-                val equipmentList = admBaseService?.queryEquip(equipRequest)
-
+                val equipmentList = admBaseService?.queryEquipById(equipScanTask.equipId!!)
                 if(CollUtil.isEmpty(equipmentList)){
                     return false
                     logger.info("设备任务创建:设备不存在 id "+equipScanTask.equipId)
@@ -132,7 +130,8 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
                 val equipment = equipmentList?.get(0)
                 if (equipScanTask.schemeId.isNullOrEmpty()){
                     if (equipmentList != null) {
-                        equipScanTask.schemeId = SchemeUtils.setScheme(equipmentList.get(0)!!.classCode!!)
+                        val equipment = equipmentList.get(0);
+                        equipScanTask.schemeId = SchemeUtils.setScheme(equipment!!.classCode!!)
                     }
                 }
 //                equipment.ledgerParam.PhotoDoc.Pic
@@ -280,20 +279,7 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
             //val componentList = equipmentService.select("parentId" to task.equipId!!).exec()
 
             //2021.10.26调整为从中间件查询设备信息
-            var equipRequest = SQueryRequest()
-            equipRequest.filters = "id = '"+task.equipId+"'"
-            //级联查询部件
-            var cascade = SCascadeQuery()
-            cascade.name = "component"
-            equipRequest.cascade = arrayListOf(cascade)
-
-            val equipmentList = admBaseService?.queryEquip(equipRequest)
-            if(CollUtil.isEmpty(equipmentList)){
-                return ;
-            }
-            val equipment = equipmentList?.get(0)
-
-            val componentList = equipment?.component
+            val componentList = task.equipId?.let { queryComponyByEquipId(it) }
             if (componentList != null) {
                 for(equipment in componentList){
                     val equipScanTask = EquipScanTask()
@@ -331,6 +317,26 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
 
     } // Fun onCreateSuccess
 
+
+    /**
+     * 根据设备id查询部件
+     */
+     fun queryComponyByEquipId(id:String): ArrayList<Component>? {
+        var equipRequest = SQueryRequest()
+        equipRequest.filters = "id = '"+id+"'"
+        //级联查询部件
+        var cascade = SCascadeQuery()
+        cascade.name = "component"
+        equipRequest.cascade = arrayListOf(cascade)
+
+        val equipmentList = admBaseService?.queryEquip(equipRequest)
+        if(CollUtil.isEmpty(equipmentList)){
+            return ArrayList();
+        }
+        val equipment = equipmentList?.get(0)
+
+        return equipment?.component
+    }
     /**
      * 状态修改完成之后,若修改为  已完成状态  则级联部件任务状态全部修改为  已完成
      */
@@ -339,7 +345,8 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
         for (task in list) {
             val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
             if(task.equipId == null ){
-                val equipScanTaskScanTask = EquipScanTaskService.select("id" to task.id!!).entity()
+                //val equipScanTaskScanTask = EquipScanTaskService.select("id" to task.id!!).entity()
+                val equipScanTaskScanTask = EquipScanTaskService.select(SFilter.eq("id", task.id!!)).entity()
                 task.equipId = equipScanTaskScanTask!!.equipId
             }
             if (!task.confirmingPersonId.isNullOrEmpty()&&task.taskState == 0){
@@ -356,7 +363,8 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
                 updateComponetTaskStatus(task)
             }
             //更改设备对象的状态
-            val equipmentOld = equipmentService.select("id" to task.equipId!!).entity()
+            //val equipmentOld = equipmentService.select("id" to task.equipId!!).entity()
+            val equipmentOld = admBaseService?.queryEquipById(task.equipId!!)?.get(0)
             if(equipmentOld!!.taskState != -1){//未找到
                 val equip = Equipment()
                 equip.id = task.equipId!!
@@ -390,18 +398,28 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
      */
     fun updateComponetObjStatus(task: EquipScanTask){
         val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
-        val componentList = equipmentService.select("parentId" to task!!.equipId!!).exec()
-
+        //val componentList = equipmentService.select("parentId" to task!!.equipId!!).exec()
+        val componentList = task.equipId?.let { queryComponyByEquipId(it) }
         if(task.taskState == 1 || task.taskState == -1){ // 待验证和未找到
-            for(component in componentList){
-                component.taskState = task.taskState
-                equipmentService.update(component)
+            if (componentList != null) {
+                for(component in componentList){
+                    val infos = HashMap<String, Any?>()
+                    infos.put("taskState",task.taskState!!)
+                    component.infos = infos
+                  // equipmentService.update(component)
+                    admBaseService?.updateComponent(arrayListOf(component))
+                }
             }
         }else if(task.taskState == 0){ // 已完成
-            for(component in componentList){
-                if(component.taskState != -1){//如果部件状态为未找到,则不改变状态
-                    component.taskState = task.taskState
-                    equipmentService.update(component)
+            if (componentList != null) {
+                for(component in componentList){
+                    if(component.taskState != -1){//如果部件状态为未找到,则不改变状态
+                        val infos = HashMap<String, Any?>()
+                        infos.put("taskState",task.taskState!!)
+                        component.infos = infos
+                        //equipmentService.update(component)
+                        admBaseService?.updateComponent(arrayListOf(component))
+                    }
                 }
             }
         }
@@ -413,9 +431,8 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
     fun updateComponetTaskStatus(task: EquipScanTask){
         val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
         val equipScanTaskService = SBaseService(SMybatisDao(EquipScanTask::class.java))
-
-        val componentTaskList = equipScanTaskService.select("parentId" to task!!.equipId!!).exec()
-
+       // val componentTaskList = equipScanTaskService.select("parentId" to task!!.equipId!!).exec()
+        val componentTaskList = equipScanTaskService.select(SFilter.eq("projectId", task!!.equipId!!)).exec()
         for(childTask in componentTaskList){
             childTask.taskState = task.taskState
             EquipScanTaskService.update(childTask)
@@ -426,11 +443,17 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
      * 更新设备对象状态时,对应更改部件对象状态
      */
     fun resetComponetObjStatus(task: EquipScanTask){
-        val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
-        val componentList = equipmentService.select("parentId" to task!!.equipId!!).exec()
-        for(component in componentList){
-            component.taskState = task.taskState
-            equipmentService.update(component)
+       // val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
+        // val componentList = equipmentService.select("parentId" to task!!.equipId!!).exec()
+        val componentList = queryComponyByEquipId(task!!.equipId!!)
+        if (componentList != null) {
+            for(component in componentList){
+                val infos = HashMap<String, Any?>()
+                infos.put("taskState",task.taskState!!)
+                component.infos = infos
+                //equipmentService.update(component)
+                admBaseService?.updateComponent(arrayListOf(component))
+            }
         }
     }
 
@@ -440,7 +463,9 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
     fun resetTaskStatus(task: EquipScanTask) {
         val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
         val equipScanTaskService = SBaseService(SMybatisDao(EquipScanTask::class.java))
-        val resetTask = equipScanTaskService.select("equipId" to task.equipId!!, "taskState" to -1).entity()
+
+        //val resetTask = equipScanTaskService.select("equipId" to task.equipId!!, "taskState" to -1).entity()
+        val resetTask = equipScanTaskService.select(SFilter.eq("equipId", task!!.equipId!!), SFilter.eq("taskState",-1)).entity()
         if (resetTask != null) {
             resetTask.taskState = 0
             equipScanTaskService.update(resetTask)//更改设备任务状态
@@ -451,13 +476,16 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
          * 重新生成任务时,将设备和部件状态改变为待验证
          */
      fun resetObjStatus(task: EquipScanTask){
-        val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
-
+       // val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
         //更改设备对象状态
         val equip = Equipment()
         equip.id = task.equipId!!
-        equip.taskState = task.taskState
-        equipmentService.update(equip)
+
+        val infos = HashMap<String, Any?>()
+        infos.put("taskState",task.taskState!!)
+        equip.infos = infos
+
+        admBaseService?.updateEquip(arrayListOf(equip))
         //更改部件对象状态
         resetComponetObjStatus(task)
     }
@@ -465,11 +493,16 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
     override fun onDeleteBefore(entity: EquipScanTask): Boolean {
         try {
             val entity2 = select(SFilter.eq("id", entity.id!!)).entity()
-            val entity1 = EquipmentService.select(SFilter.eq("id", entity2!!.equipId!!)).entity()
+            //val entity1 = EquipmentService.select(SFilter.eq("id", entity2!!.equipId!!)).entity()
+            val entity1 = admBaseService?.queryEquipById(entity2!!.equipId!!)?.get(0)
             if (entity1!=null){
                 if (entity1.taskState == 1){
-                    entity1.taskState = null
-                    EquipmentService.update(entity1, arrayListOf("taskState"))
+                    //entity1.taskState = null
+                    val infos = HashMap<String, Any?>()
+                    infos.put("taskState",null)
+                    entity1.infos = infos
+                   // EquipmentService.update(entity1, arrayListOf("taskState"))
+                    admBaseService?.updateEquip(arrayListOf(entity1))
                 }
             }
         } catch (e: Exception) {

+ 143 - 66
scanbuilding/src/main/kotlin/com/persagy/server/services/task/ModelScanTaskService.kt

@@ -39,13 +39,16 @@ import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opts
 import com.persagy.server.datacenter.models.entities.assistant.TaskPic
 import com.persagy.server.datacenter.models.entities.dict.EquipCategory
+import com.persagy.server.datacenter.models.entities.dictnew.DefClass
 import com.persagy.server.datacenter.models.entities.objects.Equipment
 import com.persagy.server.datacenter.models.entities.task.*
 import com.persagy.server.datacenter.models.requests.ModelScanSQueryRequest
 import com.persagy.server.mappers.StatisticsCountMapper
 import com.persagy.server.scanbuilding.UserLog
-import com.persagy.server.services.EquipmentService
+import com.persagy.server.services.AdmBaseService
+import com.persagy.server.services.DmpBaseService
 import com.persagy.server.services.base.RService
+import com.persagy.server.util.AdmEntityTransferUtil
 import com.persagy.server.util.IdUtils
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
@@ -56,6 +59,7 @@ import com.persagy.service.models.requests.SQueryRequest
 import com.persagy.service.models.responses.SQueryResponse
 import com.persagy.service.utils.SSpringContextUtil
 import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.web.bind.annotation.RequestBody
 import java.util.*
 import java.util.stream.Collectors
@@ -74,12 +78,18 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
 
     val modelScanTaskService = SBaseService(SMybatisDao(ModelScanTask::class.java))
     /** 设备类型 */
-    val equipCategoryService = SObjectService(SMybatisDao(EquipCategory::class.java))
+   // val equipCategoryService = SObjectService(SMybatisDao(EquipCategory::class.java))
     /** 扫楼日志 */
     var userLogService = SObjectService(SMybatisDao(UserLog::class.java))
     /** 用户 */
     var userService = SObjectService(SMybatisDao(User::class.java))
 
+    @Autowired
+    private val admBaseService: AdmBaseService? = AdmBaseService()
+
+    @Autowired
+    private val dmpBaseService: DmpBaseService? = DmpBaseService()
+
 
     /** 实例化 mapper 对象 */
     val mapper by lazy {
@@ -94,7 +104,8 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
         val modelList = request.content;
         var newList = arrayListOf<ModelScanTask>()
         for(model in modelList){
-            val modelTask = ModelScanTaskService.select("equipId" to model.equipId!!,"taskState" to 1).entity()
+          //  val modelTask = ModelScanTaskService.select("equipId" to model.equipId!!,"taskState" to 1).entity()
+            val modelTask = ModelScanTaskService.select(SFilter.eq("equipId", model.equipId!!),SFilter.eq("taskState", 1)).entity()
             if(modelTask==null){//表示当前设备不存在未验证的任务
                 newList.add(model)
             }
@@ -128,9 +139,20 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
                 modelScanTask.taskType = "1"
 
                 if (!modelScanTask.equipId.isNullOrEmpty()) {//当设备id不为空时,去设备表查询对应的详细信息
-                    val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
-                    val equipment = equipmentService.select("id" to modelScanTask.equipId!!).entity()
-
+                    //val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
+                   //val equipment = equipmentService.select("id" to modelScanTask.equipId!!).entity()
+                   // val equipment = equipmentService.select(SFilter.eq("id", modelScanTask.equipId!!)).entity()
+
+                    //2021.10.26调整为从中间件查询设备信息
+                    var equipRequest = SQueryRequest()
+                    equipRequest.filters = "id = '"+modelScanTask.equipId+"'"
+                    val equipmentList = admBaseService?.queryEquip(equipRequest)
+
+                    if(CollUtil.isEmpty(equipmentList)){
+                        return false
+                        logger.info("设备不存在 id "+modelScanTask.equipId)
+                    }
+                    val equipment = equipmentList?.get(0)
                     if (modelScanTask.schemeId.isNullOrEmpty()){
                         modelScanTask.schemeId = SchemeUtils.setScheme(equipment!!.classCode!!)
                     }
@@ -244,37 +266,39 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
         val projectId = SPageContext.getHeader("projectId")
 
         for(task in modelScanTaskList){
-            val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
-            val componentList = equipmentService.select("parentId" to task.equipId!!).exec()
-
-            for(equipment in componentList){
-                val modelScanTask = ModelScanTask()
-                modelScanTask.id = IdUtils.uuidCreate()
-                if(!task.projectId.isNullOrEmpty()){
-                    modelScanTask.projectId = task.projectId
-                }else{
-                    modelScanTask.projectId = projectId
-                }
-                modelScanTask.taskSource = 4//数据源为模型任务
-                modelScanTask.taskState = 1//任务状态为待验证
-                modelScanTask.parentId = task.equipId
-                modelScanTask.equipId = equipment!!.id
-                modelScanTask.equipName = equipment!!.name
-                modelScanTask.localId = equipment!!.localId
-                modelScanTask.localName = equipment!!.localName
-                modelScanTask.bimId = equipment!!.bimId
-                modelScanTask.classCode = equipment!!.classCode
-                modelScanTask.buildingId = equipment!!.buildingId
-                modelScanTask.floorId = equipment!!.floorId
-                modelScanTask.cadId = equipment!!.cadId
-                modelScanTask.bimLocation = equipment.bimLocation
-                modelScanTask.taskParentId = task.id
-                if (equipment.codeType!=null){
-                    modelScanTask.taskType = equipment.codeType.toString()
-                }else{
-                    modelScanTask.taskType = "1"
+            //val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
+           // val componentList = equipmentService.select(SFilter.eq("parentId", task.equipId!!)).exec()
+            val componentList = task.equipId?.let { EquipScanTaskService.queryComponyByEquipId(it) }
+            if (componentList != null) {
+                for(equipment in componentList){
+                    val modelScanTask = ModelScanTask()
+                    modelScanTask.id = IdUtils.uuidCreate()
+                    if(!task.projectId.isNullOrEmpty()){
+                        modelScanTask.projectId = task.projectId
+                    }else{
+                        modelScanTask.projectId = projectId
+                    }
+                    modelScanTask.taskSource = 4//数据源为模型任务
+                    modelScanTask.taskState = 1//任务状态为待验证
+                    modelScanTask.parentId = task.equipId
+                    modelScanTask.equipId = equipment!!.id
+                    modelScanTask.equipName = equipment!!.name
+                    modelScanTask.localId = equipment!!.localId
+                    modelScanTask.localName = equipment!!.localName
+                    modelScanTask.bimId = equipment!!.bimId
+                    modelScanTask.classCode = equipment!!.classCode
+                    modelScanTask.buildingId = equipment!!.buildingId
+                    modelScanTask.floorId = equipment!!.floorId
+                    modelScanTask.cadId = equipment!!.cadId
+                    modelScanTask.bimLocation = equipment.bimLocation
+                    modelScanTask.taskParentId = task.id
+                    if (equipment.codeType!=null){
+                        modelScanTask.taskType = equipment.codeType.toString()
+                    }else{
+                        modelScanTask.taskType = "1"
+                    }
+                    ModelScanTaskService.insert(modelScanTask)
                 }
-                ModelScanTaskService.insert(modelScanTask)
             }
             resetObjStatus(task)
         }
@@ -290,9 +314,10 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
         val projectId = SPageContext.getHeader("projectId")
 
         for (task in list) {
-            val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
+          //  val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
             if(task.equipId == null ){
-                val modelScanTaskScanTask = ModelScanTaskService.select("id" to task.id!!).entity()
+
+                val modelScanTaskScanTask = ModelScanTaskService.select(SFilter.eq("id", task.id!!)).entity()
                 task.equipId = modelScanTaskScanTask!!.equipId
             }
 
@@ -310,12 +335,17 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
                 updateComponetTaskStatus(task)
             }
             //更改设备对象的状态
-            val equipmentOld = equipmentService.select("id" to task.equipId!!).entity()
+            val equipmentOld = admBaseService?.queryEquipById(task.equipId!!)?.get(0)
             if(equipmentOld!!.taskState != -1){//未找到
                 val equip = Equipment()
                 equip.id = task.equipId!!
-                equip.taskState = task.taskState
-                equipmentService.update(equip)
+               /* equip.taskState = task.taskState
+                equipmentService.update(equip)*/
+                val infos = HashMap<String, Any?>()
+                infos.put("taskState",task.taskState!!)
+                equip.infos = infos
+
+                admBaseService?.updateEquip(arrayListOf(equip))
             }
             try {
                 if (!Opts.coming.isNullOrEmpty()&&Opts.coming == "app"){
@@ -343,19 +373,34 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
      * 更新设备对象状态时,对应更改部件对象状态,当为未找到状态时,特殊处理
      */
     fun updateComponetObjStatus(task: ModelScanTask){
-        val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
-        val componentList = equipmentService.select("parentId" to task!!.equipId!!).exec()
-
+      //  val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
+      //  val componentList = equipmentService.select(SFilter.eq("parentId", task.equipId!!)).exec()
+        val componentList = task.equipId?.let { EquipScanTaskService.queryComponyByEquipId(it) }
         if(task.taskState == 1 || task.taskState == -1){ // 待验证和未找到
-            for(component in componentList){
-                component.taskState = task.taskState
-                equipmentService.update(component)
+            if (componentList != null) {
+                for(component in componentList){
+                    component.taskState = task.taskState
+                   // equipmentService.update(component)
+                    val infos = HashMap<String, Any?>()
+                    infos.put("taskState",task.taskState!!)
+                    component.infos = infos
+
+                    admBaseService?.updateComponent(arrayListOf(component))
+                }
             }
         }else if(task.taskState == 0){ // 已完成
-            for(component in componentList){
-                if(component.taskState != -1){//如果部件状态为未找到,则不改变状态
-                    component.taskState = task.taskState
-                    equipmentService.update(component)
+            if (componentList != null) {
+                for(component in componentList){
+                    if(component.taskState != -1){//如果部件状态为未找到,则不改变状态
+                        component.taskState = task.taskState
+                        //equipmentService.update(component)
+
+                        val infos = HashMap<String, Any?>()
+                        infos.put("taskState",task.taskState!!)
+                        component.infos = infos
+
+                        admBaseService?.updateComponent(arrayListOf(component))
+                    }
                 }
             }
         }
@@ -368,7 +413,7 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
         val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
         val modelScanTaskService = SBaseService(SMybatisDao(ModelScanTask::class.java))
 
-        val componentTaskList = modelScanTaskService.select("parentId" to task!!.equipId!!).exec()
+        val componentTaskList = modelScanTaskService.select(SFilter.eq("parentId", task.equipId!!)).exec()
 
         for(childTask in componentTaskList){
             childTask.taskState = task.taskState
@@ -380,11 +425,19 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
      * 更新设备对象状态时,对应更改部件对象状态
      */
     fun resetComponetObjStatus(task: ModelScanTask){
-        val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
-        val componentList = equipmentService.select("parentId" to task!!.equipId!!).exec()
-        for(component in componentList){
-            component.taskState = task.taskState
-            equipmentService.update(component)
+       // val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
+       // val componentList = equipmentService.select(SFilter.eq("parentId", task.equipId!!)).exec()
+        val componentList = EquipScanTaskService.queryComponyByEquipId(task!!.equipId!!)
+        if (componentList != null) {
+            for(component in componentList){
+                /*component.taskState = task.taskState
+                equipmentService.update(component)*/
+                val infos = HashMap<String, Any?>()
+                infos.put("taskState",task.taskState!!)
+                component.infos = infos
+                //equipmentService.update(component)
+                admBaseService?.updateComponent(arrayListOf(component))
+            }
         }
     }
 
@@ -392,9 +445,10 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
      * 重新生成任务时,将任务状态改为已完成
      */
     fun resetTaskStatus(task: ModelScanTask) {
-        val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
+        //val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
         val modelScanTaskService = SBaseService(SMybatisDao(ModelScanTask::class.java))
-        val resetTask = modelScanTaskService.select("equipId" to task.equipId!!, "taskState" to -1).entity()
+
+        val resetTask = modelScanTaskService.select(SFilter.eq("equipId", task.equipId!!), SFilter.eq("taskState", -1)).entity()
         if (resetTask != null) {
             resetTask.taskState = 0
             modelScanTaskService.update(resetTask)//更改设备任务状态
@@ -405,7 +459,7 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
      * 重新生成任务时,将设备和部件状态改变为待验证
      */
     fun resetObjStatus(task: ModelScanTask){
-        val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
+        /*val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
 
         //更改设备对象状态
         val equip = Equipment()
@@ -413,7 +467,18 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
         equip.taskState = task.taskState
         equipmentService.update(equip)
         //更改部件对象状态
-        resetComponetObjStatus(task)
+        resetComponetObjStatus(task)*/
+
+        val equip = Equipment()
+        equip.id = task.equipId!!
+
+        val infos = HashMap<String, Any?>()
+        infos.put("taskState",task.taskState!!)
+        equip.infos = infos
+
+        admBaseService?.updateEquip(arrayListOf(equip))
+        //更改部件对象状态
+       resetComponetObjStatus(task)
     }
 
 
@@ -537,15 +602,21 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
                         for (equip in subList){
                             logger.debug("数据 = ${equip.toJson()}")
                             try {
-                                val entity = equipCategoryService.select(SFilter.eq("code", equip.classCode!!)).entity()
+                                /*val entity = equipCategoryService.select(SFilter.eq("code", equip.classCode!!)).entity()
                                 if (entity!=null){
                                     equip.equipCategory = entity
+                                }*/
+                                val equipCategoryList = dmpBaseService?.getEquipCategory(equip.classCode!!)
+                                if (equipCategoryList != null) {
+                                    equip.equipCategory = equipCategoryList.get(0)
                                 }
+
                                 val exec = modelScanTaskService.select(SFilter.eq("parentId", equip.id!!)).exec()
                                 if (exec.size>0){
                                     equip.component = exec
                                 }
-                                val entity1 = EquipmentService.select(SFilter.eq("id", equip.id!!)).entity()
+                                //val entity1 = EquipmentService.select(SFilter.eq("id", equip.id!!)).entity()
+                                val entity1 = admBaseService?.queryEquipById(equip.id!!)?.get(0)
                                 equip.bimId = entity1!!.bimId
                                 equip.localId = entity1.localId
                                 equip.localName = entity1.localName
@@ -608,11 +679,17 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
             if(entity2 == null){
                 return false
             }
-            val entity1 = EquipmentService.select(SFilter.eq("id", entity2!!.equipId!!)).entity()
+            //val entity1 = EquipmentService.select(SFilter.eq("id", entity2!!.equipId!!)).entity()
+            val entity1 = admBaseService?.queryEquipById(entity2!!.equipId!!)?.get(0)
             if (entity1!=null){
                 if (entity1.taskState == 1){
-                    entity1.taskState = null
-                    EquipmentService.update(entity1, arrayListOf("TaskState"))
+                  /*  entity1.taskState = null
+                    EquipmentService.update(entity1, arrayListOf("TaskState"))*/
+                    val infos = HashMap<String, Any?>()
+                    infos.put("taskState",null)
+                    entity1.infos = infos
+
+                    admBaseService?.updateEquip(arrayListOf(entity1))
                 }
             }
         } catch (e: Exception) {

+ 78 - 20
scanbuilding/src/main/kotlin/com/persagy/server/services/task/PropertyScanTaskService.kt

@@ -41,13 +41,17 @@ import com.persagy.server.datacenter.models.entities.objects.Property
 import com.persagy.server.datacenter.models.entities.task.PropertyScanTask
 import com.persagy.server.datacenter.models.entities.task.SchemeUtils
 import com.persagy.server.scanbuilding.UserLog
+import com.persagy.server.services.AdmBaseService
+import com.persagy.server.services.DmpBaseService
 import com.persagy.server.services.base.RService
+import com.persagy.server.util.AdmEntityTransferUtil
 import com.persagy.server.util.IdUtils
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.requests.SCreateRequest
 import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.web.bind.annotation.RequestBody
 import java.util.*
 import kotlin.collections.ArrayList
@@ -66,8 +70,16 @@ object PropertyScanTaskService : RService<PropertyScanTask>(SMybatisDao(Property
     var userLogService = SObjectService(SMybatisDao(UserLog::class.java))
     /** 用户 */
     var userService = SObjectService(SMybatisDao(User::class.java))
+
     /** 用户 */
-    var equipFamilyCategoryService = SObjectService(SMybatisDao(EquipFamilyCategory::class.java))
+    //var equipFamilyCategoryService = SObjectService(SMybatisDao(EquipFamilyCategory::class.java))
+
+    @Autowired
+    private val admBaseService: AdmBaseService? = AdmBaseService()
+
+    @Autowired
+    private val dmpBaseService: DmpBaseService? = DmpBaseService()
+
     /**
      * 插入之前先过滤已经存在未验证任务的对象,返回新列表
      */
@@ -75,7 +87,7 @@ object PropertyScanTaskService : RService<PropertyScanTask>(SMybatisDao(Property
         val propertyTaskList = request.content;
         var newList = arrayListOf<PropertyScanTask>()
         for(property in propertyTaskList){
-            val propertyTask = PropertyScanTaskService.select("equipId" to property.equipId!!,"taskState" to 1).entity()
+            val propertyTask = PropertyScanTaskService.select(SFilter.eq("equipId", property.equipId!!),SFilter.eq("taskState", 1)).entity()
             if(propertyTask==null){//表示当前设备已经存在未验证的任务
                 newList.add(property)
             }
@@ -97,7 +109,9 @@ object PropertyScanTaskService : RService<PropertyScanTask>(SMybatisDao(Property
                 flag = true
 
                 val propertyScanTaskService = SBaseService(SMybatisDao(PropertyScanTask::class.java))
-                val resetTask = propertyScanTaskService.select("equipId" to propertyScanTask.equipId!!,"taskState" to -1).entity()
+               val resetTask = propertyScanTaskService.select(SFilter.eq("equipId", propertyScanTask.equipId!!),SFilter.eq("taskState", -1)
+               ).entity()
+
                 if( resetTask!=null ){
                     resetTask.taskState = 0
                     propertyScanTaskService.update(resetTask)
@@ -114,8 +128,10 @@ object PropertyScanTaskService : RService<PropertyScanTask>(SMybatisDao(Property
             propertyScanTask.taskState = 1//任务状态为待验证
             propertyScanTask.taskType = "1"
             if (!propertyScanTask.equipId.isNullOrEmpty()) {//当设备id不为空时,去设备表查询对应的详细信息
-                val propertyService = SBaseService(SMybatisDao(Property::class.java))
-                val property = propertyService.select("id" to propertyScanTask.equipId!!).entity()
+               // val propertyService = SBaseService(SMybatisDao(Property::class.java))
+               // val property = propertyService.select(SFilter.eq("id", propertyScanTask.equipId!!)
+                //).entity()
+                val property = admBaseService?.queryPropertyById(propertyScanTask.equipId!!)?.get(0)
                 if (propertyScanTask.schemeId.isNullOrEmpty()){
                     propertyScanTask.schemeId = SchemeUtils.setScheme(property!!.family!!)
                 }
@@ -234,13 +250,28 @@ object PropertyScanTaskService : RService<PropertyScanTask>(SMybatisDao(Property
 
 
     override fun onDeleteBefore(entity: PropertyScanTask): Boolean {
-        val entity1 = select(SFilter.eq("id", entity.id!!)).entity()
-        val propertyService = SBaseService(SMybatisDao(Property::class.java))
-        val property = propertyService.select(SFilter.eq("id", entity1!!.equipId!!)).entity()
-        val list = ArrayList<String>()
-        list.add("TaskState")
-        property!!.taskState = null
-        propertyService.update(property,list)
+        /*  val entity1 = select(SFilter.eq("id", entity.id!!)).entity()
+         val propertyService = SBaseService(SMybatisDao(Property::class.java))
+         val property = propertyService.select(SFilter.eq("id", entity1!!.equipId!!)).entity()
+
+          val list = ArrayList<String>()
+          list.add("TaskState")
+          property!!.taskState = null
+          propertyService.update(property,list)*/
+
+        val property = admBaseService?.queryPropertyById(entity!!.equipId!!)?.get(0)
+        val infos = HashMap<String, Any?>()
+        infos.put("taskState",null)
+        if (property != null) {
+            property.infos = infos
+        }
+
+        val list = ArrayList<Property>()
+        if (property != null) {
+            list.add(property)
+        }
+        admBaseService?.updateProperty(list)
+
         return super.onDeleteBefore(entity)
     }
 
@@ -250,11 +281,21 @@ object PropertyScanTaskService : RService<PropertyScanTask>(SMybatisDao(Property
      */
     override fun onCreateSuccess(propertyScanTaskList: ArrayList<PropertyScanTask>) {
         for(task in propertyScanTaskList){
-            val property = Property()
+            /*val property = Property()
             val propertyService = SBaseService(SMybatisDao(Property::class.java))
             property.id = task.equipId!!
             property.taskState = 1
-            propertyService.update(property)
+            propertyService.update(property)*/
+
+            val property = Property()
+            property.id = task.equipId!!
+            val infos = HashMap<String, Any?>()
+            infos.put("taskState",1)
+            if (property != null) {
+                property.infos = infos
+            }
+            admBaseService?.updateProperty(arrayListOf(property))
+
         }
     } // Fun onCreateSuccess
 
@@ -264,18 +305,28 @@ object PropertyScanTaskService : RService<PropertyScanTask>(SMybatisDao(Property
     override fun onUpdateSuccess(list: ArrayList<PropertyScanTask>) {
         val projectId = SPageContext.getHeader("projectId")
         for (task in list) {
-            val propertyService = SBaseService(SMybatisDao(Property::class.java))
+           // val propertyService = SBaseService(SMybatisDao(Property::class.java))
             if(task.equipId == null ){
-                val propertyScanTask = PropertyScanTaskService.select("id" to task.id!!).entity()
+                val propertyScanTask = PropertyScanTaskService.select(SFilter.eq("id", task.id!!)).entity()
                 task.equipId = propertyScanTask!!.equipId
             }
             //更改设备对象的状态
-            val propertyOld = propertyService.select("id" to task.equipId!!).entity()
+            //val propertyOld = propertyService.select(SFilter.eq("id", task.equipId!!)).entity()
+            val propertyOld = admBaseService?.queryPropertyById(task!!.equipId!!)?.get(0)
             if(propertyOld!!.taskState != -1) {//未找到
-                val property = Property()
+              /*  val property = Property()
                 property.id = task.equipId!!
                 property.taskState = task.taskState
-                propertyService.update(property)
+                propertyService.update(property)*/
+
+                val property = Property()
+                property.id = task.equipId!!
+                val infos = HashMap<String, Any?>()
+                infos.put("taskState",task.taskState!!)
+                if (property != null) {
+                    property.infos = infos
+                }
+                admBaseService?.updateProperty(arrayListOf(property))
             }
             try {
                 if (!Opts.coming.isNullOrEmpty()&&Opts.coming == "app"){
@@ -302,7 +353,14 @@ object PropertyScanTaskService : RService<PropertyScanTask>(SMybatisDao(Property
     override fun onQuerySuccess(pageInfo: SPageQueryInfo<PropertyScanTask>) {
         if (!pageInfo.content.isNullOrEmpty()){
             for (content in pageInfo.content!!){
-                val entity = equipFamilyCategoryService.select(SFilter.eq("family", content.classCode!!)).entity()
+              //  val entity = equipFamilyCategoryService.select(SFilter.eq("family", content.classCode!!)).entity()
+                //查询中台类型数据,2021.10.25日中心中台整合调整
+                val param = JSONObject()
+                val criteria = JSONObject()
+                criteria["code"] = content.classCode!!
+                param["criteria"] = criteria
+                val dictTypes = dmpBaseService?.queryDictType(param)
+                val entity = AdmEntityTransferUtil.toAdmMultiEntity(dictTypes, null, EquipFamilyCategory::class.java)?.get(0)
                 if (entity!=null) {
                     content.equipFamily = entity
                 }else {