diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java index f4eaf5c..8126363 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java @@ -512,9 +512,9 @@ public class BigScreenController { } - @PostMapping("/getIndexSummry") + @PostMapping("/getIndexSummry2") @ApiOperation("大屏首页统计") - public Result> getIndexSummry (@RequestBody ScreenSummaryVo screenSummaryVo){ + public Result> getIndexSummry2 (@RequestBody ScreenSummaryVo screenSummaryVo){ String tenantId= iotTools.getTenantId(screenSummaryVo.getAuthId()); List results = new ArrayList<>(); if(StringUtils.isBlank(screenSummaryVo.getSummrayMode())){//不传模式,默认为天数据 diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java index 09f70a0..36964ed 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java @@ -234,9 +234,9 @@ public class BigScreenControllerP2 { return result; } - @PostMapping("/getIndexSummry2") - @ApiOperation("大屏首页统计2") - public Result> getIndexSummry2 (@RequestBody ScreenSummaryVo screenSummaryVo){ + @PostMapping("/getIndexSummry") + @ApiOperation("大屏首页统计") + public Result> getIndexSummry (@RequestBody ScreenSummaryVo screenSummaryVo){ String tenantId= iotTools.getTenantId(screenSummaryVo.getAuthId()); List results = staticticsService.stationStatistic(screenSummaryVo); diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/StaticticsServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/StaticticsServiceImpl.java index 7bc1d86..8263cd5 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/StaticticsServiceImpl.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/StaticticsServiceImpl.java @@ -6,6 +6,7 @@ import org.jeecg.common.config.TenantContext; import org.jeecg.common.constant.IotConstants; import org.jeecg.common.constant.PollutionConstants; import org.jeecg.common.constant.StatisticConstants; +import org.jeecg.common.constant.enums.PollutionEnum; import org.jeecg.common.entity.ScEquZhibiao; import org.jeecg.common.entity.SurvDeviceDeploy; import org.jeecg.common.entity.SurvStationInfo; @@ -285,7 +286,8 @@ public class StaticticsServiceImpl { BigDecimal decimal = new BigDecimal(value); value = decimal.setScale(4, RoundingMode.HALF_UP).stripTrailingZeros().toPlainString(); zhibiaoData.add(value); - dataMap.put(zhibiaoKey,zhibiaoData); + String name = PollutionEnum.catchPollution(zhibiaoKey).getDescription(); + dataMap.put(name.replace("水样",""),zhibiaoData); } } }