From c55c9a51cea46caea88b2bee5cc3c9ddaa9fc468 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期三, 11 十二月 2024 08:44:22 +0800
Subject: [PATCH] 1. 新增 BaseExcel.kt 和 BaseTemplate.kt 的 toObject输出到对象方法 2. 新增 BaseTemplate 是否执行的状态属性 3. 在cn.flightfeather.supervision.business.report.bean包下新增 BaseTemplateResult.kt 结果对象抽象类 以及 ProAnalysisSummaryResult.kt 和 ProDetailSummaryResult.kt 对应实现：问题整改动态跟踪和分街镇问题整改分析的中间结果对象 注：除了问题整改动态跟踪和分街镇问题整改分析其他的汇总表对象中都没有对应中间结果对象，因此这里还有报错信息
---
src/test/kotlin/cn/flightfeather/supervision/business/autooutput/AopEvaluationTest.kt | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/src/test/kotlin/cn/flightfeather/supervision/business/autooutput/AopEvaluationTest.kt b/src/test/kotlin/cn/flightfeather/supervision/business/autooutput/AopEvaluationTest.kt
index 07b51cc..6b2f2b0 100644
--- a/src/test/kotlin/cn/flightfeather/supervision/business/autooutput/AopEvaluationTest.kt
+++ b/src/test/kotlin/cn/flightfeather/supervision/business/autooutput/AopEvaluationTest.kt
@@ -9,6 +9,7 @@
import cn.flightfeather.supervision.business.autooutput.datasource.AopDataConfig
import cn.flightfeather.supervision.business.autooutput.score.AopCreditCode
import cn.flightfeather.supervision.common.utils.Constant
+import cn.flightfeather.supervision.domain.ds1.repository.SubTaskRep
import cn.flightfeather.supervision.lightshare.service.SearchService
import cn.flightfeather.supervision.lightshare.vo.ExcelConfigVo
import org.junit.Test
@@ -48,18 +49,21 @@
@Autowired
lateinit var jsWhDataAnalysis: JSWhDataAnalysis
+ @Autowired
+ lateinit var subTaskRep: SubTaskRep
+
/**
* 闈欏畨宸ュ湴鑷瘎
*/
@Test
fun test1() {
- val taskId = "tTbZIUg7nQJ1MRgE"
+ val taskId = "P7hsgDedyN9XLrbt"
val districtCode = "310106"
- val year = 2023
- val month = 12
+ val year = 2024
+ val month = 6
val sceneType = Constant.SceneType.TYPE1.value.toInt()
jaCsDataAnalysis.setResource(taskId, sceneType, year, month)
- jaCsDataAnalysis.execute(0.124)
+ jaCsDataAnalysis.execute()
aopEvaluation.executeByTopTask(taskId, sceneType)
@@ -78,19 +82,19 @@
val taskId = "88wgq9l5gm9cUMg1"
val districtCode = "310104"
val districtName = "寰愭眹鍖�"
- val year = 2023
- val month = 11
+ val year = 2024
+ val month = 5
val sceneType = Constant.SceneType.TYPE5.value.toInt()
- xhFuDataAnalysis.setResource(taskId, sceneType, year, month)
- xhFuDataAnalysis.execute()
-
- aopEvaluation.executeByTopTask(taskId, sceneType)
-
- val mode = 9
- searchService.writeToFile(ExcelConfigVo(
- taskId,
- districtCode = districtCode,
- sceneType = sceneType), mode)
+// xhFuDataAnalysis.setResource(taskId, sceneType, year, month)
+// xhFuDataAnalysis.execute()
+//
+// aopEvaluation.executeByTopTask(taskId, sceneType)
+//
+// val mode = 9
+// searchService.writeToFile(ExcelConfigVo(
+// taskId,
+// districtCode = districtCode,
+// sceneType = sceneType), mode)
aopCreditCode.execute(AopDataConfig(
year = year,
month = month,
@@ -137,4 +141,10 @@
districtCode = districtCode,
sceneType = sceneType), mode)
}
+
+ @Test
+ fun aopSubtask() {
+ val s = subTaskRep.findOne("B6kyaAjJRoGJ2Yur")
+ aopEvaluation.executeBySubTask(s!!)
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3