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 calculation(@RequestParam Integer carFormulaId) { - CalculationResults result = carbonFormulaService.calculation(carFormulaId); + public ResultVO 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 { 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 carFormulaWrapper = new QueryWrapper<>(); + carFormulaWrapper.eq("name", carFormulaName); + + CarFormula carFormula = carbonFormulaMapper.selectOne(carFormulaWrapper); CalculationResults results = new CalculationResults(); BeanUtils.copyProperties(carFormula, results);