diff --git a/client/src/views/big-screen/bigdata.vue b/client/src/views/big-screen/bigdata.vue index e4013cb..e6aa26c 100644 --- a/client/src/views/big-screen/bigdata.vue +++ b/client/src/views/big-screen/bigdata.vue @@ -130,7 +130,10 @@
- +
+
执法车辆数量
+
{{ 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 6b4d571..2814068 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,7 +31,14 @@ 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 e5f40ae..e77ac06 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,6 +42,7 @@ 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))); }