From 8bfbb0f9b7e471514c490e6f4027b9b608ef840f Mon Sep 17 00:00:00 2001 From: xbx <1827135378@qq.com> Date: Sun, 26 Nov 2023 16:36:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rms/controller/RmsDepartController.java | 40 +++++++++--- .../controller/RmsIntangibleController.java | 2 +- .../src/main/java/rms/entity/RmsPieChart.java | 6 +- .../main/java/rms/mapper/RmsChartMapper.java | 5 +- .../main/java/rms/mapper/RmsDepartMapper.java | 4 +- .../java/rms/mapper/xml/RmsChartMapper.xml | 18 +++++- .../java/rms/mapper/xml/RmsDepartMapper.xml | 14 ++++- .../java/rms/service/IRmsChartService.java | 11 ++++ .../rms/service/impl/RmsChartServiceImpl.java | 61 +++++++++++++++---- .../service/impl/RmsDepartServiceImpl.java | 16 ++++- 10 files changed, 148 insertions(+), 29 deletions(-) diff --git a/HRBNU/src/main/java/rms/controller/RmsDepartController.java b/HRBNU/src/main/java/rms/controller/RmsDepartController.java index 365f274..4e8687c 100644 --- a/HRBNU/src/main/java/rms/controller/RmsDepartController.java +++ b/HRBNU/src/main/java/rms/controller/RmsDepartController.java @@ -18,29 +18,55 @@ public class RmsDepartController { IRmsDepartService rmsDepartService; @Resource IRmsChartService rmsChartService; + + //获取数量 单位map @GetMapping("getPieChart") - public List getPieChart(){ + public List getPieChart() { return rmsDepartService.getPieChart(); } + + @GetMapping("getLocationName") + public String[] getLocationName() { + return rmsChartService.getLocationName(); + } + + //获取各地址的资产总数 @GetMapping("getChart") - public List getChart(){ - System.out.println("locationCount"+rmsChartService.getLocationCount()); + public List getChart() { return rmsChartService.getLocationCount(); } + + //获取仪器总数 @GetMapping("getInstrumentCount") - public int getInstrumentCount(){ + public int getInstrumentCount() { return rmsChartService.getInstrumentCount(); } + + //获取家具总数 @GetMapping("getFurnitureCount") - public int getFurnitureCount(){ + public int getFurnitureCount() { return rmsChartService.getFurnitureCount(); } + //获取无形资产总数 + @GetMapping("getIntangibleCount") + public int getIntangibleCount(){ + return rmsChartService.getIntangibleCount(); + } + + //获取仪器总价 @GetMapping("getInstrumentAmount") - public int getInstrumentAmount(){ + public int getInstrumentAmount() { return rmsChartService.getInstrumentAmount(); } + + //获取家具总价 @GetMapping("getFurnitureAmount") - public int getFurnitureAmount(){ + public int getFurnitureAmount() { return rmsChartService.getFurnitureAmount(); } + //获取无形资产总价 + @GetMapping("getIntangibleAmount") + public int getIntangibleAmount() { + return rmsChartService.getIntangibleAmount(); + } } diff --git a/HRBNU/src/main/java/rms/controller/RmsIntangibleController.java b/HRBNU/src/main/java/rms/controller/RmsIntangibleController.java index aef854e..3fe4cd0 100644 --- a/HRBNU/src/main/java/rms/controller/RmsIntangibleController.java +++ b/HRBNU/src/main/java/rms/controller/RmsIntangibleController.java @@ -42,7 +42,7 @@ public class RmsIntangibleController extends JeecgController getDepartName(); - String getValue(String depart_name); + String getInstrumentValue(String depart_name); + String getFurnitureValue(String depart_name); + String getIntangibleValue(String depart_name); } diff --git a/HRBNU/src/main/java/rms/mapper/xml/RmsChartMapper.xml b/HRBNU/src/main/java/rms/mapper/xml/RmsChartMapper.xml index 48900d2..aab2adf 100644 --- a/HRBNU/src/main/java/rms/mapper/xml/RmsChartMapper.xml +++ b/HRBNU/src/main/java/rms/mapper/xml/RmsChartMapper.xml @@ -1,8 +1,12 @@ - - + SELECT location_name + FROM rms_location + WHERE parent_location_id IS NULL + + + + \ No newline at end of file diff --git a/HRBNU/src/main/java/rms/mapper/xml/RmsDepartMapper.xml b/HRBNU/src/main/java/rms/mapper/xml/RmsDepartMapper.xml index c92f9f0..df14580 100644 --- a/HRBNU/src/main/java/rms/mapper/xml/RmsDepartMapper.xml +++ b/HRBNU/src/main/java/rms/mapper/xml/RmsDepartMapper.xml @@ -5,10 +5,22 @@ - SELECT count(*) FROM rms_instrument JOIN sys_depart ON rms_instrument.collecting_unit_number = sys_depart.id WHERE depart_name = #{depart_name} + + \ No newline at end of file diff --git a/HRBNU/src/main/java/rms/service/IRmsChartService.java b/HRBNU/src/main/java/rms/service/IRmsChartService.java index 26fbfb0..cf47d45 100644 --- a/HRBNU/src/main/java/rms/service/IRmsChartService.java +++ b/HRBNU/src/main/java/rms/service/IRmsChartService.java @@ -3,9 +3,20 @@ package rms.service; import java.util.List; public interface IRmsChartService { + //获取一级地址集合 + String[] getLocationName(); + //获取各地址的资产总数 List getLocationCount(); + //获取仪器总数 int getInstrumentCount(); + //获取家具总数 int getFurnitureCount(); + //获取无形资产总数 + int getIntangibleCount(); + //获取仪器总价格 int getInstrumentAmount(); + //获取家具总价 int getFurnitureAmount(); + //获取无形资产总价 + int getIntangibleAmount(); } diff --git a/HRBNU/src/main/java/rms/service/impl/RmsChartServiceImpl.java b/HRBNU/src/main/java/rms/service/impl/RmsChartServiceImpl.java index 674ea96..e60e6a4 100644 --- a/HRBNU/src/main/java/rms/service/impl/RmsChartServiceImpl.java +++ b/HRBNU/src/main/java/rms/service/impl/RmsChartServiceImpl.java @@ -6,17 +6,36 @@ import rms.service.IRmsChartService; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; + @Service public class RmsChartServiceImpl implements IRmsChartService { @Resource RmsChartMapper rmsChartMapper; + + @Override + public String[] getLocationName() { + return rmsChartMapper.getLocationName(); + } + @Override public List getLocationCount() { - String[] LocationNameList = {"理工一号楼","行知楼", "体育楼", "崇师楼","新实验楼","社科楼"}; + String[] LocationNameList = getLocationName(); List LocationCount = new ArrayList<>(); - for(String locationName :LocationNameList){ - LocationCount.add(Integer.parseInt(rmsChartMapper.getInstrumentCount(locationName)) + Integer.parseInt(rmsChartMapper.getFurnitureCount(locationName))); + double doubleFurnitureCount; + double doubleIntangibleCount; + for (String locationName : LocationNameList) { + doubleFurnitureCount = 0; + doubleIntangibleCount = 0; + if (rmsChartMapper.getFurnitureCount(locationName) != null) { + doubleFurnitureCount = Double.parseDouble(rmsChartMapper.getFurnitureCount(locationName)); + } + if (rmsChartMapper.getIntangibleCount(locationName) != null) { + doubleIntangibleCount = Double.parseDouble(rmsChartMapper.getIntangibleCount(locationName)); + } + LocationCount.add(rmsChartMapper.getInstrumentCount(locationName) + (int) doubleFurnitureCount + + (int) doubleIntangibleCount); } return LocationCount; @@ -24,28 +43,43 @@ public class RmsChartServiceImpl implements IRmsChartService { @Override public int getInstrumentCount() { - String[] LocationNameList = {"理工一号楼","行知楼", "体育楼", "崇师楼","新实验楼","社科楼"}; + String[] LocationNameList = getLocationName(); int sum = 0; - for(String locationName :LocationNameList){ - sum+= Integer.parseInt(rmsChartMapper.getInstrumentCount(locationName)); + for (String locationName : LocationNameList) { + sum += rmsChartMapper.getInstrumentCount(locationName); } return sum; } @Override public int getFurnitureCount() { - String[] LocationNameList = {"理工一号楼","行知楼"}; + String[] LocationNameList = getLocationName(); int sum = 0; - for(String locationName :LocationNameList){ - sum+= Integer.parseInt(rmsChartMapper.getFurnitureCount(locationName)); - System.out.println(locationName+"地址的数量"+sum); + for (String locationName : LocationNameList) { + if (rmsChartMapper.getFurnitureCount(locationName) != null) { + double doubleValue = Double.parseDouble(rmsChartMapper.getFurnitureCount(locationName)); + sum += (int) doubleValue; + } + } + return sum; + } + + @Override + public int getIntangibleCount() { + String[] LocationNameList = getLocationName(); + int sum = 0; + for (String locationName : LocationNameList) { + if (rmsChartMapper.getIntangibleCount(locationName) != null) { + double doubleValue = Double.parseDouble(rmsChartMapper.getIntangibleCount(locationName)); + sum += (int) doubleValue; + } } return sum; } @Override public int getInstrumentAmount() { - return rmsChartMapper.getInstrumentAmount(); + return rmsChartMapper.getInstrumentAmount(); } @Override @@ -53,4 +87,9 @@ public class RmsChartServiceImpl implements IRmsChartService { return rmsChartMapper.getFurnitureAmount(); } + @Override + public int getIntangibleAmount() { + return rmsChartMapper.getIntangibleAmount(); + } + } diff --git a/HRBNU/src/main/java/rms/service/impl/RmsDepartServiceImpl.java b/HRBNU/src/main/java/rms/service/impl/RmsDepartServiceImpl.java index cab5a5e..770716b 100644 --- a/HRBNU/src/main/java/rms/service/impl/RmsDepartServiceImpl.java +++ b/HRBNU/src/main/java/rms/service/impl/RmsDepartServiceImpl.java @@ -20,9 +20,21 @@ public class RmsDepartServiceImpl implements IRmsDepartService { public List getPieChart() { List departNameList = rmsDepartMapper.getDepartName(); List rmsPieChartList = new ArrayList<>(); - for(String departName : departNameList){ + double doubleFurnitureCount; + double doubleIntangibleCount; + for (String departName : departNameList) { + doubleFurnitureCount = 0; + doubleIntangibleCount = 0; + if (rmsDepartMapper.getFurnitureValue(departName) != null) { + doubleFurnitureCount = Double.parseDouble(rmsDepartMapper.getFurnitureValue(departName)); + } + if (rmsDepartMapper.getIntangibleValue(departName) != null) { + doubleIntangibleCount = Double.parseDouble(rmsDepartMapper.getIntangibleValue(departName)); + } RmsPieChart rmsPieChart = new RmsPieChart(); - rmsPieChart.setValue(rmsDepartMapper.getValue(departName)); + rmsPieChart.setValue(Integer.parseInt(rmsDepartMapper.getInstrumentValue(departName)) + + (int) doubleFurnitureCount + + (int) doubleIntangibleCount); rmsPieChart.setName(departName); rmsPieChartList.add(rmsPieChart); }