From b8cc591541b88dd2bb93f111f8e8075842dce7ca Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 13 八月 2024 17:21:06 +0800
Subject: [PATCH] 1. 新增设备信息相关功能 2. 修正自评估中数据自动评分的部分逻辑
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/EvaluationServiceImpl.kt | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/EvaluationServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/EvaluationServiceImpl.kt
index 7549c48..346b362 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/EvaluationServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/EvaluationServiceImpl.kt
@@ -6,10 +6,8 @@
import cn.flightfeather.supervision.business.bgtask.ReportTaskCtrl
import cn.flightfeather.supervision.business.report.DataSource
import cn.flightfeather.supervision.business.report.DbMapper
-import cn.flightfeather.supervision.business.report.file.ReportOne
-import cn.flightfeather.supervision.business.report.file.ReportThree
import cn.flightfeather.supervision.business.report.file.ReportTwo
-import cn.flightfeather.supervision.common.exception.ResponseErrorException
+import cn.flightfeather.supervision.common.exception.BizException
import cn.flightfeather.supervision.common.executor.BgTaskStatus
import cn.flightfeather.supervision.domain.ds1.entity.Domainitem
import cn.flightfeather.supervision.domain.ds1.entity.Evaluation
@@ -31,7 +29,6 @@
import org.springframework.stereotype.Service
import tk.mybatis.mapper.entity.Example
import java.io.File
-import java.net.URLEncoder
import java.util.*
import javax.servlet.http.HttpServletResponse
import kotlin.Comparator
@@ -221,7 +218,7 @@
val example = Example(Subtask::class.java)
val criteria = example.createCriteria()
criteria.andEqualTo("districtcode", districtCode)
- val date = DateUtil().StringToDate(time)
+ val date = DateUtil.StringToDate(time)
criteria.andGreaterThanOrEqualTo("planstarttime", time)
val subTaskList = subtaskMapper.selectByExample(example)
subTaskList.forEach {
@@ -290,9 +287,9 @@
return evaluationRep.findAutoScore(areaVo)
}
- override fun downloadAutoEvaluation(areaVo: AreaVo, response: HttpServletResponse): Boolean {
- areaVo.scensetypeid ?: throw ResponseErrorException("蹇呴』閫夋嫨涓�涓満鏅被鍨�")
- val topTask = taskRep.findOneTask(areaVo) ?: throw ResponseErrorException("鏈壘鍒扮鍚堟潯浠剁殑椤跺眰浠诲姟")
+ override fun downloadAutoEvaluation(areaVo: AreaVo, forceUpdate: Boolean, response: HttpServletResponse): Boolean {
+ areaVo.scensetypeid ?: throw BizException("蹇呴』閫夋嫨涓�涓満鏅被鍨�")
+ val topTask = taskRep.findOneTask(areaVo) ?: throw BizException("鏈壘鍒扮鍚堟潯浠剁殑椤跺眰浠诲姟")
val config = ExcelConfigVo(
topTask.tguid ?: "",
topTask.starttime,
@@ -301,7 +298,8 @@
topTask.citycode,
topTask.districtcode,
topTask.towncode,
- areaVo.scensetypeid?.toInt()
+ areaVo.scensetypeid?.toInt(),
+ forceUpdate = forceUpdate
)
val dataSource = DataSource(config, dbMapper)
@@ -310,8 +308,8 @@
val p = "$filePath/autoscore/"
val file = File(p + fileName)
if (config.forceUpdate || !file.exists()) {
-// val downloadUrl = "/autoscore/${fileName}"
-// reportTaskCtrl.startTask(t, downloadUrl)
+ val downloadUrl = "/autoscore/${fileName}"
+ reportTaskCtrl.startTask(t, downloadUrl)
return false
} else {
val fName = Base64.getEncoder().encodeToString(fileName.toByteArray())
--
Gitblit v1.9.3