From f3e9a20a198160228e66c1deed012e075327c035 Mon Sep 17 00:00:00 2001 From: whycq <123456> Date: 星期五, 03 五月 2024 10:24:00 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/MonitorController.java | 79 +++++++++++++++++++++------------------ 1 files changed, 42 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java index ca784bb..c0291ef 100644 --- a/src/main/java/com/zy/asrs/controller/MonitorController.java +++ b/src/main/java/com/zy/asrs/controller/MonitorController.java @@ -216,48 +216,53 @@ */ @GetMapping("/loc/rep") public R monitorLocRep(){ - List<Map<String, Object>> pie = new ArrayList<>(); + try{ + List<Map<String, Object>> pie = new ArrayList<>(); - LocChartPie locUseRate = reportQueryMapper.getLocUseRate(); - if(locUseRate!=null) { - Map<String, Object> map = new HashMap<>(); - map.put("name", "鍦ㄥ簱"); - map.put("value", locUseRate.getFqty()); - pie.add(map); + LocChartPie locUseRate = reportQueryMapper.getLocUseRate(); + if(locUseRate!=null) { + Map<String, Object> map = new HashMap<>(); + map.put("name", "鍦ㄥ簱"); + map.put("value", locUseRate.getFqty()); + pie.add(map); - Map<String, Object> map1 = new HashMap<>(); - map1.put("name", "绌�"); - map1.put("value", locUseRate.getOqty()); - pie.add(map1); + Map<String, Object> map1 = new HashMap<>(); + map1.put("name", "绌�"); + map1.put("value", locUseRate.getOqty()); + pie.add(map1); - Map<String, Object> map2 = new HashMap<>(); - map2.put("name", "浣跨敤"); - map2.put("value", locUseRate.getUqty()); - pie.add(map2); + Map<String, Object> map2 = new HashMap<>(); + map2.put("name", "浣跨敤"); + map2.put("value", locUseRate.getUqty()); + pie.add(map2); - Map<String, Object> map3 = new HashMap<>(); - map3.put("name", "绂佺敤"); - map3.put("value", locUseRate.getXqty()); - pie.add(map3); + Map<String, Object> map3 = new HashMap<>(); + map3.put("name", "绂佺敤"); + map3.put("value", locUseRate.getXqty()); + pie.add(map3); + } + + // 鎬诲簱浣嶆暟 + Integer total = (int) Arith.add(0, locUseRate.getFqty(), locUseRate.getOqty(), locUseRate.getUqty(), locUseRate.getXqty()); + // 浣跨敤涓� + Integer used = locUseRate.getFqty() + locUseRate.getUqty(); + // 搴撲綅浣跨敤鐜� + double usedDivides = Arith.divides(3, used, total); + double usedPr = Arith.multiplys(1, usedDivides, 100); + + return R.ok( + Cools.add("pie", pie) + .add("stockCunt", locUseRate.getFqty()) + .add("emptyCount", locUseRate.getOqty()) + .add("noneCount", locUseRate.getXqty()) + .add("total", total) + .add("used", used) + .add("usedPr", usedPr) + ); + }catch (Exception e){ + System.out.println("/loc/rep寮傚父"+e); + return R.error(); } - - // 鎬诲簱浣嶆暟 - Integer total = (int) Arith.add(0, locUseRate.getFqty(), locUseRate.getOqty(), locUseRate.getUqty(), locUseRate.getXqty()); - // 浣跨敤涓� - Integer used = locUseRate.getFqty() + locUseRate.getUqty(); - // 搴撲綅浣跨敤鐜� - double usedDivides = Arith.divides(3, used, total); - double usedPr = Arith.multiplys(1, usedDivides, 100); - - return R.ok( - Cools.add("pie", pie) - .add("stockCunt", locUseRate.getFqty()) - .add("emptyCount", locUseRate.getOqty()) - .add("noneCount", locUseRate.getXqty()) - .add("total", total) - .add("used", used) - .add("usedPr", usedPr) - ); } /** -- Gitblit v1.9.1