diff --git a/client/src/views/big-screen/bigdata.vue b/client/src/views/big-screen/bigdata.vue index fb01148..d922f7f 100644 --- a/client/src/views/big-screen/bigdata.vue +++ b/client/src/views/big-screen/bigdata.vue @@ -13,10 +13,6 @@
返回首页
-
-
-
企业
-
执法记录仪
diff --git a/client/src/views/big-screen/bigdataBack.vue b/client/src/views/big-screen/bigdataBack.vue index a4ca52e..7df5852 100644 --- a/client/src/views/big-screen/bigdataBack.vue +++ b/client/src/views/big-screen/bigdataBack.vue @@ -13,10 +13,6 @@
返回首页
-
-
-
企业
-
执法记录仪
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/DeliveryRecordService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/DeliveryRecordService.java index 75ea148..cb1898d 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/DeliveryRecordService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/DeliveryRecordService.java @@ -262,7 +262,11 @@ public class DeliveryRecordService { () -> resMap.put(k, 0L) ); }); - + long sum = resMap.values().stream() + .mapToLong(o -> Long.parseLong(String.valueOf(o))) + .sum(); + resMap.put("total", sum); + mm.put(key, resMap); }); return agencyList.stream().map(o -> { Map resMap = new HashMap<>(); 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 11ccf2b..afec007 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 @@ -122,8 +122,6 @@ public class ZfzbglService { z.setZblx("危化品执法"); } else if ("7".equals(z.getZblxdm())) { z.setZblx("执法记录仪"); - } else if ("8".equals(z.getZblxdm())) { - z.setZblx("对讲机"); } } if (null!=z.getAgency()) {