From 1ad11c12e692dbfd6823214869ced10f5c215b9c Mon Sep 17 00:00:00 2001 From: chenlinlin Date: Fri, 25 Apr 2025 17:56:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E4=BF=A1=E6=81=AF=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=E3=80=81=E5=AE=A1=E6=9F=A5?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E3=80=81=E5=85=B1=E7=94=A8=E8=BE=85=E5=8A=A9?= =?UTF-8?q?=E7=94=A8=E6=88=BF=E7=AD=89=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/aisino/iles/common/util/Constants.java | 1 - .../aisino/iles/lawenforcement/model/Enterprise.java | 1 - .../iles/lawenforcement/model/EnterpriseHistory.java | 1 - .../aisino/iles/lawenforcement/model/OnlinePatrol.java | 10 +++++++++- .../service/EquipmentHistoryVideoScheduleService.java | 2 +- .../lawenforcement/service/EnterpriseWarnKafka.java | 4 +++- .../lawenforcement/service/OnlinePatrolService.java | 1 - 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/server/src/main/java/com/aisino/iles/common/util/Constants.java b/server/src/main/java/com/aisino/iles/common/util/Constants.java index eb9f71f..e16f871 100644 --- a/server/src/main/java/com/aisino/iles/common/util/Constants.java +++ b/server/src/main/java/com/aisino/iles/common/util/Constants.java @@ -1720,7 +1720,6 @@ public class Constants { * 用户自动锁定锁定分钟数 */ public static final String USER_AUTO_LOCK_LOCK_MINUTES = "user_auto_lock_lock_minutes"; - /** * 用户认证过期时间天数 */ diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/model/Enterprise.java b/server/src/main/java/com/aisino/iles/lawenforcement/model/Enterprise.java index f7bc895..dd68ed8 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/model/Enterprise.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/model/Enterprise.java @@ -628,7 +628,6 @@ public class Enterprise extends BaseModel { @Comment("视频接入；1是；0否") private String videoAccess; - @Column(length = 2) @Comment("感知接入；1是；0否") private String perceptionAccess; diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/model/EnterpriseHistory.java b/server/src/main/java/com/aisino/iles/lawenforcement/model/EnterpriseHistory.java index 9fa7d7b..1d9982b 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/model/EnterpriseHistory.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/model/EnterpriseHistory.java @@ -277,7 +277,6 @@ public class EnterpriseHistory extends BaseModel { @Column(length = 2) @Comment("资料接入；1是；0否") private String infoAccess; - @Column(length = 2) @Comment("许可接入；1是；0否") private String permitAccess; diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/model/OnlinePatrol.java b/server/src/main/java/com/aisino/iles/lawenforcement/model/OnlinePatrol.java index f355861..fb1c0ad 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/model/OnlinePatrol.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/model/OnlinePatrol.java @@ -45,7 +45,15 @@ import java.util.Objects; group by format(a.createTime as 'yyyy') order by createTime """), - + @NamedQuery(name = "getfxczftjByMonth", query = """ + select + format(a.createTime as 'yyyy-MM') as createTime, + count(a) as zs + from OnlinePatrol a + where a.createTime >= :startTime and a.createTime <= :endTime + group by format(a.createTime as 'yyyy-MM') + order by createTime + """), }) @SqlResultSetMappings({ @SqlResultSetMapping( diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EquipmentHistoryVideoScheduleService.java b/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EquipmentHistoryVideoScheduleService.java index 8101636..0bb1725 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EquipmentHistoryVideoScheduleService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EquipmentHistoryVideoScheduleService.java @@ -27,7 +27,7 @@ import java.util.Optional; /** - * 执法装备视频信息同步调度服务 + * 执法装备历史视频信息同步调度服务 *

* 通过定时任务从外部API同步装备历史视频信息到本地数据库 */ diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseWarnKafka.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseWarnKafka.java index d11cb3d..7caaf63 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseWarnKafka.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseWarnKafka.java @@ -47,7 +47,9 @@ public class EnterpriseWarnKafka { enterpriseWarn.setImageUrl("https://10.17.97.98" + event.getStr("snappedPicUrl")); LocalDateTime time = ZonedDateTime.parse(event.getStr("happenTime")).toLocalDateTime(); enterpriseWarn.setTime(time); - enterpriseWarn.setStreet(enterpriseWarnDto.getStreet()); +// enterpriseWarn.setVideoUrl(event.getStr("snappedPicUrl")); +// enterpriseWarn.setStreetcode(enterpriseWarnDto.getStreetcode()); +// enterpriseWarn.setStreet(enterpriseWarnDto.getStreet()); enterpriseWarn.setConfidence(event.getStr("similarity")); enterpriseWarn.setJudgment(1); enterpriseWarn.setRemark(event.getStr("remark")); diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/OnlinePatrolService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/OnlinePatrolService.java index 7cc2604..3890bc4 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/OnlinePatrolService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/OnlinePatrolService.java @@ -70,7 +70,6 @@ public class OnlinePatrolService { onlinePatrol.setAnnexs(list); } - onlinePatrolRepository.save(onlinePatrol); }