admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

Browse Source
This commit is contained in:
guoshengxiong 2024-04-30 16:33:23 +08:00
commit 38cd067631
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
View File

@ -173,21 +173,21 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
} }
AiAnalyseHardWareAlarmRecord aiAnalyseHardWareAlarmRecord = new AiAnalyseHardWareAlarmRecord(); AiAnalyseHardWareAlarmRecord aiAnalyseHardWareAlarmRecord = new AiAnalyseHardWareAlarmRecord();
aiAnalyseHardWareAlarmRecord.setCreateTime(body.getString("alarmTime")); aiAnalyseHardWareAlarmRecord.setCreateTime(body.getString("alarmTime"));
aiAnalyseHardWareAlarmRecord.setAlarmType(Integer.parseInt(body.getString("eventId")));
aiAnalyseHardWareAlarmRecord.setHardwareId(aiAnalyseHardWareRecord.getHardwareId()); aiAnalyseHardWareAlarmRecord.setHardwareId(aiAnalyseHardWareRecord.getHardwareId());
aiAnalyseHardWareAlarmRecord.setHardwareName(aiAnalyseHardWareRecord.getHardwareName()); aiAnalyseHardWareAlarmRecord.setHardwareName(aiAnalyseHardWareRecord.getHardwareName());
String alarmVideo = body.getString("alarmVideo"); String alarmVideo = body.getString("alarmVideo");
alarmVideo = alarmVideo.split(":")[2]; if (StringUtils.isNotEmpty(alarmVideo)) {
alarmVideo = alarmVideo.substring(alarmVideo.indexOf("/")); FileInfo alarmVideoInfo = fileStorageService.of(UrlUtil.uploadImgUrlToMultipartFile(alarmVideo)).setPath(DateUtil.today()).upload();
FileInfo alarmVideoInfo = fileStorageService.of(UrlUtil.uploadImgUrlToMultipartFile(serverUrl + alarmVideo)).setPath(DateUtil.today()).upload(); aiAnalyseHardWareAlarmRecord.setAlarmVideo(DateUtil.today() + "/" + alarmVideoInfo.getFilename());
aiAnalyseHardWareAlarmRecord.setAlarmVideo(DateUtil.today() + "/" + alarmVideoInfo.getUrl()); }
aiAnalyseHardWareAlarmRecord.setProjectSn(aiAnalyseHardWareRecord.getProjectSn()); aiAnalyseHardWareAlarmRecord.setProjectSn(aiAnalyseHardWareRecord.getProjectSn());
aiAnalyseHardWareAlarmRecord.setStatus(1); aiAnalyseHardWareAlarmRecord.setStatus(1);
String alarmImage = body.getString("alarmImage"); String alarmImage = body.getString("alarmImage");
alarmImage = alarmImage.split(":")[2]; if (StringUtils.isNotEmpty(alarmImage)) {
alarmImage = alarmImage.substring(alarmImage.indexOf("/")); FileInfo alarmImageInfo = fileStorageService.of(UrlUtil.uploadImgUrlToMultipartFile(alarmImage)).setPath(DateUtil.today()).upload();
FileInfo alarmImageInfo = fileStorageService.of(UrlUtil.uploadImgUrlToMultipartFile(serverUrl + alarmImage)).setPath(DateUtil.today()).upload(); aiAnalyseHardWareAlarmRecord.setImageUrl(DateUtil.today() + "/" + alarmImageInfo.getFilename());
aiAnalyseHardWareAlarmRecord.setImageUrl(DateUtil.today() + "/" + alarmImageInfo.getUrl()); }
aiAnalyseHardWareAlarmRecord.setAlarmDesc(body.getString("alarmDesc")); aiAnalyseHardWareAlarmRecord.setAlarmDesc(body.getString("alarmDesc"));
List<DictionaryItem> dictList = dictionaryItemService.getDictList(DictionaryConstant.AI_ANALYSE_HARD_WARE_ALARM_RECORD_TYPE, aiAnalyseHardWareRecord.getProjectSn()); List<DictionaryItem> dictList = dictionaryItemService.getDictList(DictionaryConstant.AI_ANALYSE_HARD_WARE_ALARM_RECORD_TYPE, aiAnalyseHardWareRecord.getProjectSn());
for (DictionaryItem dictionaryItem : dictList) { for (DictionaryItem dictionaryItem : dictList) {