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

实体类部分参数未使用驼峰命名修改

Browse Source 
查询折线图接口调用方法名称修改
This commit is contained in:
qiaoqinzheng 2023-07-13 10:26:22 +08:00
parent 4250ff26fe
commit 917a76da41
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java
View File

@ -41,7 +41,7 @@ public class PHDFileUtil {
//Collection Stop //Collection Stop
Date CollectionStop = DateUtils.parseDate(struct.collection_stop_date.replace(StringPool.SLASH,StringPool.DASH) + StringPool.SPACE + struct.collection_stop_time.substring(0, struct.collection_stop_time.indexOf(StringPool.DOT)), "yyyy-MM-dd HH:mm:ss"); Date CollectionStop = DateUtils.parseDate(struct.collection_stop_date.replace(StringPool.SLASH,StringPool.DASH) + StringPool.SPACE + struct.collection_stop_time.substring(0, struct.collection_stop_time.indexOf(StringPool.DOT)), "yyyy-MM-dd HH:mm:ss");
//Collection Time //Collection Time
String CollectionTime = String.format ("%.2f",Double.valueOf(CollectionStop.getTime() - CollectionStart.getTime()/ 1000)); String CollectionTime = String.format ("%.2f",Double.valueOf(CollectionStop.getTime()/1000 - CollectionStart.getTime()/ 1000));
//Acquisition Start //Acquisition Start
Date AcquisitionStart = DateUtils.parseDate(struct.acquisition_start_date.replace(StringPool.SLASH,StringPool.DASH) + StringPool.SPACE + struct.acquisition_start_time.substring(0, struct.acquisition_start_time.indexOf(StringPool.DOT)), "yyyy-MM-dd HH:mm:ss"); Date AcquisitionStart = DateUtils.parseDate(struct.acquisition_start_date.replace(StringPool.SLASH,StringPool.DASH) + StringPool.SPACE + struct.acquisition_start_time.substring(0, struct.acquisition_start_time.indexOf(StringPool.DOT)), "yyyy-MM-dd HH:mm:ss");
//Acq Real Time //Acq Real Time

2
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java
View File

@ -32,7 +32,7 @@ public class GammaController {
@GetMapping("gammaByFile") @GetMapping("gammaByFile")
public Result gammaByFile(@RequestParam Integer sampleId, public Result gammaByFile(@RequestParam Integer sampleId,
@RequestParam String dbName){ @RequestParam String dbName){
return spectrumAnalysisService.getDBSpectrumPie(dbName, sampleId); return spectrumAnalysisService.getDBSpectrumChart(dbName, sampleId);
} }
public static void main(String[] args) { public static void main(String[] args) {

2
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java
View File

@ -38,7 +38,7 @@ public class SpectrumAnalysesController {
@GetMapping("getDBSpectrumChart") @GetMapping("getDBSpectrumChart")
@ApiOperation(value = "查询折线图相关信息接口", notes = "查询折线图相关信息接口") @ApiOperation(value = "查询折线图相关信息接口", notes = "查询折线图相关信息接口")
public Result getDBSpectrumPie(String dbName, Integer sampleId){ public Result getDBSpectrumPie(String dbName, Integer sampleId){
return spectrumAnalysisService.getDBSpectrumPie(dbName, sampleId); return spectrumAnalysisService.getDBSpectrumChart(dbName, sampleId);
} }
} }

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

@ -18,24 +18,24 @@ public class SpectrumData implements Serializable {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date CollectionStart; private Date collectionStart;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date CollectionStop; private Date collectionStop;
private String CollectionTime; private String collectionTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date AcquisitionStart; private Date acquisitionStart;
private double AcquisitionRealTime; private double acquisitionRealTime;
private double AcquisitionLiveTime; private double acquisitionLiveTime;
private double AirVolume; private double airVolume;
private double XeVolume; private double xeVolume;
} }

2
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java
View File

@ -12,6 +12,6 @@ public interface ISpectrumAnalysisService {
Result getDBSpectrumList(QueryRequest queryRequest, GardsSampleData gardsSampleData, String dbName, String[] menuTypes, boolean CollectStop, boolean AcqStart, Date startDate, Date endDate); Result getDBSpectrumList(QueryRequest queryRequest, GardsSampleData gardsSampleData, String dbName, String[] menuTypes, boolean CollectStop, boolean AcqStart, Date startDate, Date endDate);
Result getDBSpectrumPie(String dbName, Integer sampleId); Result getDBSpectrumChart(String dbName, Integer sampleId);
} }

2
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java
View File

@ -134,7 +134,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
} }
@Override @Override
public Result getDBSpectrumPie(String dbName, Integer sampleId) { public Result getDBSpectrumChart(String dbName, Integer sampleId) {
Result result = new Result(); Result result = new Result();
Map<String, Map<String, Object>> resultMap = new HashMap<>(); Map<String, Map<String, Object>> resultMap = new HashMap<>();
if (redisUtil.hasKey("Spectrum_"+sampleId)){ if (redisUtil.hasKey("Spectrum_"+sampleId)){