|
@@ -313,23 +313,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
User user = userMapper.selectById(request.getHeader("TOKEN"));
|
|
User user = userMapper.selectById(request.getHeader("TOKEN"));
|
|
Integer companyId = user.getCompanyId();
|
|
Integer companyId = user.getCompanyId();
|
|
- //然后处理文件
|
|
|
|
- String fileName = multipartFile.getOriginalFilename();
|
|
|
|
- File file = new File(fileName == null ? "file" : fileName);
|
|
|
|
- InputStream inputStream = null;
|
|
|
|
- OutputStream outputStream = null;
|
|
|
|
- try {
|
|
|
|
- inputStream = multipartFile.getInputStream();
|
|
|
|
- outputStream = new FileOutputStream(file);
|
|
|
|
- byte[] buffer = new byte[4096];
|
|
|
|
- int temp = 0;
|
|
|
|
- while ((temp = inputStream.read(buffer, 0, 4096)) != -1) {
|
|
|
|
- outputStream.write(buffer, 0, temp);
|
|
|
|
- }
|
|
|
|
- inputStream.close();
|
|
|
|
- outputStream.close();
|
|
|
|
|
|
+ try (InputStream inputStream = multipartFile.getInputStream()){
|
|
//然后解析表格
|
|
//然后解析表格
|
|
- Workbook wb = WorkbookFactory.create(new FileInputStream(file));
|
|
|
|
|
|
+ Workbook wb = WorkbookFactory.create(inputStream);
|
|
Sheet sheet = wb.getSheetAt(0);
|
|
Sheet sheet = wb.getSheetAt(0);
|
|
//要插入的账号列表
|
|
//要插入的账号列表
|
|
List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId));
|
|
List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId));
|
|
@@ -457,17 +443,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
//msg.setError("文件格式错误,如果安装了加密软件需要先解密再上传");
|
|
//msg.setError("文件格式错误,如果安装了加密软件需要先解密再上传");
|
|
msg.setError(MessageUtils.message("file.FormatErrorAndDecrypt"));
|
|
msg.setError(MessageUtils.message("file.FormatErrorAndDecrypt"));
|
|
- } finally {
|
|
|
|
- //关闭流
|
|
|
|
- try {
|
|
|
|
- if (outputStream != null && inputStream != null) {
|
|
|
|
- outputStream.close();
|
|
|
|
- inputStream.close();
|
|
|
|
- }
|
|
|
|
- } catch (IOException e) {
|
|
|
|
- e.printStackTrace();
|
|
|
|
- }
|
|
|
|
- System.out.println(file.delete());
|
|
|
|
}
|
|
}
|
|
return msg;
|
|
return msg;
|
|
}
|
|
}
|
|
@@ -1365,22 +1340,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
}
|
|
}
|
|
// BigDecimal monthHours = time.getMonthDays().multiply(new BigDecimal(time.getAllday()));
|
|
// BigDecimal monthHours = time.getMonthDays().multiply(new BigDecimal(time.getAllday()));
|
|
//然后处理文件
|
|
//然后处理文件
|
|
- String fileName = multipartFile.getOriginalFilename();
|
|
|
|
- File file = new File(fileName == null ? "file" : fileName);
|
|
|
|
- InputStream inputStream = null;
|
|
|
|
- OutputStream outputStream = null;
|
|
|
|
- try {
|
|
|
|
- inputStream = multipartFile.getInputStream();
|
|
|
|
- outputStream = new FileOutputStream(file);
|
|
|
|
- byte[] buffer = new byte[4096];
|
|
|
|
- int temp = 0;
|
|
|
|
- while ((temp = inputStream.read(buffer, 0, 4096)) != -1) {
|
|
|
|
- outputStream.write(buffer, 0, temp);
|
|
|
|
- }
|
|
|
|
- inputStream.close();
|
|
|
|
- outputStream.close();
|
|
|
|
|
|
+
|
|
|
|
+ try(InputStream inputStream = multipartFile.getInputStream()) {
|
|
//然后解析表格
|
|
//然后解析表格
|
|
- XSSFWorkbook workbook = new XSSFWorkbook(file);
|
|
|
|
|
|
+ XSSFWorkbook workbook = new XSSFWorkbook(inputStream);
|
|
//我们只需要第一个sheet
|
|
//我们只需要第一个sheet
|
|
XSSFSheet sheet = workbook.getSheetAt(0);
|
|
XSSFSheet sheet = workbook.getSheetAt(0);
|
|
//查重检验的手机号列表
|
|
//查重检验的手机号列表
|
|
@@ -1538,19 +1501,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
//httpRespMsg.setError("发生其他错误");
|
|
//httpRespMsg.setError("发生其他错误");
|
|
httpRespMsg.setError(MessageUtils.message("other.error"));
|
|
httpRespMsg.setError(MessageUtils.message("other.error"));
|
|
return httpRespMsg;
|
|
return httpRespMsg;
|
|
- } finally {
|
|
|
|
- //关闭流
|
|
|
|
- try {
|
|
|
|
- if (outputStream != null && inputStream != null) {
|
|
|
|
- outputStream.close();
|
|
|
|
- inputStream.close();
|
|
|
|
- System.out.println("流已关闭");
|
|
|
|
- }
|
|
|
|
- } catch (IOException e) {
|
|
|
|
- e.printStackTrace();
|
|
|
|
- }
|
|
|
|
-// file.deleteOnExit();//程序退出时删除临时文件
|
|
|
|
- System.out.println(file.delete());
|
|
|
|
}
|
|
}
|
|
return httpRespMsg;
|
|
return httpRespMsg;
|
|
}
|
|
}
|