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-28 01:04:05 +08:00
commit 8ddd17a5fb
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareAlarmRecord.java
View File

@ -78,12 +78,6 @@ public class AiAnalyseHardWareAlarmRecord implements Serializable {
@Excel(name = "类型 1-烟感报警，2-明火报警，3-人员到底报警，4-未带安全帽报警，5-区域入侵报警，6-越界入侵报警，7-人员聚集报警， 8-反光衣、9-裸土覆盖,13口罩识别,14徘徊预警,15物体滞留监测,16绊线监测", width = 15) @Excel(name = "类型 1-烟感报警，2-明火报警，3-人员到底报警，4-未带安全帽报警，5-区域入侵报警，6-越界入侵报警，7-人员聚集报警， 8-反光衣、9-裸土覆盖,13口罩识别,14徘徊预警,15物体滞留监测,16绊线监测", width = 15)
@ApiModelProperty(value = "类型 1-烟感报警，2-明火报警，3-人员到底报警，4-未带安全帽报警，5-区域入侵报警，6-越界入侵报警，7-人员聚集报警， 8-反光衣、9-裸土覆盖,13口罩识别,14徘徊预警,15物体滞留监测,16绊线监测") @ApiModelProperty(value = "类型 1-烟感报警，2-明火报警，3-人员到底报警，4-未带安全帽报警，5-区域入侵报警，6-越界入侵报警，7-人员聚集报警， 8-反光衣、9-裸土覆盖,13口罩识别,14徘徊预警,15物体滞留监测,16绊线监测")
private java.lang.Integer alarmType; private java.lang.Integer alarmType;
/**
* 告警类型
*/
@Excel(name = "告警类型", width = 15)
@ApiModelProperty(value = "告警类型")
private java.lang.String alarmName;
/** /**
* 位置 * 位置
*/ */

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

@ -189,7 +189,12 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
FileInfo alarmImageInfo = fileStorageService.of(UrlUtil.uploadImgUrlToMultipartFile(serverUrl + alarmImage)).setPath(DateUtil.today()).upload(); FileInfo alarmImageInfo = fileStorageService.of(UrlUtil.uploadImgUrlToMultipartFile(serverUrl + alarmImage)).setPath(DateUtil.today()).upload();
aiAnalyseHardWareAlarmRecord.setImageUrl(DateUtil.today() + "/" + alarmImageInfo.getUrl()); aiAnalyseHardWareAlarmRecord.setImageUrl(DateUtil.today() + "/" + alarmImageInfo.getUrl());
aiAnalyseHardWareAlarmRecord.setAlarmDesc(body.getString("alarmDesc")); aiAnalyseHardWareAlarmRecord.setAlarmDesc(body.getString("alarmDesc"));
aiAnalyseHardWareAlarmRecord.setAlarmName(body.getString("alarmType")); List<DictionaryItem> dictList = dictionaryItemService.getDictList(DictionaryConstant.AI_ANALYSE_HARD_WARE_ALARM_RECORD_TYPE, aiAnalyseHardWareRecord.getProjectSn());
for (DictionaryItem dictionaryItem : dictList) {
if (dictionaryItem.getName().equals(body.getString("alarmType"))) {
aiAnalyseHardWareAlarmRecord.setAlarmType(Integer.parseInt(dictionaryItem.getData()));
}
}
aiAnalyseHardWareAlarmRecordMapper.insert(aiAnalyseHardWareAlarmRecord); aiAnalyseHardWareAlarmRecordMapper.insert(aiAnalyseHardWareAlarmRecord);
//将数据通过MQTT转发到前台 //将数据通过MQTT转发到前台
asyncAiAnalyse.sendAiAnalyse(aiAnalyseHardWareAlarmRecord); asyncAiAnalyse.sendAiAnalyse(aiAnalyseHardWareAlarmRecord);