From fc24827d4eb7b15c28a184123376eb758d93a9ad Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 10 四月 2026 17:25:30 +0800
Subject: [PATCH] feat: 生产计划导入验证产品是否存在、申请单编号重复、强度是否正确
---
src/main/java/com/ruoyi/home/controller/HomeController.java | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index 26b071c..9e20d0e 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -1,24 +1,18 @@
package com.ruoyi.home.controller;
import com.ruoyi.approve.pojo.ApproveProcess;
-import com.ruoyi.energy.vo.EnergyStatisticsVo;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.domain.R;
import com.ruoyi.home.annotation.DefaultType;
import com.ruoyi.home.dto.*;
import com.ruoyi.home.service.HomeService;
import com.ruoyi.dto.MapDto;
-import com.ruoyi.productionPlan.service.SalesDeliveryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.text.ParseException;
import java.util.List;
@@ -397,11 +391,43 @@
return AjaxResult.success(homeService.energy(dto));
}
+ @GetMapping("/solidWaste/coreIndicators")
+ @ApiOperation("鍥哄簾娑堢撼閲�-鏍稿績鎸囨爣")
+ public AjaxResult coreIndicators(productionStatisticsDto dto){
+ return AjaxResult.success(homeService.coreIndicators(dto));
+ }
+
+ @GetMapping("/solidWaste/trends")
+ @ApiOperation("鍥哄簾娑堢撼閲�-鍥哄簾娑堢撼瓒嬪娍")
+ public AjaxResult trends(productionStatisticsDto dto){
+ return AjaxResult.success(homeService.trends(dto));
+ }
+
+ @GetMapping("/solidWaste/typeDistribution")
+ @ApiOperation("鍥哄簾娑堢撼閲�-鍥哄簾绫诲瀷鍒嗗竷")
+ public AjaxResult typeDistribution(productionStatisticsDto dto){
+ return AjaxResult.success(homeService.typeDistribution(dto));
+ }
+
@GetMapping("/manage")
@ApiOperation("棣栭〉--缁忚惀鍏虫敞")
public AjaxResult manage() {
return AjaxResult.success(homeService.manage());
}
+ @GetMapping("/planTrends")
+ @ApiOperation("棣栭〉-璁″垝涓庣敓浜ц秼鍔�")
+ public AjaxResult planTrends(@DefaultType Integer type) {
+ List<PlanTrendsDto> list = homeService.planTrends(type);
+ return AjaxResult.success(list);
+ }
+
+
+ @GetMapping("/rawMaterialProductions/{month}")
+ @ApiOperation("鎴愭湰鏍哥畻-鍘熸枡鐢熶骇缁熻鍗曡�楄〃")
+ public AjaxResult rawMaterialProductions(@PathVariable String month){
+ List<RawMaterialProductionDto> list = homeService.rawMaterialProductions(month);
+ return AjaxResult.success(list);
+ }
}
--
Gitblit v1.9.3