diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/controller/HomePageController.java b/server/src/main/java/com/aisino/iles/lawenforcement/controller/HomePageController.java index 50520d0..4eec628 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/controller/HomePageController.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/controller/HomePageController.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.Map; /** - * 首页统计数 + * 综合执法/首页统计数 */ @RestController @RequestMapping(Constants.API_PREFIX + "/lawenforcement/HomePage") diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/ZfzbglService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/ZfzbglService.java index 25ba194..11ccf2b 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/ZfzbglService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/ZfzbglService.java @@ -35,10 +35,12 @@ public class ZfzbglService { this.equipmentHistoryVideoRepository = equipmentHistoryVideoRepository; } + public List list(ZfzbglQuery query) { return zfzbglRepository.findAll(buildQueryCondition(query)); } + public Page page(ZfzbglQuery query, RemoteUserInfo user) { Integer _psize = Optional.ofNullable(query.pageSize()).filter(f -> f > 0).orElse(20); Integer _page = Optional.ofNullable(query.page()).filter(f -> f > 0).map(f -> f - 1).orElse(0); @@ -85,7 +87,8 @@ public class ZfzbglService { zfzbgl.setZblx("矿山执法"); } else if ("6".equals(zfzbgl.getZblxdm())) { zfzbgl.setZblx("危化品执法"); - + } else if ("7".equals(zfzbgl.getZblxdm())) { + zfzbgl.setZblx("执法记录仪"); } else if ("8".equals(zfzbgl.getZblxdm())) { zfzbgl.setZblx("对讲机"); } @@ -117,6 +120,8 @@ public class ZfzbglService { z.setZblx("矿山执法"); } else if ("6".equals(z.getZblxdm())) { z.setZblx("危化品执法"); + } else if ("7".equals(z.getZblxdm())) { + z.setZblx("执法记录仪"); } else if ("8".equals(z.getZblxdm())) { z.setZblx("对讲机"); } @@ -151,7 +156,7 @@ public class ZfzbglService { /** - * 执法装备分类统计 + * 首页-执法装备分类统计 */ public List syStatistics(ZfzbglQuery query, RemoteUserInfo user) { List allCodes = List.of("1", "2", "3", "4", "5", "6", "7", "8");