Merge remote-tracking branch 'origin/SelfStation' into SelfStation

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")

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;
+
 }

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<SeriseData> tempPointsArray, Integer count,
                    String sampleFileName, String tabName, boolean fittingBtn, HttpServletRequest request);