From 46872a311da9480d3edb19223aca2e0833fb1e31 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期二, 17 十二月 2024 11:41:00 +0800
Subject: [PATCH] 1. 完成数据产品中间结果基本信息和具体信息入库 2. 修改ColInspectionInfo.kt 监管时间格式修改为yyyy-mm-dd 3. 新增数据产品类型枚举类 DataProductType 4. 修改BaseTemplate实现类通过重写genData方法生成Template相关数据 5. TODO 其他未涉及到的产品对象的中间结果对象
---
src/main/kotlin/cn/flightfeather/supervision/business/bgtask/AopTaskCtrl.kt | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/bgtask/AopTaskCtrl.kt b/src/main/kotlin/cn/flightfeather/supervision/business/bgtask/AopTaskCtrl.kt
index 5592fae..4de46d6 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/bgtask/AopTaskCtrl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/bgtask/AopTaskCtrl.kt
@@ -12,6 +12,7 @@
import cn.flightfeather.supervision.domain.ds1.repository.TaskRep
import cn.flightfeather.supervision.lightshare.vo.AreaVo
import org.springframework.stereotype.Component
+import java.time.LocalDateTime
/**
* 鑷姩璇勪及浠诲姟绠＄悊
@@ -39,6 +40,29 @@
dataAnalysisMap["310116"]?.put(Constant.SceneType.TYPE3.value.toInt(), jsMpDataAnalysis)
}
+ fun startAllEvaluation(time: LocalDateTime) {
+ startEvaluation(getArea(time, "310106", "闈欏畨鍖�", Constant.SceneType.TYPE1))
+ startEvaluation(getArea(time, "310104", "寰愭眹鍖�", Constant.SceneType.TYPE5))
+ startEvaluation(getArea(time, "310116", "閲戝北鍖�", Constant.SceneType.TYPE1))
+ startEvaluation(getArea(time, "310116", "閲戝北鍖�", Constant.SceneType.TYPE2))
+ startEvaluation(getArea(time, "310116", "閲戝北鍖�", Constant.SceneType.TYPE3))
+ }
+
+ fun startEvaluation(areaVo: AreaVo) {
+ val task = taskRep.findOneTask(areaVo)
+ val taskId = task?.tguid
+ val sceneType = areaVo.scensetypeid?.toInt() ?: throw BizException("鍦烘櫙绫诲瀷鏈缃紝鏃犳硶璇勪及")
+ aopEvaluation.executeByTopTask(taskId, sceneType)
+ }
+
+ fun startAll(time: LocalDateTime) {
+ startNewTask(getArea(time, "310106", "闈欏畨鍖�", Constant.SceneType.TYPE1))
+ startNewTask(getArea(time, "310104", "寰愭眹鍖�", Constant.SceneType.TYPE5))
+ startNewTask(getArea(time, "310116", "閲戝北鍖�", Constant.SceneType.TYPE1))
+ startNewTask(getArea(time, "310116", "閲戝北鍖�", Constant.SceneType.TYPE2))
+ startNewTask(getArea(time, "310116", "閲戝北鍖�", Constant.SceneType.TYPE3))
+ }
+
fun startNewTask(areaVo: AreaVo): BgTaskStatus {
val task = taskRep.findOneTask(areaVo)
val taskId = task?.tguid
@@ -54,10 +78,11 @@
val id = "${BgTaskType.AUTO_SCORE.name}-${districtCode}-${sceneType}"
val name = "${districtName}${Constant.SceneType.getDes(sceneType)}鑷姩璇勫垎"
val bgTask = backgroundTaskCtrl.startNewTask(BgTaskType.AUTO_SCORE, id, name) {
+ // 鐩戞祴鏁版嵁鍒嗘瀽鍏ュ簱
dataAnalysis(districtCode, sceneType, taskId, year, month)
-
+ // 鑷姩璇勪及璁＄畻鍏ュ簱
aopEvaluation.executeByTopTask(taskId, sceneType)
-
+ // 鐜俊鐮佺粨鏋滆浆鎹㈠叆搴�
aopCreditCode.execute(AopDataConfig(
year = year,
month = month,
@@ -78,4 +103,17 @@
aopDataAnalysis?.setResource(taskId, sceneType, year, month)
aopDataAnalysis?.execute()
}
+
+ fun getArea(time: LocalDateTime, dCode: String, dName: String, sceneType: Constant.SceneType): AreaVo {
+ return AreaVo().apply {
+ provincecode = "31"
+ provincename = "涓婃捣甯�"
+ citycode = "3100"
+ cityname = "涓婃捣甯�"
+ starttime = time
+ districtcode = dCode
+ districtname = dName
+ scensetypeid = sceneType.value
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3