|
@@ -32,6 +32,7 @@ import java.time.format.DateTimeFormatter;
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
+import java.util.Objects;
|
|
import java.util.Set;
|
|
import java.util.Set;
|
|
import java.util.UUID;
|
|
import java.util.UUID;
|
|
import java.util.concurrent.CompletableFuture;
|
|
import java.util.concurrent.CompletableFuture;
|
|
@@ -118,7 +119,8 @@ public class HeDCemMobileExperienceListLogTask {
|
|
// 定义CSV文件的表头
|
|
// 定义CSV文件的表头
|
|
List<String> headers = Stream.of("month_id", "day_id", "service_id", "contact_id", "create_time",
|
|
List<String> headers = Stream.of("month_id", "day_id", "service_id", "contact_id", "create_time",
|
|
"mobile_no", "service_type_name1", "pro_name", "code_cust_area", "zyx", "lwly_name", "big_type_name",
|
|
"mobile_no", "service_type_name1", "pro_name", "code_cust_area", "zyx", "lwly_name", "big_type_name",
|
|
- "small_type_name", "acct_month", "day_id1", "sheet_no", "compl_city_local").toList();
|
|
|
|
|
|
+ "small_type_name", "acct_month", "day_id1", "sheet_no", "compl_city_local", "gis_latlon",
|
|
|
|
+ "gis_flow_code", "scene_name", "grid", "grid_name").toList();
|
|
// 获取表头的大小
|
|
// 获取表头的大小
|
|
int headerSize = headers.size();
|
|
int headerSize = headers.size();
|
|
// 定义CSV文件的分隔符
|
|
// 定义CSV文件的分隔符
|
|
@@ -187,8 +189,13 @@ public class HeDCemMobileExperienceListLogTask {
|
|
data.put("countyCode", cityCode);
|
|
data.put("countyCode", cityCode);
|
|
// 将cplAddress放入数据的Map
|
|
// 将cplAddress放入数据的Map
|
|
data.put("cplAddress", rowMap.get("compl_city_local"));
|
|
data.put("cplAddress", rowMap.get("compl_city_local"));
|
|
- // 将cplContent放入数据的Map
|
|
|
|
- data.put("cplContent", rowMap.get("service_type_name1"));
|
|
|
|
|
|
+ // 2025-03-12新增字段:GIS_LATLON、GIS_FLOW_CODE、SCENE_NAME、GRID、GRID_NAME
|
|
|
|
+ data.put("cplContent", rowMap.get("service_type_name1")
|
|
|
|
+ + ";GIS打点经纬度:" + Objects.requireNonNullElse(rowMap.get("gis_latlon"), "")
|
|
|
|
+ + ";场景ID:" + Objects.requireNonNullElse(rowMap.get("gis_flow_code"), "")
|
|
|
|
+ + ";GIS打点信息:" + Objects.requireNonNullElse(rowMap.get("scene_name"), "")
|
|
|
|
+ + ";网格id:" + Objects.requireNonNullElse(rowMap.get("grid"), "")
|
|
|
|
+ + ";网格名称:" + Objects.requireNonNullElse(rowMap.get("grid_name"), ""));
|
|
// 将custTel放入数据的Map
|
|
// 将custTel放入数据的Map
|
|
data.put("custTel", rowMap.get("mobile_no"));
|
|
data.put("custTel", rowMap.get("mobile_no"));
|
|
// 将faultTime放入数据的Map
|
|
// 将faultTime放入数据的Map
|