添加查询台站数据提供率及有效率接口
This commit is contained in:
parent
1bb5e40bad
commit
fca0d24868
|
@ -6,6 +6,7 @@ import org.jeecg.common.api.vo.Result;
|
|||
import org.jeecg.modules.entity.data.PointVo;
|
||||
import org.jeecg.modules.entity.data.StationOperation;
|
||||
import org.jeecg.modules.service.IStationOperationService;
|
||||
import org.jeecg.modules.service.IStationProvisionEffService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
@ -24,6 +25,8 @@ public class StationOperationController {
|
|||
|
||||
@Autowired
|
||||
private IStationOperationService stationOperationService;
|
||||
@Autowired
|
||||
private IStationProvisionEffService stationProvisionEffService;
|
||||
|
||||
@GetMapping("findStationType")
|
||||
@ApiOperation(value = "查询台站/核设施类型", notes = "查询台站/核设施类型")
|
||||
|
@ -108,4 +111,12 @@ public class StationOperationController {
|
|||
return stationOperationService.getSelfStationGPS(stationCode, startDate, endDate);
|
||||
}
|
||||
|
||||
@GetMapping("getStationProvisionEff")
|
||||
@ApiOperation(value = "查询台站提供数据信息", notes = "查询台站提供数据信息")
|
||||
public Result getStationProvisionEff(Integer[] stationIds, @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
|
||||
|
||||
return stationProvisionEffService.getStationProvisionEff(stationIds, startTime, endTime);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -7,29 +7,63 @@ import java.io.Serializable;
|
|||
@Data
|
||||
public class Rate implements Serializable {
|
||||
|
||||
//数据提供数量
|
||||
private double phdfOfferedNumber;
|
||||
//数据有效数量
|
||||
private double phdfDataNumber;
|
||||
//数据提供率
|
||||
private double phdfOffered;
|
||||
|
||||
//数据有效率
|
||||
private double phdfEfficient;
|
||||
|
||||
|
||||
private double phdOfferedNumber;
|
||||
private double phdDataNumber;
|
||||
private double phdOffered;
|
||||
|
||||
private double phdEfficient;
|
||||
|
||||
|
||||
private double metOfferedNumber;
|
||||
private double metDataNumber;
|
||||
private double met;
|
||||
|
||||
private double metEfficient;
|
||||
|
||||
|
||||
|
||||
private double sohOfferedNumber;
|
||||
private double sohDataNumber;
|
||||
private double soh;
|
||||
|
||||
private double sohEfficient;
|
||||
|
||||
private double pmtOfferedNumber;
|
||||
private double pmtDataNumber;
|
||||
private double phdMetSoh;
|
||||
|
||||
private double pmtEfficient;
|
||||
|
||||
|
||||
public Rate() {
|
||||
phdfOfferedNumber=0;
|
||||
phdfDataNumber=0;
|
||||
phdfOffered = 0;
|
||||
phdfEfficient = 0;
|
||||
|
||||
phdOfferedNumber=0;
|
||||
phdDataNumber=0;
|
||||
phdOffered = 0;
|
||||
phdEfficient = 0;
|
||||
|
||||
metOfferedNumber=0;
|
||||
metDataNumber=0;
|
||||
met = 0;
|
||||
metEfficient=0;
|
||||
|
||||
sohOfferedNumber=0;
|
||||
sohDataNumber=0;
|
||||
soh = 0;
|
||||
sohEfficient=0;
|
||||
|
||||
pmtOfferedNumber=0;
|
||||
pmtDataNumber=0;
|
||||
phdMetSoh = 0;
|
||||
sohEfficient=0;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -0,0 +1,11 @@
|
|||
package org.jeecg.modules.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.modules.entity.data.StationOperation;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
public interface IStationProvisionEffService extends IService<StationOperation> {
|
||||
Result getStationProvisionEff(Integer[] stationIds, Date startTime, Date endTime);
|
||||
}
|
File diff suppressed because it is too large
Load Diff
|
@ -12,6 +12,7 @@ import org.jeecg.modules.base.enums.PageType;
|
|||
import org.jeecg.modules.entity.GardsDosDataWeb;
|
||||
import org.jeecg.modules.entity.GardsSampleDataWeb;
|
||||
import org.jeecg.modules.entity.GardsSohDataWeb;
|
||||
import org.jeecg.modules.feignclient.StationInfoService;
|
||||
import org.jeecg.modules.service.*;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
@ -49,6 +50,8 @@ public class WebStatisticsController {
|
|||
private IGardsDosDataService gardsDosDataService;
|
||||
@Autowired
|
||||
private IMenuNameService menuNameService;
|
||||
@Autowired
|
||||
private StationInfoService stationInfoService;
|
||||
|
||||
@GetMapping("findStationList")
|
||||
@ApiOperation(value = "根据菜单名称查询对应的台站信息", notes = "根据菜单名称查询对应的台站信息")
|
||||
|
@ -259,6 +262,12 @@ public class WebStatisticsController {
|
|||
gardsSampleDataWebService.exportNuclideStatistics(stationIds, systemType, dbName, nuclideNames, startDate, endDate, response);
|
||||
}
|
||||
|
||||
@GetMapping("findStationProvisionEfficiency")
|
||||
@ApiOperation(value="查询台站数据提供率及有效率",notes = "查询台站数据提供率及有效率")
|
||||
public Result findStationProvisionEfficiency( Integer[] stationIds, @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
|
||||
Result result=stationInfoService.getStationProvisionEff(stationIds,startTime,endTime);
|
||||
return result;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -0,0 +1,19 @@
|
|||
package org.jeecg.modules.feignclient;
|
||||
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Component
|
||||
@Service
|
||||
@FeignClient(value = "armd-station-operation",path = "/stationOperation")
|
||||
public interface StationInfoService {
|
||||
@GetMapping("/getStationProvisionEff")
|
||||
Result getStationProvisionEff(@RequestParam Integer[] stationIds,@RequestParam("startTime") @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime,@RequestParam("endTime") @DateTimeFormat(pattern = "yyyy-MM-dd")Date endTime);
|
||||
}
|
Loading…
Reference in New Issue
Block a user