sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

配置错误返回修改

Browse Source
This commit is contained in:
huguanghan 2024-12-17 10:18:03 +08:00
parent 0a70a9a7d8
commit 7051ec9f39
4 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
das/src/main/java/com/das/modules/fdr/service/FaultRecorderService.java
View File

@ -19,7 +19,7 @@ public interface FaultRecorderService {
void download(String path, HttpServletResponse httpServletResponse) throws IOException; void download(String path, HttpServletResponse httpServletResponse) throws IOException;
Map<String, List<Object>> getDataCurve(String url, String deviceCode) throws IOException; Map<String, List<Object>> getDataCurve(String url, String deviceCode);
void updateFdrConfig(SysEquipment sysEquipment); void updateFdrConfig(SysEquipment sysEquipment);

35
das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java
View File

@ -168,30 +168,31 @@ public class FaultRecorderServiceImpl implements FaultRecorderService {
} }
@Override @Override
public Map<String, List<Object>> getDataCurve(String url, String deviceCode) throws IOException { public Map<String, List<Object>> getDataCurve(String url, String deviceCode) {
Map<String, List<Object>> resultMap = null; Map<String, List<Object>> resultMap = null;
try (InputStream fileStream = minioViewsServcie.getFileStream(url)) { //根据device Code查询故障录波格式
//根据device Code查询故障录波格式 QueryWrapper<SysEquipment> queryWrapper = new QueryWrapper<>();
QueryWrapper<SysEquipment> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("CODE", deviceCode);
queryWrapper.eq("CODE", deviceCode); SysEquipment sysEquipment = sysEquipmentMapper.selectOne(queryWrapper);
SysEquipment sysEquipment = sysEquipmentMapper.selectOne(queryWrapper); if (sysEquipment == null) {
if (sysEquipment == null) { throw new ServiceException("设备不存在,请选择正确设备");
throw new ServiceException("设备不存在,请选择正确设备"); }
}
if (StringUtils.isBlank(sysEquipment.getOptions())){ if (StringUtils.isBlank(sysEquipment.getOptions())){
throw new ServiceException("请添加设备文件解析配置"); throw new ServiceException("请添加设备文件解析配置");
} }
FileParseConfig fileParseConfig = JSON.parseObject(sysEquipment.getOptions(), FileParseConfig.class); FileParseConfig fileParseConfig = JSON.parseObject(sysEquipment.getOptions(), FileParseConfig.class);
FdrFormatVo fdrFormatVo = fileParseConfig.getFdrFormat(); FdrFormatVo fdrFormatVo = fileParseConfig.getFdrFormat();
if (fdrFormatVo == null){ if (fdrFormatVo == null){
throw new ServiceException("请添加故障录波配置"); throw new ServiceException("请添加故障录波配置");
} }
try (InputStream fileStream = minioViewsServcie.getFileStream(url)) {
// 解析文件内容 // 解析文件内容
resultMap = parseFile(fileStream, fdrFormatVo.getTimeFormat(), fdrFormatVo.getDelimiter(), fdrFormatVo.getValidStartLine()); resultMap = parseFile(fileStream, fdrFormatVo.getTimeFormat(), fdrFormatVo.getDelimiter(), fdrFormatVo.getValidStartLine());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
throw new ServiceException("配置解析异常");
} }
return resultMap; return resultMap;
} }

2
das/src/main/java/com/das/modules/plc/service/PlcLogService.java
View File

@ -14,7 +14,7 @@ public interface PlcLogService {
List<FileNode> getDirOrFileList(String fileType, String name, String startTime, String endTime); List<FileNode> getDirOrFileList(String fileType, String name, String startTime, String endTime);
Map<String, List<Object>> getDataCurve(String url, String deviceCode) throws IOException; Map<String, List<Object>> getDataCurve(String url, String deviceCode);
void updatePlcConfig(SysEquipment sysEquipment); void updatePlcConfig(SysEquipment sysEquipment);

35
das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java
View File

@ -63,30 +63,31 @@ public class PlcLogsServiceImpl implements PlcLogService {
} }
@Override @Override
public Map<String, List<Object>> getDataCurve(String url, String deviceCode) throws IOException { public Map<String, List<Object>> getDataCurve(String url, String deviceCode){
Map<String, List<Object>> resultMap = null; Map<String, List<Object>> resultMap = null;
try (InputStream fileStream = minioViewsServcie.getFileStream(url)) { //根据device Code查询故障录波格式
//根据device Code查询故障录波格式 QueryWrapper<SysEquipment> queryWrapper = new QueryWrapper<>();
QueryWrapper<SysEquipment> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("CODE", deviceCode);
queryWrapper.eq("CODE", deviceCode); SysEquipment sysEquipment = sysEquipmentMapper.selectOne(queryWrapper);
SysEquipment sysEquipment = sysEquipmentMapper.selectOne(queryWrapper); if (sysEquipment == null) {
if (sysEquipment == null) { throw new ServiceException("设备不存在,请选择正确设备");
throw new ServiceException("设备不存在,请选择正确设备"); }
}
if (StringUtils.isBlank(sysEquipment.getOptions())){ if (StringUtils.isBlank(sysEquipment.getOptions())){
throw new ServiceException("请添加设备文件解析配置"); throw new ServiceException("请添加设备文件解析配置");
} }
FileParseConfig fileParseConfig = JSON.parseObject(sysEquipment.getOptions(), FileParseConfig.class); FileParseConfig fileParseConfig = JSON.parseObject(sysEquipment.getOptions(), FileParseConfig.class);
FdrFormatVo fdrFormatVo = fileParseConfig.getPlcFormat(); FdrFormatVo fdrFormatVo = fileParseConfig.getPlcFormat();
if (fdrFormatVo == null){ if (fdrFormatVo == null){
throw new ServiceException("请添加plclog配置"); throw new ServiceException("请添加plclog配置");
} }
try (InputStream fileStream = minioViewsServcie.getFileStream(url)) {
// 解析文件内容 // 解析文件内容
resultMap = parseFile(fileStream, fdrFormatVo.getTimeFormat(), fdrFormatVo.getDelimiter(), fdrFormatVo.getValidStartLine()); resultMap = parseFile(fileStream, fdrFormatVo.getTimeFormat(), fdrFormatVo.getDelimiter(), fdrFormatVo.getValidStartLine());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
throw new ServiceException("配置解析异常");
} }
return resultMap; return resultMap;
} }