2025.12.22 1. 修改日任务统计接口，新增当天内整改问题数和48小时内整改问题数统计

Riku

2025-12-22 b180708562d6fb872c83c05756e8041d9967483a

 src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/MonitorobjectversionServiceImpl.kt

@@ -1,9 +1,10 @@
package cn.flightfeather.supervision.lightshare.service.impl

import cn.flightfeather.supervision.domain.ds1.entity.Monitorobjectversion
import cn.flightfeather.supervision.domain.ds1.entity.Scense
import cn.flightfeather.supervision.common.utils.UUIDGenerator
import cn.flightfeather.supervision.domain.ds1.entity.*
import cn.flightfeather.supervision.domain.ds1.mapper.MonitorobjectversionMapper
import cn.flightfeather.supervision.domain.ds1.mapper.TaskMapper
import cn.flightfeather.supervision.domain.ds1.repository.SceneRep
import cn.flightfeather.supervision.lightshare.service.MonitorobjectversionService
import cn.flightfeather.supervision.lightshare.service.ScenseService
import cn.flightfeather.supervision.lightshare.vo.MonitorObjectVersionVo
@@ -13,8 +14,10 @@
import org.springframework.transaction.annotation.Transactional

@Service
class MonitorobjectversionServiceImpl(val monitorobjectversionMapper: MonitorobjectversionMapper) :
    MonitorobjectversionService {
class MonitorobjectversionServiceImpl(
    private val monitorobjectversionMapper: MonitorobjectversionMapper,
    private val sceneRep: SceneRep,
) : MonitorobjectversionService {

    @Autowired
    lateinit var taskMapper: TaskMapper
@@ -38,7 +41,8 @@
        val monitorobjectversionlist = monitorobjectversionMapper.select(monitorobjectversion)

        return monitorobjectversionlist.filter {
            val usedCount = it.extension1 ?: "0";it.monitornum.toString().toInt() - usedCount.toInt() > 0
            val usedCount = it.extension1 ?: "0"
            it.monitornum.toString().toInt() - usedCount.toInt() > 0
        }.sortedBy { it.displayid }
    }

@@ -46,6 +50,7 @@
    @Transactional
    override fun saveList(monitorobjectversionlist: List<Monitorobjectversion>): Int {
        monitorobjectversionlist.forEach {
            if (it.movid == null) it.movid = UUIDGenerator.generate16ShortUUID()
            monitorobjectversionMapper.insert(it)
        }
        return monitorobjectversionlist.size
@@ -60,6 +65,7 @@
            districtcode = task.districtcode
        }
        val sceneList = scenseService.search(s)
        val subSceneList = sceneRep.findSubSceneList(sceneList)

        val monitorobjectversion = Monitorobjectversion()
        monitorobjectversion.tid = id
@@ -69,13 +75,21 @@
        monitorobjectversionlist.forEach {
            val vo = MonitorObjectVersionVo()
            BeanUtils.copyProperties(it, vo)
            sceneList.forEach f@ {scene ->
                if (vo.sguid == scene.guid) {
                    vo.sceneTypeId = scene.typeid?.toInt() ?: 0
                    vo.sceneType = scene.type
                    return@f
                }
            sceneList.find {s-> s.guid == vo.sguid }?.let { s->
                vo.sceneTypeId = s.typeid?.toInt() ?: 0
                vo.sceneType = s.type
                vo.scene = s
            }
            subSceneList.find { s ->
                val sGuid = when(s){
                    is SceneConstructionSite-> s.getsGuid()
                    is SceneWharf -> s.getsGuid()
                    is SceneMixingPlant -> s.getsGuid()
                    is SceneStorageYard-> s.getsGuid()
                    else -> null
                }
                sGuid == vo.sguid
            }?.let { s-> vo.subScene = s }
            resultList.add(vo)
        }