xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
xiaoguangbin 2024-07-25 17:05:40 +08:00
commit da269b1da1
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SelfStationController.java
View File

@ -284,6 +284,16 @@ public class SelfStationController {
commentsInfo.getComments(), request); 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 ******************************************/ /***************************************** beta ******************************************/
@PostMapping("fitting") @PostMapping("fitting")

2
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/BaseLineCtrls.java
View File

@ -7,4 +7,6 @@ public class BaseLineCtrls extends BaseControls {
private String fileName; private String fileName;
private int gammaROINum;
} }

4
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISelfStationService.java
View File

@ -92,6 +92,10 @@ public interface ISelfStationService {
Result addGeneralComment(String fileName, int gammaROINum, String comments, HttpServletRequest request); 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, Result fitting(Double paramA, Double paramB, Double paramC, List<SeriseData> tempPointsArray, Integer count,
String sampleFileName, String tabName, boolean fittingBtn, HttpServletRequest request); String sampleFileName, String tabName, boolean fittingBtn, HttpServletRequest request);