From 7937817628e16cfef3cfb19ab822d451e5c574cb Mon Sep 17 00:00:00 2001 From: huxin02 Date: Fri, 8 Aug 2025 19:29:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E8=A3=85=E5=A4=87=E5=89=8D?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/views/big-screen/bigdata.vue | 5 +---- .../com/aisino/iles/lawenforcement/model/Zfzbgl.java | 9 +-------- .../iles/lawenforcement/service/ZsfzglService.java | 1 - 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/client/src/views/big-screen/bigdata.vue b/client/src/views/big-screen/bigdata.vue index e6aa26c..e4013cb 100644 --- a/client/src/views/big-screen/bigdata.vue +++ b/client/src/views/big-screen/bigdata.vue @@ -130,10 +130,7 @@
-
-
执法车辆数量
-
{{ zfcls }}
-
+
个体防护
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/model/Zfzbgl.java b/server/src/main/java/com/aisino/iles/lawenforcement/model/Zfzbgl.java index 2814068..6b4d571 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/model/Zfzbgl.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/model/Zfzbgl.java @@ -31,14 +31,7 @@ public class Zfzbgl extends BaseModel { @Comment("ID(ULID)") private String zfzbglid; - /** - * 所属机构ID - */ - @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "agency_id") - @NotFound(action = NotFoundAction.IGNORE) - @Comment("所属机构ID") - private Agency agency; + @Column(length = 50) diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/ZsfzglService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/ZsfzglService.java index e77ac06..e5f40ae 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/ZsfzglService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/ZsfzglService.java @@ -42,7 +42,6 @@ public class ZsfzglService { Integer _page = Optional.ofNullable(query.page()).filter(f -> f > 0).map(f -> f - 1).orElse(0); String _sort = Optional.ofNullable(query.sort()).filter(com.aisino.iles.common.util.StringUtils::isNotEmpty).orElse(Zsfzgl_.GZSJ); String _dir = Optional.ofNullable(query.dir()).filter(d -> Sort.Direction.fromOptionalString(d).isPresent()).orElse("desc"); - return zsfzglRepository.findAll(buildQueryCondition(query), PageRequest.of(_page, _psize, Sort.by(Sort.Direction.fromString(_dir), _sort))); }