BY-Team
/
plat2-eladmin
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

韦忠喜提交

Browse Source
master
weizhongxi 3 years ago
parent 7bd0ddf216
commit 36c7484b8d
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File

4
eladmin-system/src/main/java/me/zhengjie/modules/upload/consts/SysConst.java
Unescape Escape View File

@ -16,7 +16,7 @@ public class SysConst {
// Test相关的 - end
public static final String REMOTE_TRANS_HOST = "116.62.197.152"; // 118.178.137.129 116.62.197.152
public static final String REMOTE_TRANS_HOST = "127.0.0.1"; // 118.178.137.129 116.62.197.152
public static final Integer REMOTE_TRANS_PORT = 22;
@ -30,7 +30,7 @@ public class SysConst {
public static final String REMOTE_TRANS_DIR_PATH = "/home/";
// fixme 以后改成rpc调用的地址
public static final String REMOTE_UPDATE_ADDR = "http://116.62.197.152:8000/api/remoteRecord/remote/rec";
public static final String REMOTE_UPDATE_ADDR = "http://127.0.0.1:8001/api/remoteRecord/remote/rec";
// 测试内容临时定义
public static final String TEST_USER_NAME = "测试用户";

23
eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/task/SaveToFileNewTask.java
Unescape Escape View File

@ -145,22 +145,33 @@ public class SaveToFileNewTask {
*/
private boolean handleEachFileContent(String filePath, TbUploadFileNewDto tbUploadFileNewDto) {
//根据文件类型进行解析
List<String> list = null;
List<String> listT = null;
try {
if("excel文件".equals(tbUploadFileNewDto.getFileFormat())){
ExcelUtils excelUtils = new ExcelUtils();
list = excelUtils.excelParseListByUrl(filePath);
listT = excelUtils.excelParseListByUrl(filePath);
}else if ("txt文件".equals(tbUploadFileNewDto.getFileFormat())){
list = TxtUtils.txtParseListVyUrl(filePath);
listT = TxtUtils.txtParseListVyUrl(filePath);
}else if ("csv文件".equals(tbUploadFileNewDto.getFileFormat())){
list = TxtUtils.csvParseListByUrl(filePath);
listT = TxtUtils.csvParseListByUrl(filePath);
}
}catch (Exception e){
log.error("SaveToFileTask|batchSendToEncrypt ready send json is : {}", "");
log.error("SaveToFileTaskNew|batchSendToEncrypt ready send json is : {}", "");
throw new BadRequestException("解析文件异常");
}
Map<Integer, List<String>> preEncryptNumMap = listT.stream()
.collect(Collectors.groupingBy(String::length));
if (CollectionUtil.isNotEmpty(preEncryptNumMap)) {
// 分批调用接口进行加密
List<String> list = preEncryptNumMap.get(PRE_SEND_NUM_LENGTH);
if (CollectionUtil.isNotEmpty(list)){
batchSendToEncrypt(filePath, list);
}
}
// modify by q 把剩下不需要加密的内容也写到文件中
List<String> list = preEncryptNumMap.get(SEND_NUM_LENGTH);
if (CollectionUtil.isNotEmpty(list)){
batchSendToEncrypt(filePath, list);
writeToFile(list, filePath + TEMP_FILE_END_STR);
}
// 加入一个全局控制开关

Write Preview
Loading…
Cancel
Save