app微服务模块查询台站运行管理接口，将app端与PC端无法共用的接口新增app端接口
app微服务模块查询报警模块相关接口，将app端与PC端无法共用的接口新增app端接口 app微服务模块查询人工交互模块相关接口，将app端与PC端无法共用的接口新增app端接口
This commit is contained in:
qiaoqinzheng
parent
8b891c9461
commit
c38584c138
|
|
@ -22,6 +22,12 @@ public class AlarmAnalysisLogController extends JeecgController<AlarmAnalysisLog
|
|||
return service.findPage(analysisLogVo);
|
||||
}
|
||||
|
||||
@ApiOperation(value="报警日志分页查询", notes="报警日志分页查询")
|
||||
@GetMapping(value = "findPageApp")
|
||||
public Result<?> findPageApp(@RequestParam AnalysisLogVo analysisLogVo) {
|
||||
return service.findPage(analysisLogVo);
|
||||
}
|
||||
|
||||
@ApiOperation(value="添加报警日志", notes="添加报警日志")
|
||||
@PostMapping(value = "add")
|
||||
public Result<?> add(@RequestBody AlarmAnalysisLog alarmAnalysisLog) {
|
||||
|
|
|
|||
|
|
@ -34,6 +34,13 @@ public class AlarmLogController {
|
|||
public Result findPage(@RequestBody AlarmVo alarmVo){
|
||||
return alarmLogService.findPage(alarmVo);
|
||||
}
|
||||
|
||||
@ApiOperation("分页查询报警日志信息")
|
||||
@PostMapping("findPageApp")
|
||||
public Result findPageApp(@RequestBody AlarmVo alarmVo){
|
||||
return alarmLogService.findPage(alarmVo);
|
||||
}
|
||||
|
||||
@ApiOperation("各类型报警量统计-饼图")
|
||||
@PostMapping("typeAlarms")
|
||||
public Result typeAlarms(@RequestBody AlarmVo alarmVo){
|
||||
|
|
|
|||
|
|
@ -27,6 +27,12 @@ public class SysDatabaseController {
|
|||
return sysDatabaseService.findPage(query);
|
||||
}
|
||||
|
||||
@GetMapping("findPageApp")
|
||||
@ApiOperation(value = "分页查询数据库配置信息", notes = "分页查询数据库配置信息")
|
||||
public Result<?> findPageApp(@RequestParam QueryRequest query){
|
||||
return sysDatabaseService.findPage(query);
|
||||
}
|
||||
|
||||
@GetMapping("findInfo")
|
||||
@ApiOperation(value = "查询数据库配置信息详情", notes = "查询数据库配置信息详情")
|
||||
public Result<?> findInfo(String id){
|
||||
|
|
|
|||
|
|
@ -27,6 +27,12 @@ public class SysEmailController {
|
|||
return sysEmailService.findPage(query);
|
||||
}
|
||||
|
||||
@GetMapping("findPageApp")
|
||||
@ApiOperation(value = "分页查询邮箱配置信息", notes = "分页查询邮箱配置信息")
|
||||
public Result findPageApp(@RequestParam QueryRequest query){
|
||||
return sysEmailService.findPage(query);
|
||||
}
|
||||
|
||||
@GetMapping("findInfo")
|
||||
@ApiOperation(value = "查询邮箱配置信息详情", notes = "查询邮箱配置信息详情")
|
||||
public Result findInfo(String id){
|
||||
|
|
|
|||
|
|
@ -28,6 +28,12 @@ public class SysServerController {
|
|||
return sysServerService.findPage(query);
|
||||
}
|
||||
|
||||
@GetMapping("findPageApp")
|
||||
@ApiOperation(value = "分页查询服务器数据", notes = "分页查询服务器数据")
|
||||
public Result findPageApp(@RequestParam QueryRequest query){
|
||||
return sysServerService.findPage(query);
|
||||
}
|
||||
|
||||
@GetMapping("findInfo")
|
||||
@ApiOperation(value = "服务器数据详情信息", notes = "服务器数据详情信息")
|
||||
public Result findInfo(@RequestParam String id){
|
||||
|
|
|
|||
|
|
@ -30,11 +30,11 @@ public class StationController {
|
|||
// /armd-station-operation/stationOperation/getDataReceivingStatus
|
||||
@GetMapping("/armd-station-operation/stationOperation/getDataReceivingStatus")
|
||||
@ApiOperation(value = "查询台站监测数据信息", notes = "查询台站监测数据信息")
|
||||
public Result getDataReceivingStatus(@RequestParam(required = false) String userId,@RequestParam(required = false) String oneStationId){
|
||||
public Result getDataReceivingStatus(@RequestParam(required = false) String userId, @RequestParam(required = false) Double cacheTime,@RequestParam(required = false) String oneStationId){
|
||||
if (StringUtils.isBlank(userId) && StringUtils.isBlank(oneStationId)) {
|
||||
return new Result();
|
||||
} else {
|
||||
return stationService.getDataReceivingStatus(userId, oneStationId);
|
||||
return stationService.getDataReceivingStatus(userId, cacheTime, oneStationId);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -15,18 +15,18 @@ import org.springframework.web.bind.annotation.RequestParam;
|
|||
@FeignClient(value = "armd-abnormal-alarm")
|
||||
public interface AlarmClient {
|
||||
|
||||
@GetMapping(value = "/alarmAnalysisLog/findPage")
|
||||
@GetMapping(value = "/alarmAnalysisLog/findPageApp")
|
||||
Result analysisLogFindPage(@RequestParam("analysisLogVo") AnalysisLogVo analysisLogVo);
|
||||
|
||||
@PostMapping(value = "/alarmLog/findPage")
|
||||
@PostMapping(value = "/alarmLog/findPageApp")
|
||||
Result alarmLogFindPage(@RequestBody AlarmVo alarmVo);
|
||||
|
||||
@GetMapping(value = "/sysEmail/findPage")
|
||||
@GetMapping(value = "/sysEmail/findPageApp")
|
||||
Result emailFindPage(@RequestParam("query") QueryRequest query);
|
||||
|
||||
@GetMapping(value = "/sysServer/findPage")
|
||||
@GetMapping(value = "/sysServer/findPageApp")
|
||||
Result serverFindPage(@RequestParam("query") QueryRequest query);
|
||||
|
||||
@GetMapping(value = "/sysDatabase/findPage")
|
||||
@GetMapping(value = "/sysDatabase/findPageApp")
|
||||
Result databaseFindPage(@RequestParam("query") QueryRequest query);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,22 +13,22 @@ import javax.servlet.http.HttpServletRequest;
|
|||
@FeignClient(value = "armd-spectrum-analysis")
|
||||
public interface AnalysisService {
|
||||
|
||||
@GetMapping("/spectrumAnalysis/getDBSpectrumChart")
|
||||
@GetMapping("/spectrumAnalysis/getDBSpectrumChartApp")
|
||||
Result getDBSpectrumChart(@RequestParam("dbName") String dbName, @RequestParam("sampleId") Integer sampleId, @RequestParam("analyst") String analyst,@RequestParam("request") HttpServletRequest request);
|
||||
|
||||
@DeleteMapping("/spectrumAnalysis/deleteSpectrumCacheData")
|
||||
@DeleteMapping("/spectrumAnalysis/deleteSpectrumCacheDataApp")
|
||||
void deleteSpectrumCacheData(@RequestParam("sampleFileName") String sampleFileName,@RequestParam("request") HttpServletRequest request);
|
||||
|
||||
@GetMapping("/gamma/gammaByDB")
|
||||
@GetMapping("/gamma/gammaByDBApp")
|
||||
Result gammaByDB(@RequestParam("sampleId") Integer sampleId,@RequestParam("dbName") String dbName,@RequestParam("analyst") String analyst,@RequestParam("request") HttpServletRequest request);
|
||||
|
||||
@DeleteMapping("/gamma/delPHDCache")
|
||||
@DeleteMapping("/gamma/delPHDCacheApp")
|
||||
void delPHDCache(@RequestParam("fileName") String fileName);
|
||||
|
||||
@GetMapping("/gamma/peakInformation")
|
||||
@GetMapping("/gamma/peakInformationApp")
|
||||
Result<?> peakInformation(@RequestParam("sampleId") Integer sampleId,@RequestParam("fileName") String fileName,@RequestParam("request") HttpServletRequest request);
|
||||
|
||||
@GetMapping("/gamma/getGammaSelPosNuclide")
|
||||
@GetMapping("/gamma/getGammaSelPosNuclideApp")
|
||||
Result getGammaSelPosNuclide(@RequestParam("sampleId") Integer sampleId,@RequestParam("fileName") String fileName,@RequestParam("channel") int channel,@RequestParam("energy") double energy,@RequestParam("request") HttpServletRequest request);
|
||||
|
||||
@GetMapping("/gamma/radionuclideActivity")
|
||||
|
|
|
|||
|
|
@ -17,22 +17,22 @@ public interface StationService {
|
|||
@GetMapping("/stationOperation/findStationType")
|
||||
List<String> findStationType();
|
||||
|
||||
@GetMapping("/stationOperation/getDataReceivingStatus")
|
||||
Result getDataReceivingStatus(@RequestParam String userId, @RequestParam String oneStationId);
|
||||
@GetMapping("/stationOperation/getDataReceivingStatusApp")
|
||||
Result getDataReceivingStatus(@RequestParam String userId,@RequestParam Double cacheTime, @RequestParam String oneStationId);
|
||||
|
||||
@GetMapping("/stationOperation/findList")
|
||||
@GetMapping("/stationOperation/findListApp")
|
||||
List<StationOperation> findStationOperationList(@RequestParam String status, @RequestParam String stationType);
|
||||
|
||||
@GetMapping("/stationOperation/getDataProvisionEfficiency")
|
||||
Result getDataProvisionEfficiency();
|
||||
|
||||
@GetMapping("/stationOperation/findInfo")
|
||||
@GetMapping("/stationOperation/findInfoApp")
|
||||
Result findInfo(@RequestParam String stationId,@RequestParam String type);
|
||||
|
||||
@GetMapping("/sysUserFocusStation/findList")
|
||||
List<SysUserFocusStationStation> findUserFocusStationList();
|
||||
|
||||
@GetMapping("/sysUserFocusStation/findUserFocusByUserId")
|
||||
@GetMapping("/sysUserFocusStation/findUserFocusByUserIdApp")
|
||||
Result findUserFocusByUserId(@RequestParam String userId);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,10 +40,17 @@ public class GammaController {
|
|||
}
|
||||
|
||||
@GetMapping("gammaByDB")
|
||||
@ApiOperation(value = "gamma页面loadFromDB加载数据", notes = "gamma页面loadFromDB加载数据")
|
||||
public Result gammaByDB(Integer sampleId, String dbName, String analyst, HttpServletRequest request){
|
||||
return gammaService.gammaByDB(dbName, sampleId, analyst, request);
|
||||
}
|
||||
|
||||
@GetMapping("gammaByDBApp")
|
||||
@ApiOperation(value = "gamma页面loadFromDB加载数据", notes = "gamma页面loadFromDB加载数据")
|
||||
public Result gammaByDBApp(@RequestParam Integer sampleId,@RequestParam String dbName,@RequestParam String analyst,@RequestParam HttpServletRequest request){
|
||||
return gammaService.gammaByDB(dbName, sampleId, analyst, request);
|
||||
}
|
||||
|
||||
@GetMapping("gammaByFile")
|
||||
@ApiOperation(value = "gamma页面loadFromFile加载数据", notes = "gamma页面loadFromFile加载数据")
|
||||
public Result gammaByFile(String fileName, HttpServletRequest request) {
|
||||
|
|
@ -56,6 +63,12 @@ public class GammaController {
|
|||
gammaService.delPHDCache(fileName);
|
||||
}
|
||||
|
||||
@DeleteMapping("delPHDCacheApp")
|
||||
@ApiOperation(value = "删除PHD文件缓存", notes = "删除PHD文件缓存")
|
||||
public void delPHDCacheApp(@RequestParam String fileName) {
|
||||
gammaService.delPHDCache(fileName);
|
||||
}
|
||||
|
||||
@GetMapping("loadSampleData")
|
||||
public Result loadSampleData(QueryRequest queryRequest, GardsSampleDataSpectrum gardsSampleData, String[] menuTypes, boolean AllUsers, boolean CollectStopB, boolean AcqStartB,
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate, HttpServletRequest request) {
|
||||
|
|
@ -135,6 +148,12 @@ public class GammaController {
|
|||
return gammaService.getGammaSelPosNuclide(sampleId, fileName, channel, energy, request);
|
||||
}
|
||||
|
||||
@GetMapping("getGammaSelPosNuclideApp")
|
||||
@ApiOperation(value = "gamma主页面选择channel加载对应核素信息接口", notes = "gamma主页面选择channel加载对应核素信息接口")
|
||||
public Result getGammaSelPosNuclideApp(@RequestParam Integer sampleId,@RequestParam String fileName,@RequestParam int channel,@RequestParam double energy,@RequestParam HttpServletRequest request) {
|
||||
return gammaService.getGammaSelPosNuclide(sampleId, fileName, channel, energy, request);
|
||||
}
|
||||
|
||||
@GetMapping("getSelPosNuclide")
|
||||
@ApiOperation(value = "InteractiveTool页面选择channel加载对应核素信息接口", notes = "InteractiveTool页面选择channel加载对应核素信息接口")
|
||||
public Result getSelPosNuclide(Integer sampleId, String fileName, int channel, HttpServletRequest request) {
|
||||
|
|
@ -401,6 +420,12 @@ public class GammaController {
|
|||
return gammaService.peakInformation(sampleId, fileName, request);
|
||||
}
|
||||
|
||||
@GetMapping("peakInformationApp")
|
||||
@ApiOperation(value = "查看Peak Information页面数据", notes = "查看Peak Information页面数据")
|
||||
public Result<?> peakInformationApp(@RequestParam Integer sampleId,@RequestParam String fileName,@RequestParam HttpServletRequest request){
|
||||
return gammaService.peakInformation(sampleId, fileName, request);
|
||||
}
|
||||
|
||||
@GetMapping("exportPeakInformation")
|
||||
public void exportPeakInformation(Integer sampleId, String fileName, HttpServletRequest request, HttpServletResponse response){
|
||||
gammaService.exportPeakInformation(sampleId, fileName, request, response);
|
||||
|
|
@ -434,6 +459,12 @@ public class GammaController {
|
|||
return gammaService.radionuclideActivity(sampleId, fileName, request);
|
||||
}
|
||||
|
||||
@GetMapping("radionuclideActivityApp")
|
||||
@ApiOperation(value = "查看Radionuclide Activity页面数据", notes = "查看Radionuclide Activity页面数据")
|
||||
public Result radionuclideActivityApp(@RequestParam Integer sampleId,@RequestParam String fileName,@RequestParam HttpServletRequest request) {
|
||||
return gammaService.radionuclideActivity(sampleId, fileName, request);
|
||||
}
|
||||
|
||||
@GetMapping("exportRadionuclideActivity")
|
||||
public void exportRadionuclideActivity(Integer sampleId, String fileName,
|
||||
String arTime, String crTime,
|
||||
|
|
|
|||
|
|
@ -55,6 +55,12 @@ public class SpectrumAnalysesController {
|
|||
return spectrumAnalysisService.getDBSpectrumChart(dbName, sampleId, analyst, request);
|
||||
}
|
||||
|
||||
@GetMapping("getDBSpectrumChartApp")
|
||||
@ApiOperation(value = "查询折线图相关信息接口", notes = "查询折线图相关信息接口")
|
||||
public Result getDBSpectrumChartApp(@RequestParam String dbName,@RequestParam Integer sampleId,@RequestParam String analyst,@RequestParam HttpServletRequest request) {
|
||||
return spectrumAnalysisService.getDBSpectrumChart(dbName, sampleId, analyst, request);
|
||||
}
|
||||
|
||||
@GetMapping("getFileSpectrumChart")
|
||||
@ApiOperation(value = "查询文件折线图相关信息接口", notes = "查询文件折线图相关信息接口")
|
||||
public Result getFileSpectrumChart(String sampleFileName, String gasFileName, String detFileName, String qcFileName, HttpServletRequest request) {
|
||||
|
|
@ -67,6 +73,12 @@ public class SpectrumAnalysesController {
|
|||
spectrumAnalysisService.deleteSpectrumCacheData(sampleFileName, request);
|
||||
}
|
||||
|
||||
@DeleteMapping("deleteSpectrumCacheDataApp")
|
||||
@ApiOperation(value = "删除缓存数据",notes = "删除缓存数据")
|
||||
public void deleteSpectrumCacheDataApp(@RequestParam String sampleFileName,@RequestParam HttpServletRequest request) {
|
||||
spectrumAnalysisService.deleteSpectrumCacheData(sampleFileName, request);
|
||||
}
|
||||
|
||||
@GetMapping("viewComment")
|
||||
@ApiOperation(value = "查看comment数据", notes = "查看comment数据")
|
||||
public Result viewComment(Integer sampleId, String sampleFileName, HttpServletRequest request) {
|
||||
|
|
|
|||
|
|
@ -37,6 +37,13 @@ public class StationOperationController {
|
|||
return result;
|
||||
}
|
||||
|
||||
@GetMapping("findListApp")
|
||||
@ApiOperation(value = "查询台站/核设施信息", notes = "查询台站/核设施信息")
|
||||
public List<StationOperation> findListApp(@RequestParam String status,@RequestParam String stationType){
|
||||
List<StationOperation> result = stationOperationService.findList(status, stationType);
|
||||
return result;
|
||||
}
|
||||
|
||||
@GetMapping("findInfo")
|
||||
@ApiOperation(value = "查询台站/核设施详情信息", notes = "查询台站/核设施详情信息")
|
||||
public Result findInfo(String stationId, String type){
|
||||
|
|
@ -44,6 +51,13 @@ public class StationOperationController {
|
|||
return result;
|
||||
}
|
||||
|
||||
@GetMapping("findInfoApp")
|
||||
@ApiOperation(value = "查询台站/核设施详情信息", notes = "查询台站/核设施详情信息")
|
||||
public Result findInfoApp(@RequestParam String stationId,@RequestParam String type){
|
||||
Result result = stationOperationService.findInfo(stationId, type);
|
||||
return result;
|
||||
}
|
||||
|
||||
@GetMapping("findTree")
|
||||
@ApiOperation(value = "查询台站树形结构", notes = "查询台站树形结构")
|
||||
public Result findTree(){
|
||||
|
|
@ -64,6 +78,11 @@ public class StationOperationController {
|
|||
return stationOperationService.getDataReceivingStatus(userId, cacheTime, oneStationId);
|
||||
}
|
||||
|
||||
@GetMapping("getDataReceivingStatusApp")
|
||||
@ApiOperation(value = "查询台站监测数据信息", notes = "查询台站监测数据信息")
|
||||
public Result getDataReceivingStatusApp(@RequestParam String userId,@RequestParam Double cacheTime,@RequestParam String oneStationId){
|
||||
return stationOperationService.getDataReceivingStatus(userId, cacheTime, oneStationId);
|
||||
}
|
||||
|
||||
@GetMapping("getDataProvisionEfficiency")
|
||||
@ApiOperation(value = "查询台站数据提供率及有效率", notes = "查询台站数据提供率及有效率")
|
||||
|
|
|
|||
|
|
@ -50,6 +50,11 @@ public class SysUserFocusStationController {
|
|||
return sysUserFocusStationService.findUserFocusByUserId(userId);
|
||||
}
|
||||
|
||||
@GetMapping("findUserFocusByUserIdApp")
|
||||
@ApiOperation(value = "根据用户id查询用户的缓存配置信息及关注台站信息", notes = "根据用户id查询用户的缓存配置信息及关注台站信息")
|
||||
public Result findUserFocusByUserIdApp(@RequestParam String userId){
|
||||
return sysUserFocusStationService.findUserFocusByUserId(userId);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user