From 1a45c6fe9ea814e432cf90c0169be9b7d991a266 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期二, 10 十二月 2024 13:51:00 +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 | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 104 insertions(+), 12 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 c5b741d..6b2f2b0 100644
--- a/src/test/kotlin/cn/flightfeather/supervision/business/autooutput/AopEvaluationTest.kt
+++ b/src/test/kotlin/cn/flightfeather/supervision/business/autooutput/AopEvaluationTest.kt
@@ -1,7 +1,15 @@
package cn.flightfeather.supervision.business.autooutput
import cn.flightfeather.supervision.business.autooutput.score.AopEvaluation
-import cn.flightfeather.supervision.business.autooutput.score.construction.JADataAnalysis
+import cn.flightfeather.supervision.business.autooutput.dataanalysis.JACsDataAnalysis
+import cn.flightfeather.supervision.business.autooutput.dataanalysis.JSCsDataAnalysis
+import cn.flightfeather.supervision.business.autooutput.dataanalysis.JSMpDataAnalysis
+import cn.flightfeather.supervision.business.autooutput.dataanalysis.XHFuDataAnalysis
+import cn.flightfeather.supervision.business.autooutput.dataanalysis.JSWhDataAnalysis
+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
@@ -21,38 +29,122 @@
lateinit var aopEvaluation: AopEvaluation
@Autowired
+ lateinit var aopCreditCode: AopCreditCode
+
+ @Autowired
lateinit var searchService: SearchService
@Autowired
- lateinit var jaDataAnalysis: JADataAnalysis
+ lateinit var jaCsDataAnalysis: JACsDataAnalysis
+
+ @Autowired
+ lateinit var xhFuDataAnalysis: XHFuDataAnalysis
+
+ @Autowired
+ lateinit var jsCsDataAnalysis: JSCsDataAnalysis
+
+ @Autowired
+ lateinit var jsMpDataAnalysis: JSMpDataAnalysis
+
+ @Autowired
+ lateinit var jsWhDataAnalysis: JSWhDataAnalysis
+
+ @Autowired
+ lateinit var subTaskRep: SubTaskRep
/**
- * 缁熻鐩戞祴鏁版嵁缁撴灉
+ * 闈欏畨宸ュ湴鑷瘎
*/
@Test
fun test1() {
- jaDataAnalysis.setResource("VHXHS1dHsykTNUf2", 1, 2023, 8)
- jaDataAnalysis.execute()
+ val taskId = "P7hsgDedyN9XLrbt"
+ val districtCode = "310106"
+ val year = 2024
+ val month = 6
+ val sceneType = Constant.SceneType.TYPE1.value.toInt()
+ jaCsDataAnalysis.setResource(taskId, sceneType, year, month)
+ jaCsDataAnalysis.execute()
+
+ aopEvaluation.executeByTopTask(taskId, sceneType)
+
+ val mode = 9
+ searchService.writeToFile(ExcelConfigVo(
+ taskId,
+ districtCode = districtCode,
+ sceneType = sceneType), mode)
}
/**
- * 鑷姩璇勪及
+ * 寰愭眹椁愰ギ鑷瘎
*/
@Test
fun test() {
- aopEvaluation.setResource("VHXHS1dHsykTNUf2", 1)
- aopEvaluation.execute()
+ val taskId = "88wgq9l5gm9cUMg1"
+ val districtCode = "310104"
+ val districtName = "寰愭眹鍖�"
+ 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)
+ aopCreditCode.execute(AopDataConfig(
+ year = year,
+ month = month,
+ districtName = districtName,
+ sceneType = sceneType,
+ period = 1
+ ))
}
/**
- * 瀵煎嚭鑷姩璇勪及缁撴灉
+ * 閲戝北宸ュ湴銆佺爜澶淬�佹悈鎷岀珯鑷瘎
*/
@Test
fun test2() {
+ val taskId = "rXtm0AozZYJqoEpW"
+ val districtCode = "310116"
+ val year = 2023
+ val month = 11
+// val sceneType = Constant.SceneType.TYPE1.value.toInt()
+// val sceneType = Constant.SceneType.TYPE2.value.toInt()
+ val sceneType = Constant.SceneType.TYPE3.value.toInt()
+// val sceneType = Constant.SceneType.TYPE14.value.toInt()
+
+ when (sceneType) {
+ Constant.SceneType.TYPE1.value.toInt()->{
+ jsCsDataAnalysis.setResource(taskId, sceneType, year, month)
+ jsCsDataAnalysis.execute()
+ }
+ Constant.SceneType.TYPE2.value.toInt()->{
+ jsWhDataAnalysis.setResource(taskId, sceneType, year, month)
+ jsWhDataAnalysis.execute()
+ }
+ Constant.SceneType.TYPE3.value.toInt()->{
+ jsMpDataAnalysis.setResource(taskId, sceneType, year, month)
+ jsMpDataAnalysis.execute()
+ }
+ }
+
+ aopEvaluation.executeByTopTask(taskId, sceneType)
+
val mode = 9
searchService.writeToFile(ExcelConfigVo(
- "VHXHS1dHsykTNUf2",
- districtCode = "310106",
- sceneType = 1), mode)
+ taskId,
+ 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