From 802bbc9b1a26334607b04ab562e62594e383d2c2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 31 七月 2021 17:58:31 +0800
Subject: [PATCH] 修改bug以及获取天气接口
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
index 769a511..e035edb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
@@ -10,6 +10,7 @@
import com.alibaba.fastjson.JSONArray;
import com.google.common.collect.Lists;
import com.panzhihua.common.constants.BcDictionaryConstants;
+import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.enums.*;
import com.panzhihua.common.excel.CustomSheetWriteHandler;
import com.panzhihua.common.exceptions.ServiceException;
@@ -21,14 +22,20 @@
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.*;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
+import javax.annotation.Resource;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -54,9 +61,11 @@
private int port;
private String excelUrl;
+ private StringRedisTemplate stringRedisTemplate;
+
public static String loadUrl;
- public ComMngPopulationServeExcelListen(CommunityService communityService, Long communityId, String userName, String password, String host, int port, String excelUrl) {
+ public ComMngPopulationServeExcelListen(CommunityService communityService, Long communityId, String userName, String password, String host, int port, String excelUrl,StringRedisTemplate stringRedisTemplate) {
this.communityService = communityService;
this.communityId = communityId;
this.userName = userName;
@@ -64,6 +73,7 @@
this.host = host;
this.port = port;
this.excelUrl = excelUrl;
+ this.stringRedisTemplate = stringRedisTemplate;
}
/**
@@ -104,6 +114,8 @@
*/
private void saveData() {
R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String key = Constants.POPULATION_ERROR_LIST + communityId;
Map<String,String> dictMap = dictionaryR.getData().stream().collect(Collectors.toMap(BcDictionaryVO::getDictName,BcDictionaryVO::getDictValue));
// Map<String,Integer> dictMap = new HashMap<>();
@@ -564,10 +576,12 @@
// populationImportErrorVOList.addAll(errorList);
// }
mistakes.addAll(list);
- throw new ServiceException("500", JSON.toJSONString(mistakes));
+ valueOperations.set(key,JSONArray.toJSONString(mistakes),1, TimeUnit.HOURS);
+ throw new ServiceException("500", key);
}else{
if(!mistakes.isEmpty()){
- throw new ServiceException("500", JSON.toJSONString(mistakes));
+ valueOperations.set(key,JSONArray.toJSONString(mistakes),1, TimeUnit.HOURS);
+ throw new ServiceException("500", key);
}
}
} catch (NumberFormatException e) {
--
Gitblit v1.7.1