Browse Source

扫楼统计数量与列表数量不一致问题修复

linhuili 3 years ago
parent
commit
99eab95fc1

+ 5 - 1
scanbuilding/src/main/kotlin/com/persagy/server/controller/task/ModelScanTaskController.kt

@@ -26,6 +26,7 @@
 
 package com.persagy.server.controller.task
 
+import cn.hutool.core.bean.BeanUtil
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.database.functions.SLength
@@ -49,6 +50,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.slf4j.LoggerFactory
+import org.springframework.beans.BeanUtils
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
@@ -125,7 +127,9 @@ open class ModelScanTaskController {
         val sCreateRequest = SCreateRequest<ScanTaskBase>()
         var newList = arrayListOf<ScanTaskBase>()
         for(equip in scanTaskBase){
-            val scanTaskBase: ScanTaskBase = equip
+            val scanTaskBase =  ScanTaskBase()
+            BeanUtils.copyProperties(equip,scanTaskBase)
+            //val scanTaskBase: ScanTaskBase = equip
             scanTaskBase.projectId= Opts.projectId
             newList.add(scanTaskBase);
         }

+ 4 - 1
scanbuilding/src/main/kotlin/com/persagy/server/controller/task/PropertyScanTaskController.kt

@@ -26,6 +26,7 @@
 
 package com.persagy.server.controller.task
 
+import cn.hutool.core.bean.BeanUtil
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.server.Opts
@@ -49,6 +50,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.slf4j.LoggerFactory
+import org.springframework.beans.BeanUtils
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
@@ -110,7 +112,8 @@ open class PropertyScanTaskController {
         val sCreateRequest = SCreateRequest<ScanTaskBase>()
         var newList = arrayListOf<ScanTaskBase>()
         for(equip in scanTaskBase){
-            val scanTaskBase: ScanTaskBase = equip
+            val scanTaskBase  = ScanTaskBase()
+             BeanUtils.copyProperties(equip,scanTaskBase)
             scanTaskBase.projectId= Opts.projectId
             newList.add(scanTaskBase);
         }

+ 1 - 0
scanbuilding/src/main/kotlin/com/persagy/server/services/task/ModelScanTaskService.kt

@@ -111,6 +111,7 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
           //  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){//表示当前设备不存在未验证的任务
+                model.id = IdUtils.uuidCreate()
                 newList.add(model)
             }
         }

+ 1 - 0
scanbuilding/src/main/kotlin/com/persagy/server/services/task/PropertyScanTaskService.kt

@@ -195,6 +195,7 @@ object PropertyScanTaskService : RService<PropertyScanTask>(SMybatisDao(Property
         for(property in propertyTaskList){
             val propertyTask = PropertyScanTaskService.select(SFilter.eq("equipId", property.equipId!!),SFilter.eq("taskState", 1)).entity()
             if(propertyTask==null){//表示当前设备已经存在未验证的任务
+                property.id = IdUtils.uuidCreate()
                 newList.add(property)
             }
         }