From 1a677d2b4a4bc615602f8c2a22bc07ec1356e5be Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 16 十月 2025 17:39:06 +0800
Subject: [PATCH] 2025.10.16 1. 根据全局响应增强器GlobalResponseAdvice，将原先的BaseResPack接口包装函数统一去除； 2. 新增三种类型的数据产品数据库实体 3. 新增典型问题场景清单中间数据产品接口
---
src/main/kotlin/cn/flightfeather/supervision/business/report/BaseTemplateMulti.kt | 59 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/report/BaseTemplateMulti.kt b/src/main/kotlin/cn/flightfeather/supervision/business/report/BaseTemplateMulti.kt
index 4ff70ed..ef49da5 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/report/BaseTemplateMulti.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/report/BaseTemplateMulti.kt
@@ -1,11 +1,8 @@
package cn.flightfeather.supervision.business.report
-import cn.flightfeather.supervision.common.utils.Constant
-import cn.flightfeather.supervision.common.utils.DateUtil
+import cn.flightfeather.supervision.common.exception.BizException
import cn.flightfeather.supervision.common.utils.ExcelUtil
-import cn.flightfeather.supervision.domain.ds1.entity.Problemlist
import org.apache.poi.hssf.usermodel.HSSFWorkbook
-import tk.mybatis.mapper.entity.Example
import java.io.FileOutputStream
import java.io.OutputStream
import java.util.*
@@ -31,7 +28,7 @@
open fun execute() {
- if (dataSourceList.isEmpty()) throw IllegalStateException("${templateName}: 鏁版嵁婧愪负绌�")
+ if (dataSourceList.isEmpty()) throw BizException("${templateName}: 鏁版嵁婧愪负绌�")
//鍚堟垚琛ㄥご
cols.forEach {
it.combineHead(head, dataSourceList[0])
@@ -84,19 +81,21 @@
val c = mutableListOf<Array<Any>>()
head.forEach { h.add(it.toTypedArray()) }
contents.forEach { c.add(it.toTypedArray()) }
- val index = c[0][0]
- //鎸夌収绗竴鍒楄繘琛屾帓搴�
- if (index is Int) {
- c.sortBy {
- if (it[0] is Int) {
- it[0] as Int
- } else {
- 0
+ if (c.isNotEmpty() && c[0].isNotEmpty()) {
+ val index = c[0][0]
+ //鎸夌収绗竴鍒楄繘琛屾帓搴�
+ if (index is Int) {
+ c.sortBy {
+ if (it[0] is Int) {
+ it[0] as Int
+ } else {
+ 0
+ }
}
- }
- } else {
- c.sortBy {
- it[0].toString()
+ } else {
+ c.sortBy {
+ it[0].toString()
+ }
}
}
return Pair(h, c)
@@ -115,19 +114,21 @@
contents.forEach {
c.add(it.toTypedArray())
}
- val index = c[0][0]
- //鎸夌収绗竴鍒楄繘琛屾帓搴�
- if (index is Int) {
- c.sortBy {
- if (it[0] is Int) {
- it[0] as Int
- } else {
- 0
+ if (c.isNotEmpty() && c[0].isNotEmpty()) {
+ val index = c[0][0]
+ //鎸夌収绗竴鍒楄繘琛屾帓搴�
+ if (index is Int) {
+ c.sortBy {
+ if (it[0] is Int) {
+ it[0] as Int
+ } else {
+ 0
+ }
}
- }
- } else {
- c.sortBy {
- it[0].toString()
+ } else {
+ c.sortBy {
+ it[0].toString()
+ }
}
}
return Pair(h, c)
--
Gitblit v1.9.3