From 7aea8f016d038315b0ee1651ac4c9a37e15d7a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C18231669351=E2=80=9D?= <“1686821393@qq.com”>
Date: Sat, 25 Mar 2023 17:19:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=8F=82=E6=95=B0=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=94=B9=E5=8F=98=EF=BC=882023.3.25=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../carbon/controller/carbon/CarbonFormulaController.java  | 4 ++--
 .../edu/ncst/carbon/service/ICarbonFormulaService.java     | 2 +-
 .../service/impl/carbon/CarbonFormulaServiceImpl.java      | 7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CarbonSysBE1/src/main/java/edu/ncst/carbon/controller/carbon/CarbonFormulaController.java b/CarbonSysBE1/src/main/java/edu/ncst/carbon/controller/carbon/CarbonFormulaController.java
index 73033be..8d6631e 100644
--- a/CarbonSysBE1/src/main/java/edu/ncst/carbon/controller/carbon/CarbonFormulaController.java
+++ b/CarbonSysBE1/src/main/java/edu/ncst/carbon/controller/carbon/CarbonFormulaController.java
@@ -41,8 +41,8 @@ public class CarbonFormulaController {
      * */
     @ApiOperation("计算")
     @GetMapping("/calculation")
-    public ResultVO<CalculationResults> calculation(@RequestParam Integer carFormulaId) {
-        CalculationResults result = carbonFormulaService.calculation(carFormulaId);
+    public ResultVO<CalculationResults> calculation(@RequestParam String carFormulaName) {
+        CalculationResults result = carbonFormulaService.calculation(carFormulaName);
 
         return ResultUtils.success("ok", result);
     }
diff --git a/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/ICarbonFormulaService.java b/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/ICarbonFormulaService.java
index 1a89422..28587ee 100644
--- a/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/ICarbonFormulaService.java
+++ b/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/ICarbonFormulaService.java
@@ -22,5 +22,5 @@ public interface ICarbonFormulaService extends IService<CarFormula> {
 
     boolean deleteCarFormula(Integer id);
 
-    CalculationResults calculation(Integer id);
+    CalculationResults calculation(String carFormulaName);
 }
diff --git a/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/impl/carbon/CarbonFormulaServiceImpl.java b/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/impl/carbon/CarbonFormulaServiceImpl.java
index 3adfb22..44c2fae 100644
--- a/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/impl/carbon/CarbonFormulaServiceImpl.java
+++ b/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/impl/carbon/CarbonFormulaServiceImpl.java
@@ -158,9 +158,12 @@ public class CarbonFormulaServiceImpl extends ServiceImpl<CarbonFormulaMapper, C
     }
 
 
-    public CalculationResults calculation(Integer id) {
+    public CalculationResults calculation(String carFormulaName) {
 
-        CarFormula carFormula = carbonFormulaMapper.selectById(id);
+        QueryWrapper<CarFormula> carFormulaWrapper = new QueryWrapper<>();
+        carFormulaWrapper.eq("name", carFormulaName);
+
+        CarFormula carFormula = carbonFormulaMapper.selectOne(carFormulaWrapper);
         CalculationResults results = new CalculationResults();
         BeanUtils.copyProperties(carFormula, results);