From c04f2d4a58bd72449b2212ed2f8b0c3ac9ec96be Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期二, 12 八月 2025 11:04:16 +0800
Subject: [PATCH] 修改
---
hazmat-admin/src/main/java/com/gkhy/hazmat/admin/controller/web/HzStatisticController.java | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/hazmat-admin/src/main/java/com/gkhy/hazmat/admin/controller/web/HzStatisticController.java b/hazmat-admin/src/main/java/com/gkhy/hazmat/admin/controller/web/HzStatisticController.java
index d47350f..a028ae3 100644
--- a/hazmat-admin/src/main/java/com/gkhy/hazmat/admin/controller/web/HzStatisticController.java
+++ b/hazmat-admin/src/main/java/com/gkhy/hazmat/admin/controller/web/HzStatisticController.java
@@ -3,6 +3,7 @@
import com.gkhy.hazmat.common.annotation.Anonymous;
import com.gkhy.hazmat.common.api.CommonResult;
+import com.gkhy.hazmat.system.domain.dto.HazmatUseStatisticDTO;
import com.gkhy.hazmat.system.service.HzStatisticService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -50,6 +51,27 @@
return CommonResult.success(statisticService.useEverydayStatic(companyId));
}
+
+ @ApiOperation(value = "大屏一天使用量统计")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query",name = "companyId",dataType = "long",required = false,value = "企业ID")
+ })
+ @GetMapping("/dayUseStatistic")
+ @Anonymous
+ public CommonResult dayUseStatistic(Long companyId){
+ return CommonResult.success(statisticService.dayUseStatistic(companyId));
+ }
+
+ @ApiOperation(value = "大屏企业统计")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query",name = "type",dataType = "long",required = false,value = "企业类型")
+ })
+ @GetMapping("/companyMessage")
+ public CommonResult companyMessage(Long type){
+ return CommonResult.success(statisticService.companyMessage(type));
+ }
+
+
@ApiOperation(value = "一周使用频繁的危化品数量统计")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query",name = "companyId",dataType ="long",required = false,value = "公司id")
@@ -73,24 +95,17 @@
@ApiOperation(value = "危化品使用统计")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", name = "pageNum", dataType = "int", required = false, value = "当前页,默认1"),
- @ApiImplicitParam(paramType = "query", name = "pageSize", dataType = "int", required = false, value = "每页数目,默认10"),
- @ApiImplicitParam(paramType = "query", name = "startTime", dataType = "string", required = false, value = "开始时间,格式xxxx-xx-xx 00:00:00"),
- @ApiImplicitParam(paramType = "query", name = "endTime", dataType = "string", required = false, value = "结束时间,格式xxxx-xx-xx 23:59:59"),
- @ApiImplicitParam(paramType = "query", name = "companyId", dataType = "long", required = false, value = "企业id")
+ @ApiImplicitParam(paramType = "query", name = "pageSize", dataType = "int", required = false, value = "每页数目,默认10")
})
@GetMapping("/hazmatUseStatistic")
- public CommonResult hazmatUseStatistic(String startTime,String endTime,Long companyId) {
- return CommonResult.success(statisticService.useStatic(startTime,endTime,companyId));
+ public CommonResult hazmatUseStatistic(HazmatUseStatisticDTO useStatisticDTO) {
+ return CommonResult.success(statisticService.useStatic(useStatisticDTO));
}
@ApiOperation(value = "危化品使用记录导出")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "query", name = "startTime", dataType = "string", required = false, value = "开始时间,格式xxxx-xx-xx 00:00:00"),
- @ApiImplicitParam(paramType = "query", name = "endTime", dataType = "string", required = false, value = "结束时间,格式xxxx-xx-xx 23:59:59")
- })
@GetMapping("/importBaiscUse")
- public void ImportBasicUse(HttpServletResponse response, String startTime, String endTime) throws IOException {
- statisticService.importBaiscUse(response,startTime,endTime);
+ public void ImportBasicUse(HttpServletResponse response,HazmatUseStatisticDTO useStatisticDTO) throws IOException {
+ statisticService.importBaiscUse(response,useStatisticDTO);
}
}
--
Gitblit v1.9.2