From b6c29718e10e25a6a49fe9538f554371e1560720 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期一, 25 七月 2022 15:50:22 +0800
Subject: [PATCH] 1. 调试监管统计文件下载接口； 2. 新增自动评分刷新接口； 3. 针对前端页面，调整部分接口
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SearchServiceImpl.kt | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SearchServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SearchServiceImpl.kt
index 1025cf9..4aee9a5 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SearchServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SearchServiceImpl.kt
@@ -21,6 +21,9 @@
import java.io.File
import java.io.FileInputStream
import java.io.FileOutputStream
+import java.io.OutputStream
+import java.net.URLEncoder
+import java.nio.charset.Charset
import java.nio.charset.StandardCharsets
import java.util.*
import javax.servlet.http.HttpServletResponse
@@ -103,25 +106,49 @@
t?.toFile("target/")
}
- override fun getExcel(config: ExcelConfigVo, response: HttpServletResponse): HttpServletResponse {
+ override fun getExcel(config: ExcelConfigVo, response: HttpServletResponse): Boolean {
+ val dbMapper = DbMapper(
+ scenseMapper,
+ problemlistMapper,
+ problemtypeMapper,
+ subtaskMapper,
+ monitorobjectversionMapper,
+ sceneConstructionSiteMapper,
+ sceneMixingPlantMapper,
+ sceneStorageYardMapper,
+ sceneWharfMapper,
+ taskMapper,
+ evaluationruleMapper, evaluationsubruleMapper, evaluationMapper, itemevaluationMapper,
+ ledgerSubTypeMapper, ledgerRecordMapper, userinfoMapper, userMapMapper, townMapper
+ )
+ val dataSource = DataSource(config, dbMapper)
+ val t = when (config.mode) {
+ 1 -> ReportOne(dataSource)
+ 2 -> ReportTwo(dataSource)
+ 3 -> ReportThree(dataSource)
- val fileName = "${dateUtil.DateToString(Date(), "yyyy-MM-dd hh:mm:ss")}.xls"
+ else -> ReportOne(dataSource)
+ }
+ val fileName = t.getReportName()
+ val fName = URLEncoder.encode(fileName, "UTF-8")
response.apply {
- setHeader("Content-Disposition", "attachment;filename=$fileName")
- setHeader("fileName", fileName)
+ setHeader("Content-Disposition", "attachment;filename=$fName")
+ setHeader("fileName", fName)
+ addHeader("Access-Control-Expose-Headers", "fileName")
contentType = "application/vnd.ms-excel;charset=UTF-8"
setHeader("Pragma", "no-cache")
setHeader("Cache-Control", "no-cache")
setDateHeader("Expires", 0)
}
-// val heads = getTableTitles(config.sceneType, config.districtCode)
-// val contents = getTableContents(config, heads.size)
- val r = getTable(1, config)
- val out = response.outputStream
- ExcelUtil.write2(out, r.first, r.second)
+ val p = Constant.DEFAULT_FILE_PATH + "/files/autoscore/"
+ val file = File(p + fileName)
+ if (config.forceUpdate || !file.exists()) {
+ t.toFile(p)
+ }
+ response.outputStream.write(file.readBytes())
- return response
+ return true
}
override fun getSubTaskDetail(config: ExcelConfigVo): SubTaskTableVo {
--
Gitblit v1.9.3