From 9726c517100da98dacc33db458b134a560b9d33e Mon Sep 17 00:00:00 2001 From: xiaoguangbin Date: Thu, 25 Jul 2024 17:05:14 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9AselfStationController=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=20replotBaseLine=E3=80=81acceptBaseLine=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/controller/SelfStationController.java | 10 ++++++++++ .../org/jeecg/modules/entity/vo/BaseLineCtrls.java | 2 ++ .../org/jeecg/modules/service/ISelfStationService.java | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SelfStationController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SelfStationController.java index 77192fc2..bac4f9ae 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SelfStationController.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SelfStationController.java @@ -284,6 +284,16 @@ public class SelfStationController { commentsInfo.getComments(), request); } + @PostMapping("replotBaseLine") + public Result replotBaseLine(@RequestBody BaseLineCtrls baseLineCtrls, HttpServletRequest request) { + return selfStationService.replotBaseLine(baseLineCtrls, request); + } + + @PostMapping("acceptBaseLine") + public Result acceptBaseLine(@RequestBody BaseLineCtrls baseLineCtrls, HttpServletRequest request) { + return selfStationService.acceptBaseLine(baseLineCtrls, request); + } + /***************************************** beta ******************************************/ @PostMapping("fitting") diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/BaseLineCtrls.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/BaseLineCtrls.java index 568830e5..f10aa3e5 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/BaseLineCtrls.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/BaseLineCtrls.java @@ -7,4 +7,6 @@ public class BaseLineCtrls extends BaseControls { private String fileName; + private int gammaROINum; + } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISelfStationService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISelfStationService.java index d8f7d0f5..4d96af25 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISelfStationService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISelfStationService.java @@ -92,6 +92,10 @@ public interface ISelfStationService { Result addGeneralComment(String fileName, int gammaROINum, String comments, HttpServletRequest request); + Result replotBaseLine(BaseLineCtrls baseLineCtrls, HttpServletRequest request); + + Result acceptBaseLine(BaseLineCtrls baseLineCtrls, HttpServletRequest request); + Result fitting(Double paramA, Double paramB, Double paramC, List tempPointsArray, Integer count, String sampleFileName, String tabName, boolean fittingBtn, HttpServletRequest request);