|
@@ -3,14 +3,18 @@ package com.rongwei.bscommon.system.service.impl;
|
|
import com.alibaba.excel.EasyExcel;
|
|
import com.alibaba.excel.EasyExcel;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.google.common.collect.Lists;
|
|
import com.google.common.collect.Lists;
|
|
|
|
+import com.rongwei.bscommon.system.excelImportListener.EmergencyDrilPlanListenner;
|
|
import com.rongwei.bscommon.system.excelImportListener.UnitPointsRegistrationListener;
|
|
import com.rongwei.bscommon.system.excelImportListener.UnitPointsRegistrationListener;
|
|
import com.rongwei.bscommon.system.excelImportListener.UserPointsRegistrationListener;
|
|
import com.rongwei.bscommon.system.excelImportListener.UserPointsRegistrationListener;
|
|
import com.rongwei.bscommon.system.service.ExcelImportService;
|
|
import com.rongwei.bscommon.system.service.ExcelImportService;
|
|
|
|
+import com.rongwei.bscommon.system.service.QhseEmergencyDrilPlanService;
|
|
import com.rongwei.bscommon.system.service.QhsePointsUnitDetailsService;
|
|
import com.rongwei.bscommon.system.service.QhsePointsUnitDetailsService;
|
|
import com.rongwei.bscommon.system.utils.QHSEUtils;
|
|
import com.rongwei.bscommon.system.utils.QHSEUtils;
|
|
import com.rongwei.bsentity.domain.QhseContractWorkersDo;
|
|
import com.rongwei.bsentity.domain.QhseContractWorkersDo;
|
|
|
|
+import com.rongwei.bsentity.domain.QhseEmergencyDrilPlanDo;
|
|
import com.rongwei.bsentity.domain.QhsePointsDetailsUserDo;
|
|
import com.rongwei.bsentity.domain.QhsePointsDetailsUserDo;
|
|
import com.rongwei.bsentity.domain.QhsePointsRecordUserDo;
|
|
import com.rongwei.bsentity.domain.QhsePointsRecordUserDo;
|
|
|
|
+import com.rongwei.bsentity.dto.EmergencyDrilPlanListennerImportDto;
|
|
import com.rongwei.bsentity.dto.UnitPointsRegistrationImportDto;
|
|
import com.rongwei.bsentity.dto.UnitPointsRegistrationImportDto;
|
|
import com.rongwei.bsentity.dto.UserPointsRegistrationImportDto;
|
|
import com.rongwei.bsentity.dto.UserPointsRegistrationImportDto;
|
|
import com.rongwei.bsentity.vo.QhsePointsUnitDetailsVo;
|
|
import com.rongwei.bsentity.vo.QhsePointsUnitDetailsVo;
|
|
@@ -19,14 +23,11 @@ import com.rongwei.rwcommon.base.BaseDo;
|
|
import com.rongwei.rwcommon.base.R;
|
|
import com.rongwei.rwcommon.base.R;
|
|
import com.rongwei.rwcommon.utils.SecurityUtil;
|
|
import com.rongwei.rwcommon.utils.SecurityUtil;
|
|
import com.rongwei.rwcommon.utils.StringUtils;
|
|
import com.rongwei.rwcommon.utils.StringUtils;
|
|
-import com.rongwei.rwcommonentity.commonservers.domain.SysFileItemDo;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
-import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import java.io.File;
|
|
import java.io.File;
|
|
-import java.io.FileOutputStream;
|
|
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
import java.io.InputStream;
|
|
import java.io.InputStream;
|
|
import java.nio.file.Files;
|
|
import java.nio.file.Files;
|
|
@@ -60,6 +61,9 @@ public class ExcelImportServiceImpl implements ExcelImportService {
|
|
@Autowired
|
|
@Autowired
|
|
private QhsePointsUnitDetailsService qhsePointsUnitDetailsService;
|
|
private QhsePointsUnitDetailsService qhsePointsUnitDetailsService;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private QhseEmergencyDrilPlanService qhseEmergencyDrilPlanService;
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public R userPointsRegistration(MultipartFile file) {
|
|
public R userPointsRegistration(MultipartFile file) {
|
|
Path tempPath;
|
|
Path tempPath;
|
|
@@ -177,18 +181,36 @@ public class ExcelImportServiceImpl implements ExcelImportService {
|
|
public R unitPointsRegistration(MultipartFile file) {
|
|
public R unitPointsRegistration(MultipartFile file) {
|
|
UnitPointsRegistrationListener listener = new UnitPointsRegistrationListener();
|
|
UnitPointsRegistrationListener listener = new UnitPointsRegistrationListener();
|
|
|
|
|
|
- try {
|
|
|
|
- EasyExcel.read(file.getInputStream())
|
|
|
|
|
|
+ try (InputStream is = file.getInputStream()) {
|
|
|
|
+ EasyExcel.read(is)
|
|
.head(UnitPointsRegistrationImportDto.class)
|
|
.head(UnitPointsRegistrationImportDto.class)
|
|
.registerReadListener(listener)
|
|
.registerReadListener(listener)
|
|
.sheet()
|
|
.sheet()
|
|
.doRead();
|
|
.doRead();
|
|
- }catch (Exception e){
|
|
|
|
- throw new RuntimeException("读取单位积分文件失败");
|
|
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ throw new RuntimeException("读取应急演练计划文件失败: " + e.getMessage());
|
|
}
|
|
}
|
|
-
|
|
|
|
// 3. 读取完成后获取数据(此时数据已完整)
|
|
// 3. 读取完成后获取数据(此时数据已完整)
|
|
List<QhsePointsUnitDetailsVo> parsedData = listener.getData();
|
|
List<QhsePointsUnitDetailsVo> parsedData = listener.getData();
|
|
return qhsePointsUnitDetailsService.ProcessImportedData(parsedData);
|
|
return qhsePointsUnitDetailsService.ProcessImportedData(parsedData);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ public R emergencyDrilPlanImport(MultipartFile file) {
|
|
|
|
+ EmergencyDrilPlanListenner listener = new EmergencyDrilPlanListenner();
|
|
|
|
+
|
|
|
|
+ try (InputStream is = file.getInputStream()) {
|
|
|
|
+ EasyExcel.read(is)
|
|
|
|
+ .head(EmergencyDrilPlanListennerImportDto.class)
|
|
|
|
+ .registerReadListener(listener)
|
|
|
|
+ .sheet()
|
|
|
|
+ .doRead();
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ throw new RuntimeException("读取应急演练计划文件失败: " + e.getMessage());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // 3. 读取完成后获取数据(此时数据已完整)
|
|
|
|
+ List<QhseEmergencyDrilPlanDo> data = listener.getData();
|
|
|
|
+ return qhseEmergencyDrilPlanService.ProcessImportedData(data);
|
|
|
|
+
|
|
|
|
+ }
|
|
}
|
|
}
|