From 909fd8929d7906f1dca68acc05e36e29b0b9192c Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 15 十一月 2022 10:57:30 +0800
Subject: [PATCH] 2022.11.15
---
src/main/kotlin/cn/flightfeather/supervision/datafetch/FetchNightConstruction.kt | 69 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/datafetch/FetchNightConstruction.kt b/src/main/kotlin/cn/flightfeather/supervision/datafetch/FetchNightConstruction.kt
index 76442a5..3940056 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/datafetch/FetchNightConstruction.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/datafetch/FetchNightConstruction.kt
@@ -57,47 +57,48 @@
DEFAULT_TIME
}
- NCHttpService.getFile(timeStr)?.forEach {e ->
- if (e.isJsonObject) {
- val vo = e.asJsonObject
- val nightConstruction = NightConstruction().apply {
- ncNum = vo["nightallnum"].asString
- ncItemName = vo["itemName"].asString
- ncItemUnit = vo["itemUnit"].asString
- ncConstructionUnit = vo["constructionUnit"].asString
- ncPerson = vo["person"].asString
- ncApplyContent = vo["applyContent"].asString
- ncStartDate = dateUtil.StringToDate(vo["startDate"].asString)
- ncEndDate = dateUtil.StringToDate(vo["endDate"].asString)
- ncFileName = vo["filename"].asString
- ncCreateTime = dateUtil.StringToDate(vo["createtime"].asString)
- ncUrl = vo["url"].asString
- ncProvinceCode = PROVINCE_CODE
- ncProvinceName = PROVINCE_NAME
- ncCityCode = CITY_CODE
- ncCityName = CITY_NAME
- ncDistrictCode = DISTRICT_CODE
- ncDistrictName = DISTRICT_NAME
- }
- nightConstructionMapper.selectByExample(Example(NightConstruction::class.java).apply {
- createCriteria().andEqualTo("ncNum", nightConstruction.ncNum)
- }).run {
- nightConstructionMapper.selectByExample(Example(NightConstruction::class.java).apply {
- createCriteria().andEqualTo("ncItemName", nightConstruction.ncItemName)
- }).takeIf { l-> l.isNotEmpty() }?.get(0)?.let { r->
- nightConstruction.ncUserId = r.ncUserId
- nightConstruction.ncSceneId = r.ncSceneId
+ try {
+ NCHttpService.getFile(timeStr)?.forEach {e ->
+ if (e.isJsonObject) {
+ val vo = e.asJsonObject
+ val nightConstruction = NightConstruction().apply {
+ ncNum = vo["nightallnum"].asString
+ ncItemName = vo["itemName"].asString
+ ncItemUnit = vo["itemUnit"].asString
+ ncConstructionUnit = vo["constructionUnit"].asString
+ ncPerson = vo["person"].asString
+ ncApplyContent = vo["applyContent"].asString
+ ncStartDate = dateUtil.StringToDate(vo["startDate"].asString)
+ ncEndDate = dateUtil.StringToDate(vo["endDate"].asString)
+ ncFileName = vo["filename"].asString
+ ncCreateTime = dateUtil.StringToDate(vo["createtime"].asString)
+ ncUrl = vo["url"].asString
+
+ ncProvinceCode = PROVINCE_CODE
+ ncProvinceName = PROVINCE_NAME
+ ncCityCode = CITY_CODE
+ ncCityName = CITY_NAME
+ ncDistrictCode = DISTRICT_CODE
+ ncDistrictName = DISTRICT_NAME
}
- if (isEmpty()) {
- try {
+ nightConstructionMapper.selectByExample(Example(NightConstruction::class.java).apply {
+ createCriteria().andEqualTo("ncNum", nightConstruction.ncNum)
+ }).run {
+ nightConstructionMapper.selectByExample(Example(NightConstruction::class.java).apply {
+ createCriteria().andEqualTo("ncItemName", nightConstruction.ncItemName)
+ }).takeIf { l-> l.isNotEmpty() }?.get(0)?.let { r->
+ nightConstruction.ncUserId = r.ncUserId
+ nightConstruction.ncSceneId = r.ncSceneId
+ }
+ if (isEmpty()) {
nightConstructionMapper.insert(nightConstruction)
- } catch (e: Exception) {
- e.printStackTrace()
}
}
}
}
+ } catch (e: Exception) {
+ e.printStackTrace()
}
}
}
--
Gitblit v1.9.3