diff --git a/das/src/main/java/com/das/modules/fdr/service/FaultRecorderService.java b/das/src/main/java/com/das/modules/fdr/service/FaultRecorderService.java index bdc89a28..00167c3e 100644 --- a/das/src/main/java/com/das/modules/fdr/service/FaultRecorderService.java +++ b/das/src/main/java/com/das/modules/fdr/service/FaultRecorderService.java @@ -19,7 +19,7 @@ public interface FaultRecorderService { void download(String path, HttpServletResponse httpServletResponse) throws IOException; - Map> getDataCurve(String url, String deviceCode) throws IOException; + Map> getDataCurve(String url, String deviceCode); void updateFdrConfig(SysEquipment sysEquipment); diff --git a/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java b/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java index 024b257d..6f17e958 100644 --- a/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java +++ b/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java @@ -168,30 +168,31 @@ public class FaultRecorderServiceImpl implements FaultRecorderService { } @Override - public Map> getDataCurve(String url, String deviceCode) throws IOException { + public Map> getDataCurve(String url, String deviceCode) { Map> resultMap = null; - try (InputStream fileStream = minioViewsServcie.getFileStream(url)) { - //根据device Code查询故障录波格式 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("CODE", deviceCode); - SysEquipment sysEquipment = sysEquipmentMapper.selectOne(queryWrapper); - if (sysEquipment == null) { - throw new ServiceException("设备不存在,请选择正确设备"); - } + //根据device Code查询故障录波格式 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("CODE", deviceCode); + SysEquipment sysEquipment = sysEquipmentMapper.selectOne(queryWrapper); + if (sysEquipment == null) { + throw new ServiceException("设备不存在,请选择正确设备"); + } - if (StringUtils.isBlank(sysEquipment.getOptions())){ - throw new ServiceException("请添加设备文件解析配置"); - } - FileParseConfig fileParseConfig = JSON.parseObject(sysEquipment.getOptions(), FileParseConfig.class); - FdrFormatVo fdrFormatVo = fileParseConfig.getFdrFormat(); - if (fdrFormatVo == null){ - throw new ServiceException("请添加故障录波配置"); - } + if (StringUtils.isBlank(sysEquipment.getOptions())){ + throw new ServiceException("请添加设备文件解析配置"); + } + FileParseConfig fileParseConfig = JSON.parseObject(sysEquipment.getOptions(), FileParseConfig.class); + FdrFormatVo fdrFormatVo = fileParseConfig.getFdrFormat(); + if (fdrFormatVo == null){ + throw new ServiceException("请添加故障录波配置"); + } + try (InputStream fileStream = minioViewsServcie.getFileStream(url)) { // 解析文件内容 resultMap = parseFile(fileStream, fdrFormatVo.getTimeFormat(), fdrFormatVo.getDelimiter(), fdrFormatVo.getValidStartLine()); } catch (Exception e) { e.printStackTrace(); + throw new ServiceException("配置解析异常"); } return resultMap; } diff --git a/das/src/main/java/com/das/modules/plc/service/PlcLogService.java b/das/src/main/java/com/das/modules/plc/service/PlcLogService.java index 9d8485f8..6ff0344e 100644 --- a/das/src/main/java/com/das/modules/plc/service/PlcLogService.java +++ b/das/src/main/java/com/das/modules/plc/service/PlcLogService.java @@ -14,7 +14,7 @@ public interface PlcLogService { List getDirOrFileList(String fileType, String name, String startTime, String endTime); - Map> getDataCurve(String url, String deviceCode) throws IOException; + Map> getDataCurve(String url, String deviceCode); void updatePlcConfig(SysEquipment sysEquipment); diff --git a/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java b/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java index 728e8e40..958880d9 100644 --- a/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java +++ b/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java @@ -63,30 +63,31 @@ public class PlcLogsServiceImpl implements PlcLogService { } @Override - public Map> getDataCurve(String url, String deviceCode) throws IOException { + public Map> getDataCurve(String url, String deviceCode){ Map> resultMap = null; - try (InputStream fileStream = minioViewsServcie.getFileStream(url)) { - //根据device Code查询故障录波格式 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("CODE", deviceCode); - SysEquipment sysEquipment = sysEquipmentMapper.selectOne(queryWrapper); - if (sysEquipment == null) { - throw new ServiceException("设备不存在,请选择正确设备"); - } + //根据device Code查询故障录波格式 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("CODE", deviceCode); + SysEquipment sysEquipment = sysEquipmentMapper.selectOne(queryWrapper); + if (sysEquipment == null) { + throw new ServiceException("设备不存在,请选择正确设备"); + } - if (StringUtils.isBlank(sysEquipment.getOptions())){ - throw new ServiceException("请添加设备文件解析配置"); - } - FileParseConfig fileParseConfig = JSON.parseObject(sysEquipment.getOptions(), FileParseConfig.class); - FdrFormatVo fdrFormatVo = fileParseConfig.getPlcFormat(); - if (fdrFormatVo == null){ - throw new ServiceException("请添加plclog配置"); - } + if (StringUtils.isBlank(sysEquipment.getOptions())){ + throw new ServiceException("请添加设备文件解析配置"); + } + FileParseConfig fileParseConfig = JSON.parseObject(sysEquipment.getOptions(), FileParseConfig.class); + FdrFormatVo fdrFormatVo = fileParseConfig.getPlcFormat(); + if (fdrFormatVo == null){ + throw new ServiceException("请添加plclog配置"); + } + try (InputStream fileStream = minioViewsServcie.getFileStream(url)) { // 解析文件内容 resultMap = parseFile(fileStream, fdrFormatVo.getTimeFormat(), fdrFormatVo.getDelimiter(), fdrFormatVo.getValidStartLine()); } catch (Exception e) { e.printStackTrace(); + throw new ServiceException("配置解析异常"); } return resultMap; }