From de31cacb3222de7626042a064912a37bf828e0f6 Mon Sep 17 00:00:00 2001 From: guo Date: Mon, 15 Apr 2024 15:53:44 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...iAnalyseHardWareAlarmRecordController.java | 3 +++ .../entity/AiAnalyseHardWareAlarmRecord.java | 6 +++++ .../AiAnalyseHardWareAlarmRecordMapper.java | 3 +++ .../AiAnalyseHardWareAlarmRecordMapper.xml | 22 +++++++++++++++++++ .../IAiAnalyseHardWareAlarmRecordService.java | 2 ++ ...AnalyseHardWareAlarmRecordServiceImpl.java | 5 +++++ 6 files changed, 41 insertions(+) diff --git a/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java b/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java index e47e015df..3e12fe59f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareAlarmRecord.java b/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareAlarmRecord.java index 33494bce4..690ff95dd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareAlarmRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareAlarmRecord.java @@ -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字符串数组 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareAlarmRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareAlarmRecordMapper.java index fcda109f3..0262a5960 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareAlarmRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareAlarmRecordMapper.java @@ -54,4 +54,7 @@ public interface AiAnalyseHardWareAlarmRecordMapper extends BaseMapper getViolatorList(Map map); List violatorListSort(Map map); + + int batchInsert(@Param("list") List list); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml index c207e5bbd..53db0dfb2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml @@ -492,4 +492,26 @@ group by wi.id order by count desc + + + 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 + + (#{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}) + + diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/IAiAnalyseHardWareAlarmRecordService.java b/src/main/java/com/zhgd/xmgl/modules/video/service/IAiAnalyseHardWareAlarmRecordService.java index a9ca94ebb..6b24dab3f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/IAiAnalyseHardWareAlarmRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/IAiAnalyseHardWareAlarmRecordService.java @@ -48,4 +48,6 @@ public interface IAiAnalyseHardWareAlarmRecordService extends IService violatorListSort(Map map); void callback(HashMap paramMap); + + int batchInsert(List list); } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java index fbce18d1a..d140c3a32 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java @@ -447,6 +447,11 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl list) { + return baseMapper.batchInsert(list); + } + private Integer getAlarmType(Integer algorithmId) { /* 4 行人闯入