supervision-spring.git

			@@ -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
			@@ -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())