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

bug修复

Browse Source
This commit is contained in:
guo 2024-04-15 15:53:44 +08:00
parent 8ebe02e81e
commit de31cacb32
6 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java
View File

@ -3,17 +3,20 @@ package com.zhgd.xmgl.modules.video.controller;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.xmgl.base.entity.vo.SectorVo;
import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService;
import com.zhgd.xmgl.modules.mechanicalequipmentposition.entity.MechanicalEquipmentPositionData;
import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareAlarmRecord;
import com.zhgd.xmgl.modules.video.entity.vo.AiAnalyseHardWareAlarmTotalVo;
import com.zhgd.xmgl.modules.video.entity.vo.AiAnalyseHardWareAlarmTrendVo;
import com.zhgd.xmgl.modules.video.service.IAiAnalyseHardWareAlarmRecordService;
import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
import com.zhgd.xmgl.util.DateUtils;
import com.zhgd.xmgl.util.MessageUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;

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

@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.List;
@ -127,6 +129,10 @@ public class AiAnalyseHardWareAlarmRecord implements Serializable {
private java.lang.String desc;
@ApiModelProperty(value = "是否处置过1处置过0未处置")
private java.lang.Boolean handleDone;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss")
private java.util.Date updateDate;
/**
* 推送人id字符串数组
*/

3
src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareAlarmRecordMapper.java
View File

@ -54,4 +54,7 @@ public interface AiAnalyseHardWareAlarmRecordMapper extends BaseMapper<AiAnalyse
List<WorkerInfo> getViolatorList(Map<String, Object> map);
List<WorkerInfo> violatorListSort(Map<String, Object> map);
int batchInsert(@Param("list") List<AiAnalyseHardWareAlarmRecord> list);
}

22
src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml
View File

@ -492,4 +492,26 @@
group by wi.id
order by count desc
</select>
<insert id="batchInsert" parameterType="map">
<!--@mbg.generated-->
insert into ai_analyse_hard_ware_alarm_record
(id, project_sn, hardware_name, hardware_id, image_url, alarm_type, `location`, create_time,
rectification_person_id, push_person_ids, `status`, correct_image, correct_remark,
correct_time, request_rectification_date, update_date, handle_result, `desc`, handle_done
)
values
<foreach collection="list" item="item" separator=",">
(#{item.id,jdbcType=BIGINT}, #{item.projectSn,jdbcType=VARCHAR}, #{item.hardwareName,jdbcType=VARCHAR},
#{item.hardwareId,jdbcType=VARCHAR}, #{item.imageUrl,jdbcType=VARCHAR}, #{item.alarmType,jdbcType=TINYINT},
#{item.location,jdbcType=VARCHAR}, #{item.createTime,jdbcType=VARCHAR},
#{item.rectificationPersonId,jdbcType=BIGINT},
#{item.pushPersonIds,jdbcType=VARCHAR}, #{item.status,jdbcType=TINYINT},
#{item.correctImage,jdbcType=VARCHAR},
#{item.correctRemark,jdbcType=VARCHAR}, #{item.correctTime,jdbcType=VARCHAR},
#{item.requestRectificationDate,jdbcType=VARCHAR},
#{item.updateDate,jdbcType=TIMESTAMP}, #{item.handleResult,jdbcType=INTEGER},
#{item.desc,jdbcType=LONGVARCHAR},
#{item.handleDone,jdbcType=INTEGER})
</foreach>
</insert>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/video/service/IAiAnalyseHardWareAlarmRecordService.java
View File

@ -48,4 +48,6 @@ public interface IAiAnalyseHardWareAlarmRecordService extends IService<AiAnalyse
List<WorkerInfo> violatorListSort(Map<String, Object> map);
void callback(HashMap<String, Object> paramMap);
int batchInsert(List<AiAnalyseHardWareAlarmRecord> list);
}

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

@ -447,6 +447,11 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
asyncAiAnalyse.sendAiAnalyse(alarmRecord);
}
@Override
public int batchInsert(List<AiAnalyseHardWareAlarmRecord> list) {
return baseMapper.batchInsert(list);
}
private Integer getAlarmType(Integer algorithmId) {
/*
4 行人闯入