diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java index a18d759..6215b77 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java @@ -71,7 +71,7 @@ @ApiOperation("psd导出4列数据接口,需传taskId;psdX1,psdX2为框选psd横坐标的起止值") @GetMapping("/psdExport") @ResponseBody - public void psdExport(Long taskId, Long psdX1, Long psdX2, HttpServletResponse response) { + public void ort(Long taskId, Long psdX1, Long psdX2, HttpServletResponse response) { iPsdService.psdExport(taskId, psdX1, psdX2, response); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java index a18d759..6215b77 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java @@ -71,7 +71,7 @@ @ApiOperation("psd导出4列数据接口,需传taskId;psdX1,psdX2为框选psd横坐标的起止值") @GetMapping("/psdExport") @ResponseBody - public void psdExport(Long taskId, Long psdX1, Long psdX2, HttpServletResponse response) { + public void ort(Long taskId, Long psdX1, Long psdX2, HttpServletResponse response) { iPsdService.psdExport(taskId, psdX1, psdX2, response); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java index bdfc2d0..d7736a5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java @@ -148,7 +148,7 @@ public void insertPsdAlarms() { times++; //先查询正在巡检任务信息 - List taskInfoList = iTaskInfoService.getTaskListByStatus(0, 1, 1); + List taskInfoList = iTaskInfoService.getTaskListByStatus(0, 1, 2); List alarmRecordList = new ArrayList<>(); long currentTimes = System.currentTimeMillis();