diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java index ec75b52..3b4b676 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -24,14 +24,9 @@ @RequestMapping("/config") public class DetectorConfigController extends BaseController { - @Autowired private IDetectorConfigService configService; - - /** - * 获取下发参数日志列表 - */ @ApiOperation("根据探测仪id获取下发参数列表") @PostMapping(value = "/list") @ResponseBody @@ -42,21 +37,6 @@ return ResponseDataDTO.success(configService.list(queryWrapper)); } -// /** -// * 获取下发参数日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = configService.selectPage(page,query); -// return super.packForBT(page); -// } - - /** - * 新增下发参数日志 - */ @ApiOperation("保存参数") @PostMapping(value = "/addConfig") @ResponseBody @@ -64,56 +44,10 @@ return ResponseDataDTO.success(configService.save(config)); } - /** - * 下发参数 - */ @ApiOperation("下发参数") @PostMapping(value = "/sendConfig") @ResponseBody public ResponseDataDTO sendConfig(DetectorConfig config) { return ResponseDataDTO.success(configService.sendConfig(config)); } -// -// /** -// * 删除下发参数日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @PostMapping(value = "/detail/{configId}") -// @ResponseBody -// public Object detail(@PathVariable("configId") String configId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(configService.selectById(configId)); -// return resultData; -// } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java index ec75b52..3b4b676 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -24,14 +24,9 @@ @RequestMapping("/config") public class DetectorConfigController extends BaseController { - @Autowired private IDetectorConfigService configService; - - /** - * 获取下发参数日志列表 - */ @ApiOperation("根据探测仪id获取下发参数列表") @PostMapping(value = "/list") @ResponseBody @@ -42,21 +37,6 @@ return ResponseDataDTO.success(configService.list(queryWrapper)); } -// /** -// * 获取下发参数日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = configService.selectPage(page,query); -// return super.packForBT(page); -// } - - /** - * 新增下发参数日志 - */ @ApiOperation("保存参数") @PostMapping(value = "/addConfig") @ResponseBody @@ -64,56 +44,10 @@ return ResponseDataDTO.success(configService.save(config)); } - /** - * 下发参数 - */ @ApiOperation("下发参数") @PostMapping(value = "/sendConfig") @ResponseBody public ResponseDataDTO sendConfig(DetectorConfig config) { return ResponseDataDTO.success(configService.sendConfig(config)); } -// -// /** -// * 删除下发参数日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @PostMapping(value = "/detail/{configId}") -// @ResponseBody -// public Object detail(@PathVariable("configId") String configId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(configService.selectById(configId)); -// return resultData; -// } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java index 64278d3..122ad9b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -26,10 +26,6 @@ @Autowired private IDetectorLogService logService; - - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/list") @ResponseBody @ApiOperation("根据探测仪id获取升降压操作列表") @@ -40,78 +36,10 @@ return ResponseDataDTO.success(logService.list(queryWrapper)); } - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/getLastRecord") @ResponseBody @ApiOperation("根据探测仪id获取升降压最新记录") public Object getLastRecord(Long detectorId) { return ResponseDataDTO.success(logService.getLastRecord(detectorId)); } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = logService.selectPage(page,query); -// return super.packForBT(page); -// } - -// /** -// * 新增升降压操作日志 -// */ -// @PostMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @PostMapping(value = "/detail/{logId}") -// @ResponseBody -// public Object detail(@PathVariable("logId") String logId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(logService.selectById(logId)); -// return resultData; -// } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java index ec75b52..3b4b676 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -24,14 +24,9 @@ @RequestMapping("/config") public class DetectorConfigController extends BaseController { - @Autowired private IDetectorConfigService configService; - - /** - * 获取下发参数日志列表 - */ @ApiOperation("根据探测仪id获取下发参数列表") @PostMapping(value = "/list") @ResponseBody @@ -42,21 +37,6 @@ return ResponseDataDTO.success(configService.list(queryWrapper)); } -// /** -// * 获取下发参数日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = configService.selectPage(page,query); -// return super.packForBT(page); -// } - - /** - * 新增下发参数日志 - */ @ApiOperation("保存参数") @PostMapping(value = "/addConfig") @ResponseBody @@ -64,56 +44,10 @@ return ResponseDataDTO.success(configService.save(config)); } - /** - * 下发参数 - */ @ApiOperation("下发参数") @PostMapping(value = "/sendConfig") @ResponseBody public ResponseDataDTO sendConfig(DetectorConfig config) { return ResponseDataDTO.success(configService.sendConfig(config)); } -// -// /** -// * 删除下发参数日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @PostMapping(value = "/detail/{configId}") -// @ResponseBody -// public Object detail(@PathVariable("configId") String configId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(configService.selectById(configId)); -// return resultData; -// } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java index 64278d3..122ad9b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -26,10 +26,6 @@ @Autowired private IDetectorLogService logService; - - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/list") @ResponseBody @ApiOperation("根据探测仪id获取升降压操作列表") @@ -40,78 +36,10 @@ return ResponseDataDTO.success(logService.list(queryWrapper)); } - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/getLastRecord") @ResponseBody @ApiOperation("根据探测仪id获取升降压最新记录") public Object getLastRecord(Long detectorId) { return ResponseDataDTO.success(logService.getLastRecord(detectorId)); } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = logService.selectPage(page,query); -// return super.packForBT(page); -// } - -// /** -// * 新增升降压操作日志 -// */ -// @PostMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @PostMapping(value = "/detail/{logId}") -// @ResponseBody -// public Object detail(@PathVariable("logId") String logId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(logService.selectById(logId)); -// return resultData; -// } } 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 d560517..4d738a4 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 @@ -27,11 +27,6 @@ @Autowired private IPsdService iPsdService; - /** - * 中子源控制 - * - * @param command 控制指令类型（start-加压开始工作，stop-退高压，停止工作） - */ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @PostMapping("/control") @ResponseBody @@ -49,7 +44,6 @@ return ResponseDataDTO.success(iPsdService.getPsdAlarm(taskId)); } - @ApiOperation("控制台曲线显示,需传taskId") @PostMapping("/dataList") @ResponseBody @@ -62,7 +56,6 @@ @PostMapping("/hsList") @ResponseBody public ResponseDataDTO hsList(HsRequest request) { - return ResponseDataDTO.success(neutronOptService.hsList(request.getDetectorId(), request.getType(), request.getX1(), @@ -70,6 +63,4 @@ request.getX3(), request.getX4())); } - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java index ec75b52..3b4b676 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -24,14 +24,9 @@ @RequestMapping("/config") public class DetectorConfigController extends BaseController { - @Autowired private IDetectorConfigService configService; - - /** - * 获取下发参数日志列表 - */ @ApiOperation("根据探测仪id获取下发参数列表") @PostMapping(value = "/list") @ResponseBody @@ -42,21 +37,6 @@ return ResponseDataDTO.success(configService.list(queryWrapper)); } -// /** -// * 获取下发参数日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = configService.selectPage(page,query); -// return super.packForBT(page); -// } - - /** - * 新增下发参数日志 - */ @ApiOperation("保存参数") @PostMapping(value = "/addConfig") @ResponseBody @@ -64,56 +44,10 @@ return ResponseDataDTO.success(configService.save(config)); } - /** - * 下发参数 - */ @ApiOperation("下发参数") @PostMapping(value = "/sendConfig") @ResponseBody public ResponseDataDTO sendConfig(DetectorConfig config) { return ResponseDataDTO.success(configService.sendConfig(config)); } -// -// /** -// * 删除下发参数日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @PostMapping(value = "/detail/{configId}") -// @ResponseBody -// public Object detail(@PathVariable("configId") String configId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(configService.selectById(configId)); -// return resultData; -// } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java index 64278d3..122ad9b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -26,10 +26,6 @@ @Autowired private IDetectorLogService logService; - - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/list") @ResponseBody @ApiOperation("根据探测仪id获取升降压操作列表") @@ -40,78 +36,10 @@ return ResponseDataDTO.success(logService.list(queryWrapper)); } - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/getLastRecord") @ResponseBody @ApiOperation("根据探测仪id获取升降压最新记录") public Object getLastRecord(Long detectorId) { return ResponseDataDTO.success(logService.getLastRecord(detectorId)); } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = logService.selectPage(page,query); -// return super.packForBT(page); -// } - -// /** -// * 新增升降压操作日志 -// */ -// @PostMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @PostMapping(value = "/detail/{logId}") -// @ResponseBody -// public Object detail(@PathVariable("logId") String logId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(logService.selectById(logId)); -// return resultData; -// } } 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 d560517..4d738a4 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 @@ -27,11 +27,6 @@ @Autowired private IPsdService iPsdService; - /** - * 中子源控制 - * - * @param command 控制指令类型（start-加压开始工作，stop-退高压，停止工作） - */ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @PostMapping("/control") @ResponseBody @@ -49,7 +44,6 @@ return ResponseDataDTO.success(iPsdService.getPsdAlarm(taskId)); } - @ApiOperation("控制台曲线显示,需传taskId") @PostMapping("/dataList") @ResponseBody @@ -62,7 +56,6 @@ @PostMapping("/hsList") @ResponseBody public ResponseDataDTO hsList(HsRequest request) { - return ResponseDataDTO.success(neutronOptService.hsList(request.getDetectorId(), request.getType(), request.getX1(), @@ -70,6 +63,4 @@ request.getX3(), request.getX4())); } - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java index 32a300d..45ad573 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IPsdService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,81 +14,4 @@ @RequestMapping("/psd") public class PsdController extends BaseController { - - @Autowired - private IPsdService psdService; - - -// /** -// * 获取探测器PSD数据列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return psdService.selectList(null); -// } -// -// /** -// * 获取探测器PSD数据分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = psdService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增探测器PSD数据 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Psd psd) { -// psdService.insert(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除探测器PSD数据 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String psdId) { -// psdService.deleteById(psdId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("psdIds") List psdIds) { -// psdService.deleteBatchIds(psdIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改探测器PSD数据 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Psd psd) { -// psdService.updateById(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 探测器PSD数据详情 -// */ -// @RequestMapping(value = "/detail/{psdId}") -// @ResponseBody -// public Object detail(@PathVariable("psdId") String psdId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(psdService.selectById(psdId)); -// return resultData; -// } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java index ec75b52..3b4b676 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -24,14 +24,9 @@ @RequestMapping("/config") public class DetectorConfigController extends BaseController { - @Autowired private IDetectorConfigService configService; - - /** - * 获取下发参数日志列表 - */ @ApiOperation("根据探测仪id获取下发参数列表") @PostMapping(value = "/list") @ResponseBody @@ -42,21 +37,6 @@ return ResponseDataDTO.success(configService.list(queryWrapper)); } -// /** -// * 获取下发参数日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = configService.selectPage(page,query); -// return super.packForBT(page); -// } - - /** - * 新增下发参数日志 - */ @ApiOperation("保存参数") @PostMapping(value = "/addConfig") @ResponseBody @@ -64,56 +44,10 @@ return ResponseDataDTO.success(configService.save(config)); } - /** - * 下发参数 - */ @ApiOperation("下发参数") @PostMapping(value = "/sendConfig") @ResponseBody public ResponseDataDTO sendConfig(DetectorConfig config) { return ResponseDataDTO.success(configService.sendConfig(config)); } -// -// /** -// * 删除下发参数日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @PostMapping(value = "/detail/{configId}") -// @ResponseBody -// public Object detail(@PathVariable("configId") String configId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(configService.selectById(configId)); -// return resultData; -// } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java index 64278d3..122ad9b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -26,10 +26,6 @@ @Autowired private IDetectorLogService logService; - - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/list") @ResponseBody @ApiOperation("根据探测仪id获取升降压操作列表") @@ -40,78 +36,10 @@ return ResponseDataDTO.success(logService.list(queryWrapper)); } - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/getLastRecord") @ResponseBody @ApiOperation("根据探测仪id获取升降压最新记录") public Object getLastRecord(Long detectorId) { return ResponseDataDTO.success(logService.getLastRecord(detectorId)); } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = logService.selectPage(page,query); -// return super.packForBT(page); -// } - -// /** -// * 新增升降压操作日志 -// */ -// @PostMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @PostMapping(value = "/detail/{logId}") -// @ResponseBody -// public Object detail(@PathVariable("logId") String logId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(logService.selectById(logId)); -// return resultData; -// } } 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 d560517..4d738a4 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 @@ -27,11 +27,6 @@ @Autowired private IPsdService iPsdService; - /** - * 中子源控制 - * - * @param command 控制指令类型（start-加压开始工作，stop-退高压，停止工作） - */ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @PostMapping("/control") @ResponseBody @@ -49,7 +44,6 @@ return ResponseDataDTO.success(iPsdService.getPsdAlarm(taskId)); } - @ApiOperation("控制台曲线显示,需传taskId") @PostMapping("/dataList") @ResponseBody @@ -62,7 +56,6 @@ @PostMapping("/hsList") @ResponseBody public ResponseDataDTO hsList(HsRequest request) { - return ResponseDataDTO.success(neutronOptService.hsList(request.getDetectorId(), request.getType(), request.getX1(), @@ -70,6 +63,4 @@ request.getX3(), request.getX4())); } - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java index 32a300d..45ad573 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IPsdService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,81 +14,4 @@ @RequestMapping("/psd") public class PsdController extends BaseController { - - @Autowired - private IPsdService psdService; - - -// /** -// * 获取探测器PSD数据列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return psdService.selectList(null); -// } -// -// /** -// * 获取探测器PSD数据分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = psdService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增探测器PSD数据 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Psd psd) { -// psdService.insert(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除探测器PSD数据 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String psdId) { -// psdService.deleteById(psdId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("psdIds") List psdIds) { -// psdService.deleteBatchIds(psdIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改探测器PSD数据 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Psd psd) { -// psdService.updateById(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 探测器PSD数据详情 -// */ -// @RequestMapping(value = "/detail/{psdId}") -// @ResponseBody -// public Object detail(@PathVariable("psdId") String psdId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(psdService.selectById(psdId)); -// return resultData; -// } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java index c9d0ca8..88640fc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IVolService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,10 +14,4 @@ @RequestMapping("/vol") public class VolController extends BaseController { - - @Autowired - private IVolService volService; - - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java index ec75b52..3b4b676 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -24,14 +24,9 @@ @RequestMapping("/config") public class DetectorConfigController extends BaseController { - @Autowired private IDetectorConfigService configService; - - /** - * 获取下发参数日志列表 - */ @ApiOperation("根据探测仪id获取下发参数列表") @PostMapping(value = "/list") @ResponseBody @@ -42,21 +37,6 @@ return ResponseDataDTO.success(configService.list(queryWrapper)); } -// /** -// * 获取下发参数日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = configService.selectPage(page,query); -// return super.packForBT(page); -// } - - /** - * 新增下发参数日志 - */ @ApiOperation("保存参数") @PostMapping(value = "/addConfig") @ResponseBody @@ -64,56 +44,10 @@ return ResponseDataDTO.success(configService.save(config)); } - /** - * 下发参数 - */ @ApiOperation("下发参数") @PostMapping(value = "/sendConfig") @ResponseBody public ResponseDataDTO sendConfig(DetectorConfig config) { return ResponseDataDTO.success(configService.sendConfig(config)); } -// -// /** -// * 删除下发参数日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @PostMapping(value = "/detail/{configId}") -// @ResponseBody -// public Object detail(@PathVariable("configId") String configId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(configService.selectById(configId)); -// return resultData; -// } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java index 64278d3..122ad9b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -26,10 +26,6 @@ @Autowired private IDetectorLogService logService; - - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/list") @ResponseBody @ApiOperation("根据探测仪id获取升降压操作列表") @@ -40,78 +36,10 @@ return ResponseDataDTO.success(logService.list(queryWrapper)); } - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/getLastRecord") @ResponseBody @ApiOperation("根据探测仪id获取升降压最新记录") public Object getLastRecord(Long detectorId) { return ResponseDataDTO.success(logService.getLastRecord(detectorId)); } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = logService.selectPage(page,query); -// return super.packForBT(page); -// } - -// /** -// * 新增升降压操作日志 -// */ -// @PostMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @PostMapping(value = "/detail/{logId}") -// @ResponseBody -// public Object detail(@PathVariable("logId") String logId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(logService.selectById(logId)); -// return resultData; -// } } 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 d560517..4d738a4 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 @@ -27,11 +27,6 @@ @Autowired private IPsdService iPsdService; - /** - * 中子源控制 - * - * @param command 控制指令类型（start-加压开始工作，stop-退高压，停止工作） - */ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @PostMapping("/control") @ResponseBody @@ -49,7 +44,6 @@ return ResponseDataDTO.success(iPsdService.getPsdAlarm(taskId)); } - @ApiOperation("控制台曲线显示,需传taskId") @PostMapping("/dataList") @ResponseBody @@ -62,7 +56,6 @@ @PostMapping("/hsList") @ResponseBody public ResponseDataDTO hsList(HsRequest request) { - return ResponseDataDTO.success(neutronOptService.hsList(request.getDetectorId(), request.getType(), request.getX1(), @@ -70,6 +63,4 @@ request.getX3(), request.getX4())); } - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java index 32a300d..45ad573 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IPsdService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,81 +14,4 @@ @RequestMapping("/psd") public class PsdController extends BaseController { - - @Autowired - private IPsdService psdService; - - -// /** -// * 获取探测器PSD数据列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return psdService.selectList(null); -// } -// -// /** -// * 获取探测器PSD数据分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = psdService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增探测器PSD数据 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Psd psd) { -// psdService.insert(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除探测器PSD数据 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String psdId) { -// psdService.deleteById(psdId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("psdIds") List psdIds) { -// psdService.deleteBatchIds(psdIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改探测器PSD数据 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Psd psd) { -// psdService.updateById(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 探测器PSD数据详情 -// */ -// @RequestMapping(value = "/detail/{psdId}") -// @ResponseBody -// public Object detail(@PathVariable("psdId") String psdId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(psdService.selectById(psdId)); -// return resultData; -// } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java index c9d0ca8..88640fc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IVolService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,10 +14,4 @@ @RequestMapping("/vol") public class VolController extends BaseController { - - @Autowired - private IVolService volService; - - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java index 462f31a..9c69d3c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java @@ -23,4 +23,6 @@ List hsList(Long detectorId,String type); + void insertPsdAlarms(); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java index ec75b52..3b4b676 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -24,14 +24,9 @@ @RequestMapping("/config") public class DetectorConfigController extends BaseController { - @Autowired private IDetectorConfigService configService; - - /** - * 获取下发参数日志列表 - */ @ApiOperation("根据探测仪id获取下发参数列表") @PostMapping(value = "/list") @ResponseBody @@ -42,21 +37,6 @@ return ResponseDataDTO.success(configService.list(queryWrapper)); } -// /** -// * 获取下发参数日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = configService.selectPage(page,query); -// return super.packForBT(page); -// } - - /** - * 新增下发参数日志 - */ @ApiOperation("保存参数") @PostMapping(value = "/addConfig") @ResponseBody @@ -64,56 +44,10 @@ return ResponseDataDTO.success(configService.save(config)); } - /** - * 下发参数 - */ @ApiOperation("下发参数") @PostMapping(value = "/sendConfig") @ResponseBody public ResponseDataDTO sendConfig(DetectorConfig config) { return ResponseDataDTO.success(configService.sendConfig(config)); } -// -// /** -// * 删除下发参数日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @PostMapping(value = "/detail/{configId}") -// @ResponseBody -// public Object detail(@PathVariable("configId") String configId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(configService.selectById(configId)); -// return resultData; -// } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java index 64278d3..122ad9b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -26,10 +26,6 @@ @Autowired private IDetectorLogService logService; - - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/list") @ResponseBody @ApiOperation("根据探测仪id获取升降压操作列表") @@ -40,78 +36,10 @@ return ResponseDataDTO.success(logService.list(queryWrapper)); } - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/getLastRecord") @ResponseBody @ApiOperation("根据探测仪id获取升降压最新记录") public Object getLastRecord(Long detectorId) { return ResponseDataDTO.success(logService.getLastRecord(detectorId)); } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = logService.selectPage(page,query); -// return super.packForBT(page); -// } - -// /** -// * 新增升降压操作日志 -// */ -// @PostMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @PostMapping(value = "/detail/{logId}") -// @ResponseBody -// public Object detail(@PathVariable("logId") String logId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(logService.selectById(logId)); -// return resultData; -// } } 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 d560517..4d738a4 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 @@ -27,11 +27,6 @@ @Autowired private IPsdService iPsdService; - /** - * 中子源控制 - * - * @param command 控制指令类型（start-加压开始工作，stop-退高压，停止工作） - */ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @PostMapping("/control") @ResponseBody @@ -49,7 +44,6 @@ return ResponseDataDTO.success(iPsdService.getPsdAlarm(taskId)); } - @ApiOperation("控制台曲线显示,需传taskId") @PostMapping("/dataList") @ResponseBody @@ -62,7 +56,6 @@ @PostMapping("/hsList") @ResponseBody public ResponseDataDTO hsList(HsRequest request) { - return ResponseDataDTO.success(neutronOptService.hsList(request.getDetectorId(), request.getType(), request.getX1(), @@ -70,6 +63,4 @@ request.getX3(), request.getX4())); } - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java index 32a300d..45ad573 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IPsdService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,81 +14,4 @@ @RequestMapping("/psd") public class PsdController extends BaseController { - - @Autowired - private IPsdService psdService; - - -// /** -// * 获取探测器PSD数据列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return psdService.selectList(null); -// } -// -// /** -// * 获取探测器PSD数据分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = psdService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增探测器PSD数据 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Psd psd) { -// psdService.insert(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除探测器PSD数据 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String psdId) { -// psdService.deleteById(psdId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("psdIds") List psdIds) { -// psdService.deleteBatchIds(psdIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改探测器PSD数据 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Psd psd) { -// psdService.updateById(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 探测器PSD数据详情 -// */ -// @RequestMapping(value = "/detail/{psdId}") -// @ResponseBody -// public Object detail(@PathVariable("psdId") String psdId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(psdService.selectById(psdId)); -// return resultData; -// } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java index c9d0ca8..88640fc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IVolService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,10 +14,4 @@ @RequestMapping("/vol") public class VolController extends BaseController { - - @Autowired - private IVolService volService; - - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java index 462f31a..9c69d3c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java @@ -23,4 +23,6 @@ List hsList(Long detectorId,String type); + void insertPsdAlarms(); + } 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 f1adc1e..79193f9 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 @@ -10,15 +10,18 @@ import com.casic.missiles.modular.neutron.dto.PsdDataDTO; import com.casic.missiles.modular.neutron.model.Psd; import com.casic.missiles.modular.neutron.service.IPsdService; +import com.casic.missiles.modular.robot.model.AlarmRecord; import com.casic.missiles.modular.robot.model.RobotInfo; import com.casic.missiles.modular.robot.model.RobotTrajectoryInfo; import com.casic.missiles.modular.robot.model.TaskInfo; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; import com.casic.missiles.modular.robot.service.IRobotInfoService; import com.casic.missiles.modular.robot.service.IRobotTrajectoryInfoService; import com.casic.missiles.modular.robot.service.ITaskInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -42,6 +45,8 @@ private AbstractDictService dictService; @Autowired private IRobotInfoService robotInfoService; + @Autowired + private IAlarmRecordService iAlarmRecordService; @Override @@ -58,7 +63,7 @@ long countX = DateUtil.between(DateUtil.parseDateTime(last.getTimeCount()), DateUtil.parseDateTime(startTime), DateUnit.SECOND, true); for (int i = 0; i <= countX / 5; i++) { if (i == 0) { - psdDataDTOS.add(new PsdDataDTO("0", "0")); + psdDataDTOS.add(new PsdDataDTO("0", "0")); continue; } int countY = 0; @@ -74,7 +79,7 @@ } } } - psdDataDTO.setValueCount(String.format("%.2f",countY*1.00 / 5)); + psdDataDTO.setValueCount(String.format("%.2f", countY * 1.00 / 5)); psdDataDTOS.add(psdDataDTO); } } @@ -112,7 +117,40 @@ } @Override - public List hsList(Long detectorId,String type) { + public List hsList(Long detectorId, String type) { return null; } + + @Override + public void insertPsdAlarms() { + + //先查询正在巡检任务信息 + List taskInfoList = iTaskInfoService.getTaskListByStatus(0, 1, 1); + List alarmRecordList = new ArrayList<>(); + + for (TaskInfo taskInfo : taskInfoList) { + if (iAlarmRecordService.getAlarmByTask(taskInfo.getId())) continue; + String startTime = ObjectUtil.isNotEmpty(taskInfo.getStartTime()) ? DateUtil.formatDateTime(taskInfo.getStartTime()) : taskInfo.getStartTime() + ""; + Long robotId = taskInfo.getRobotId(); + //查询满足13个中子的时间 + List alarmTimeList = this.baseMapper.getPsdAlarm(startTime, robotId); + if (ObjectUtil.isNotEmpty(alarmTimeList) && alarmTimeList.size() >= 13) { + String alarmTime = alarmTimeList.get(12); + AlarmRecord alarmRecord = new AlarmRecord(robotId, + new BigDecimal(13), + DateUtil.parseDateTime(alarmTime), + taskInfo.getId()); + //用这个时间取查询最近的巡检点位 + RobotTrajectoryInfo trajectoryInfo = trajectoryInfoService.getRobotTrajectoryInfoByTime(alarmTime, robotId); + if (ObjectUtil.isNotEmpty(trajectoryInfo)) { + alarmRecord.setX(trajectoryInfo.getPostionX()); + alarmRecord.setY(trajectoryInfo.getPostionY()); + } + alarmRecordList.add(alarmRecord); + } + } + if (null != alarmRecordList && alarmRecordList.size() > 0) { + iAlarmRecordService.saveBatch(alarmRecordList); + } + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java index ec75b52..3b4b676 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -24,14 +24,9 @@ @RequestMapping("/config") public class DetectorConfigController extends BaseController { - @Autowired private IDetectorConfigService configService; - - /** - * 获取下发参数日志列表 - */ @ApiOperation("根据探测仪id获取下发参数列表") @PostMapping(value = "/list") @ResponseBody @@ -42,21 +37,6 @@ return ResponseDataDTO.success(configService.list(queryWrapper)); } -// /** -// * 获取下发参数日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = configService.selectPage(page,query); -// return super.packForBT(page); -// } - - /** - * 新增下发参数日志 - */ @ApiOperation("保存参数") @PostMapping(value = "/addConfig") @ResponseBody @@ -64,56 +44,10 @@ return ResponseDataDTO.success(configService.save(config)); } - /** - * 下发参数 - */ @ApiOperation("下发参数") @PostMapping(value = "/sendConfig") @ResponseBody public ResponseDataDTO sendConfig(DetectorConfig config) { return ResponseDataDTO.success(configService.sendConfig(config)); } -// -// /** -// * 删除下发参数日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @PostMapping(value = "/detail/{configId}") -// @ResponseBody -// public Object detail(@PathVariable("configId") String configId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(configService.selectById(configId)); -// return resultData; -// } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java index 64278d3..122ad9b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -26,10 +26,6 @@ @Autowired private IDetectorLogService logService; - - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/list") @ResponseBody @ApiOperation("根据探测仪id获取升降压操作列表") @@ -40,78 +36,10 @@ return ResponseDataDTO.success(logService.list(queryWrapper)); } - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/getLastRecord") @ResponseBody @ApiOperation("根据探测仪id获取升降压最新记录") public Object getLastRecord(Long detectorId) { return ResponseDataDTO.success(logService.getLastRecord(detectorId)); } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = logService.selectPage(page,query); -// return super.packForBT(page); -// } - -// /** -// * 新增升降压操作日志 -// */ -// @PostMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @PostMapping(value = "/detail/{logId}") -// @ResponseBody -// public Object detail(@PathVariable("logId") String logId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(logService.selectById(logId)); -// return resultData; -// } } 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 d560517..4d738a4 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 @@ -27,11 +27,6 @@ @Autowired private IPsdService iPsdService; - /** - * 中子源控制 - * - * @param command 控制指令类型（start-加压开始工作，stop-退高压，停止工作） - */ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @PostMapping("/control") @ResponseBody @@ -49,7 +44,6 @@ return ResponseDataDTO.success(iPsdService.getPsdAlarm(taskId)); } - @ApiOperation("控制台曲线显示,需传taskId") @PostMapping("/dataList") @ResponseBody @@ -62,7 +56,6 @@ @PostMapping("/hsList") @ResponseBody public ResponseDataDTO hsList(HsRequest request) { - return ResponseDataDTO.success(neutronOptService.hsList(request.getDetectorId(), request.getType(), request.getX1(), @@ -70,6 +63,4 @@ request.getX3(), request.getX4())); } - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java index 32a300d..45ad573 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IPsdService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,81 +14,4 @@ @RequestMapping("/psd") public class PsdController extends BaseController { - - @Autowired - private IPsdService psdService; - - -// /** -// * 获取探测器PSD数据列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return psdService.selectList(null); -// } -// -// /** -// * 获取探测器PSD数据分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = psdService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增探测器PSD数据 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Psd psd) { -// psdService.insert(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除探测器PSD数据 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String psdId) { -// psdService.deleteById(psdId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("psdIds") List psdIds) { -// psdService.deleteBatchIds(psdIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改探测器PSD数据 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Psd psd) { -// psdService.updateById(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 探测器PSD数据详情 -// */ -// @RequestMapping(value = "/detail/{psdId}") -// @ResponseBody -// public Object detail(@PathVariable("psdId") String psdId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(psdService.selectById(psdId)); -// return resultData; -// } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java index c9d0ca8..88640fc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IVolService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,10 +14,4 @@ @RequestMapping("/vol") public class VolController extends BaseController { - - @Autowired - private IVolService volService; - - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java index 462f31a..9c69d3c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java @@ -23,4 +23,6 @@ List hsList(Long detectorId,String type); + void insertPsdAlarms(); + } 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 f1adc1e..79193f9 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 @@ -10,15 +10,18 @@ import com.casic.missiles.modular.neutron.dto.PsdDataDTO; import com.casic.missiles.modular.neutron.model.Psd; import com.casic.missiles.modular.neutron.service.IPsdService; +import com.casic.missiles.modular.robot.model.AlarmRecord; import com.casic.missiles.modular.robot.model.RobotInfo; import com.casic.missiles.modular.robot.model.RobotTrajectoryInfo; import com.casic.missiles.modular.robot.model.TaskInfo; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; import com.casic.missiles.modular.robot.service.IRobotInfoService; import com.casic.missiles.modular.robot.service.IRobotTrajectoryInfoService; import com.casic.missiles.modular.robot.service.ITaskInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -42,6 +45,8 @@ private AbstractDictService dictService; @Autowired private IRobotInfoService robotInfoService; + @Autowired + private IAlarmRecordService iAlarmRecordService; @Override @@ -58,7 +63,7 @@ long countX = DateUtil.between(DateUtil.parseDateTime(last.getTimeCount()), DateUtil.parseDateTime(startTime), DateUnit.SECOND, true); for (int i = 0; i <= countX / 5; i++) { if (i == 0) { - psdDataDTOS.add(new PsdDataDTO("0", "0")); + psdDataDTOS.add(new PsdDataDTO("0", "0")); continue; } int countY = 0; @@ -74,7 +79,7 @@ } } } - psdDataDTO.setValueCount(String.format("%.2f",countY*1.00 / 5)); + psdDataDTO.setValueCount(String.format("%.2f", countY * 1.00 / 5)); psdDataDTOS.add(psdDataDTO); } } @@ -112,7 +117,40 @@ } @Override - public List hsList(Long detectorId,String type) { + public List hsList(Long detectorId, String type) { return null; } + + @Override + public void insertPsdAlarms() { + + //先查询正在巡检任务信息 + List taskInfoList = iTaskInfoService.getTaskListByStatus(0, 1, 1); + List alarmRecordList = new ArrayList<>(); + + for (TaskInfo taskInfo : taskInfoList) { + if (iAlarmRecordService.getAlarmByTask(taskInfo.getId())) continue; + String startTime = ObjectUtil.isNotEmpty(taskInfo.getStartTime()) ? DateUtil.formatDateTime(taskInfo.getStartTime()) : taskInfo.getStartTime() + ""; + Long robotId = taskInfo.getRobotId(); + //查询满足13个中子的时间 + List alarmTimeList = this.baseMapper.getPsdAlarm(startTime, robotId); + if (ObjectUtil.isNotEmpty(alarmTimeList) && alarmTimeList.size() >= 13) { + String alarmTime = alarmTimeList.get(12); + AlarmRecord alarmRecord = new AlarmRecord(robotId, + new BigDecimal(13), + DateUtil.parseDateTime(alarmTime), + taskInfo.getId()); + //用这个时间取查询最近的巡检点位 + RobotTrajectoryInfo trajectoryInfo = trajectoryInfoService.getRobotTrajectoryInfoByTime(alarmTime, robotId); + if (ObjectUtil.isNotEmpty(trajectoryInfo)) { + alarmRecord.setX(trajectoryInfo.getPostionX()); + alarmRecord.setY(trajectoryInfo.getPostionY()); + } + alarmRecordList.add(alarmRecord); + } + } + if (null != alarmRecordList && alarmRecordList.size() > 0) { + iAlarmRecordService.saveBatch(alarmRecordList); + } + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java index ebd4f4c..976e419 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java @@ -145,4 +145,15 @@ + "taskId=" + taskId + "}"; } + + public AlarmRecord() { + } + + public AlarmRecord(Long robotId, BigDecimal monitorVal, Date alarmTime, Long taskId) { + this.robotId = robotId; + this.monitorVal = monitorVal; + this.alarmTime = alarmTime; + this.taskId = taskId; + this.createTime=new Date(); + } } \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java index ec75b52..3b4b676 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -24,14 +24,9 @@ @RequestMapping("/config") public class DetectorConfigController extends BaseController { - @Autowired private IDetectorConfigService configService; - - /** - * 获取下发参数日志列表 - */ @ApiOperation("根据探测仪id获取下发参数列表") @PostMapping(value = "/list") @ResponseBody @@ -42,21 +37,6 @@ return ResponseDataDTO.success(configService.list(queryWrapper)); } -// /** -// * 获取下发参数日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = configService.selectPage(page,query); -// return super.packForBT(page); -// } - - /** - * 新增下发参数日志 - */ @ApiOperation("保存参数") @PostMapping(value = "/addConfig") @ResponseBody @@ -64,56 +44,10 @@ return ResponseDataDTO.success(configService.save(config)); } - /** - * 下发参数 - */ @ApiOperation("下发参数") @PostMapping(value = "/sendConfig") @ResponseBody public ResponseDataDTO sendConfig(DetectorConfig config) { return ResponseDataDTO.success(configService.sendConfig(config)); } -// -// /** -// * 删除下发参数日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @PostMapping(value = "/detail/{configId}") -// @ResponseBody -// public Object detail(@PathVariable("configId") String configId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(configService.selectById(configId)); -// return resultData; -// } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java index 64278d3..122ad9b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -26,10 +26,6 @@ @Autowired private IDetectorLogService logService; - - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/list") @ResponseBody @ApiOperation("根据探测仪id获取升降压操作列表") @@ -40,78 +36,10 @@ return ResponseDataDTO.success(logService.list(queryWrapper)); } - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/getLastRecord") @ResponseBody @ApiOperation("根据探测仪id获取升降压最新记录") public Object getLastRecord(Long detectorId) { return ResponseDataDTO.success(logService.getLastRecord(detectorId)); } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = logService.selectPage(page,query); -// return super.packForBT(page); -// } - -// /** -// * 新增升降压操作日志 -// */ -// @PostMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @PostMapping(value = "/detail/{logId}") -// @ResponseBody -// public Object detail(@PathVariable("logId") String logId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(logService.selectById(logId)); -// return resultData; -// } } 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 d560517..4d738a4 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 @@ -27,11 +27,6 @@ @Autowired private IPsdService iPsdService; - /** - * 中子源控制 - * - * @param command 控制指令类型（start-加压开始工作，stop-退高压，停止工作） - */ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @PostMapping("/control") @ResponseBody @@ -49,7 +44,6 @@ return ResponseDataDTO.success(iPsdService.getPsdAlarm(taskId)); } - @ApiOperation("控制台曲线显示,需传taskId") @PostMapping("/dataList") @ResponseBody @@ -62,7 +56,6 @@ @PostMapping("/hsList") @ResponseBody public ResponseDataDTO hsList(HsRequest request) { - return ResponseDataDTO.success(neutronOptService.hsList(request.getDetectorId(), request.getType(), request.getX1(), @@ -70,6 +63,4 @@ request.getX3(), request.getX4())); } - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java index 32a300d..45ad573 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IPsdService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,81 +14,4 @@ @RequestMapping("/psd") public class PsdController extends BaseController { - - @Autowired - private IPsdService psdService; - - -// /** -// * 获取探测器PSD数据列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return psdService.selectList(null); -// } -// -// /** -// * 获取探测器PSD数据分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = psdService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增探测器PSD数据 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Psd psd) { -// psdService.insert(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除探测器PSD数据 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String psdId) { -// psdService.deleteById(psdId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("psdIds") List psdIds) { -// psdService.deleteBatchIds(psdIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改探测器PSD数据 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Psd psd) { -// psdService.updateById(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 探测器PSD数据详情 -// */ -// @RequestMapping(value = "/detail/{psdId}") -// @ResponseBody -// public Object detail(@PathVariable("psdId") String psdId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(psdService.selectById(psdId)); -// return resultData; -// } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java index c9d0ca8..88640fc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IVolService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,10 +14,4 @@ @RequestMapping("/vol") public class VolController extends BaseController { - - @Autowired - private IVolService volService; - - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java index 462f31a..9c69d3c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java @@ -23,4 +23,6 @@ List hsList(Long detectorId,String type); + void insertPsdAlarms(); + } 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 f1adc1e..79193f9 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 @@ -10,15 +10,18 @@ import com.casic.missiles.modular.neutron.dto.PsdDataDTO; import com.casic.missiles.modular.neutron.model.Psd; import com.casic.missiles.modular.neutron.service.IPsdService; +import com.casic.missiles.modular.robot.model.AlarmRecord; import com.casic.missiles.modular.robot.model.RobotInfo; import com.casic.missiles.modular.robot.model.RobotTrajectoryInfo; import com.casic.missiles.modular.robot.model.TaskInfo; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; import com.casic.missiles.modular.robot.service.IRobotInfoService; import com.casic.missiles.modular.robot.service.IRobotTrajectoryInfoService; import com.casic.missiles.modular.robot.service.ITaskInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -42,6 +45,8 @@ private AbstractDictService dictService; @Autowired private IRobotInfoService robotInfoService; + @Autowired + private IAlarmRecordService iAlarmRecordService; @Override @@ -58,7 +63,7 @@ long countX = DateUtil.between(DateUtil.parseDateTime(last.getTimeCount()), DateUtil.parseDateTime(startTime), DateUnit.SECOND, true); for (int i = 0; i <= countX / 5; i++) { if (i == 0) { - psdDataDTOS.add(new PsdDataDTO("0", "0")); + psdDataDTOS.add(new PsdDataDTO("0", "0")); continue; } int countY = 0; @@ -74,7 +79,7 @@ } } } - psdDataDTO.setValueCount(String.format("%.2f",countY*1.00 / 5)); + psdDataDTO.setValueCount(String.format("%.2f", countY * 1.00 / 5)); psdDataDTOS.add(psdDataDTO); } } @@ -112,7 +117,40 @@ } @Override - public List hsList(Long detectorId,String type) { + public List hsList(Long detectorId, String type) { return null; } + + @Override + public void insertPsdAlarms() { + + //先查询正在巡检任务信息 + List taskInfoList = iTaskInfoService.getTaskListByStatus(0, 1, 1); + List alarmRecordList = new ArrayList<>(); + + for (TaskInfo taskInfo : taskInfoList) { + if (iAlarmRecordService.getAlarmByTask(taskInfo.getId())) continue; + String startTime = ObjectUtil.isNotEmpty(taskInfo.getStartTime()) ? DateUtil.formatDateTime(taskInfo.getStartTime()) : taskInfo.getStartTime() + ""; + Long robotId = taskInfo.getRobotId(); + //查询满足13个中子的时间 + List alarmTimeList = this.baseMapper.getPsdAlarm(startTime, robotId); + if (ObjectUtil.isNotEmpty(alarmTimeList) && alarmTimeList.size() >= 13) { + String alarmTime = alarmTimeList.get(12); + AlarmRecord alarmRecord = new AlarmRecord(robotId, + new BigDecimal(13), + DateUtil.parseDateTime(alarmTime), + taskInfo.getId()); + //用这个时间取查询最近的巡检点位 + RobotTrajectoryInfo trajectoryInfo = trajectoryInfoService.getRobotTrajectoryInfoByTime(alarmTime, robotId); + if (ObjectUtil.isNotEmpty(trajectoryInfo)) { + alarmRecord.setX(trajectoryInfo.getPostionX()); + alarmRecord.setY(trajectoryInfo.getPostionY()); + } + alarmRecordList.add(alarmRecord); + } + } + if (null != alarmRecordList && alarmRecordList.size() > 0) { + iAlarmRecordService.saveBatch(alarmRecordList); + } + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java index ebd4f4c..976e419 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java @@ -145,4 +145,15 @@ + "taskId=" + taskId + "}"; } + + public AlarmRecord() { + } + + public AlarmRecord(Long robotId, BigDecimal monitorVal, Date alarmTime, Long taskId) { + this.robotId = robotId; + this.monitorVal = monitorVal; + this.alarmTime = alarmTime; + this.taskId = taskId; + this.createTime=new Date(); + } } \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java index ed384a0..95e912c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java @@ -30,4 +30,11 @@ * @return */ Integer selectCountByTaskId(Long id,Long robotId); + + /** + * 根据任务id查询是否已经产生中子源告警 + * @param taskId + * @return + */ + boolean getAlarmByTask(Long taskId); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java index ec75b52..3b4b676 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -24,14 +24,9 @@ @RequestMapping("/config") public class DetectorConfigController extends BaseController { - @Autowired private IDetectorConfigService configService; - - /** - * 获取下发参数日志列表 - */ @ApiOperation("根据探测仪id获取下发参数列表") @PostMapping(value = "/list") @ResponseBody @@ -42,21 +37,6 @@ return ResponseDataDTO.success(configService.list(queryWrapper)); } -// /** -// * 获取下发参数日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = configService.selectPage(page,query); -// return super.packForBT(page); -// } - - /** - * 新增下发参数日志 - */ @ApiOperation("保存参数") @PostMapping(value = "/addConfig") @ResponseBody @@ -64,56 +44,10 @@ return ResponseDataDTO.success(configService.save(config)); } - /** - * 下发参数 - */ @ApiOperation("下发参数") @PostMapping(value = "/sendConfig") @ResponseBody public ResponseDataDTO sendConfig(DetectorConfig config) { return ResponseDataDTO.success(configService.sendConfig(config)); } -// -// /** -// * 删除下发参数日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @PostMapping(value = "/detail/{configId}") -// @ResponseBody -// public Object detail(@PathVariable("configId") String configId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(configService.selectById(configId)); -// return resultData; -// } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java index 64278d3..122ad9b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -26,10 +26,6 @@ @Autowired private IDetectorLogService logService; - - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/list") @ResponseBody @ApiOperation("根据探测仪id获取升降压操作列表") @@ -40,78 +36,10 @@ return ResponseDataDTO.success(logService.list(queryWrapper)); } - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/getLastRecord") @ResponseBody @ApiOperation("根据探测仪id获取升降压最新记录") public Object getLastRecord(Long detectorId) { return ResponseDataDTO.success(logService.getLastRecord(detectorId)); } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = logService.selectPage(page,query); -// return super.packForBT(page); -// } - -// /** -// * 新增升降压操作日志 -// */ -// @PostMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @PostMapping(value = "/detail/{logId}") -// @ResponseBody -// public Object detail(@PathVariable("logId") String logId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(logService.selectById(logId)); -// return resultData; -// } } 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 d560517..4d738a4 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 @@ -27,11 +27,6 @@ @Autowired private IPsdService iPsdService; - /** - * 中子源控制 - * - * @param command 控制指令类型（start-加压开始工作，stop-退高压，停止工作） - */ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @PostMapping("/control") @ResponseBody @@ -49,7 +44,6 @@ return ResponseDataDTO.success(iPsdService.getPsdAlarm(taskId)); } - @ApiOperation("控制台曲线显示,需传taskId") @PostMapping("/dataList") @ResponseBody @@ -62,7 +56,6 @@ @PostMapping("/hsList") @ResponseBody public ResponseDataDTO hsList(HsRequest request) { - return ResponseDataDTO.success(neutronOptService.hsList(request.getDetectorId(), request.getType(), request.getX1(), @@ -70,6 +63,4 @@ request.getX3(), request.getX4())); } - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java index 32a300d..45ad573 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IPsdService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,81 +14,4 @@ @RequestMapping("/psd") public class PsdController extends BaseController { - - @Autowired - private IPsdService psdService; - - -// /** -// * 获取探测器PSD数据列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return psdService.selectList(null); -// } -// -// /** -// * 获取探测器PSD数据分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = psdService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增探测器PSD数据 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Psd psd) { -// psdService.insert(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除探测器PSD数据 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String psdId) { -// psdService.deleteById(psdId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("psdIds") List psdIds) { -// psdService.deleteBatchIds(psdIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改探测器PSD数据 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Psd psd) { -// psdService.updateById(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 探测器PSD数据详情 -// */ -// @RequestMapping(value = "/detail/{psdId}") -// @ResponseBody -// public Object detail(@PathVariable("psdId") String psdId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(psdService.selectById(psdId)); -// return resultData; -// } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java index c9d0ca8..88640fc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IVolService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,10 +14,4 @@ @RequestMapping("/vol") public class VolController extends BaseController { - - @Autowired - private IVolService volService; - - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java index 462f31a..9c69d3c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java @@ -23,4 +23,6 @@ List hsList(Long detectorId,String type); + void insertPsdAlarms(); + } 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 f1adc1e..79193f9 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 @@ -10,15 +10,18 @@ import com.casic.missiles.modular.neutron.dto.PsdDataDTO; import com.casic.missiles.modular.neutron.model.Psd; import com.casic.missiles.modular.neutron.service.IPsdService; +import com.casic.missiles.modular.robot.model.AlarmRecord; import com.casic.missiles.modular.robot.model.RobotInfo; import com.casic.missiles.modular.robot.model.RobotTrajectoryInfo; import com.casic.missiles.modular.robot.model.TaskInfo; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; import com.casic.missiles.modular.robot.service.IRobotInfoService; import com.casic.missiles.modular.robot.service.IRobotTrajectoryInfoService; import com.casic.missiles.modular.robot.service.ITaskInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -42,6 +45,8 @@ private AbstractDictService dictService; @Autowired private IRobotInfoService robotInfoService; + @Autowired + private IAlarmRecordService iAlarmRecordService; @Override @@ -58,7 +63,7 @@ long countX = DateUtil.between(DateUtil.parseDateTime(last.getTimeCount()), DateUtil.parseDateTime(startTime), DateUnit.SECOND, true); for (int i = 0; i <= countX / 5; i++) { if (i == 0) { - psdDataDTOS.add(new PsdDataDTO("0", "0")); + psdDataDTOS.add(new PsdDataDTO("0", "0")); continue; } int countY = 0; @@ -74,7 +79,7 @@ } } } - psdDataDTO.setValueCount(String.format("%.2f",countY*1.00 / 5)); + psdDataDTO.setValueCount(String.format("%.2f", countY * 1.00 / 5)); psdDataDTOS.add(psdDataDTO); } } @@ -112,7 +117,40 @@ } @Override - public List hsList(Long detectorId,String type) { + public List hsList(Long detectorId, String type) { return null; } + + @Override + public void insertPsdAlarms() { + + //先查询正在巡检任务信息 + List taskInfoList = iTaskInfoService.getTaskListByStatus(0, 1, 1); + List alarmRecordList = new ArrayList<>(); + + for (TaskInfo taskInfo : taskInfoList) { + if (iAlarmRecordService.getAlarmByTask(taskInfo.getId())) continue; + String startTime = ObjectUtil.isNotEmpty(taskInfo.getStartTime()) ? DateUtil.formatDateTime(taskInfo.getStartTime()) : taskInfo.getStartTime() + ""; + Long robotId = taskInfo.getRobotId(); + //查询满足13个中子的时间 + List alarmTimeList = this.baseMapper.getPsdAlarm(startTime, robotId); + if (ObjectUtil.isNotEmpty(alarmTimeList) && alarmTimeList.size() >= 13) { + String alarmTime = alarmTimeList.get(12); + AlarmRecord alarmRecord = new AlarmRecord(robotId, + new BigDecimal(13), + DateUtil.parseDateTime(alarmTime), + taskInfo.getId()); + //用这个时间取查询最近的巡检点位 + RobotTrajectoryInfo trajectoryInfo = trajectoryInfoService.getRobotTrajectoryInfoByTime(alarmTime, robotId); + if (ObjectUtil.isNotEmpty(trajectoryInfo)) { + alarmRecord.setX(trajectoryInfo.getPostionX()); + alarmRecord.setY(trajectoryInfo.getPostionY()); + } + alarmRecordList.add(alarmRecord); + } + } + if (null != alarmRecordList && alarmRecordList.size() > 0) { + iAlarmRecordService.saveBatch(alarmRecordList); + } + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java index ebd4f4c..976e419 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java @@ -145,4 +145,15 @@ + "taskId=" + taskId + "}"; } + + public AlarmRecord() { + } + + public AlarmRecord(Long robotId, BigDecimal monitorVal, Date alarmTime, Long taskId) { + this.robotId = robotId; + this.monitorVal = monitorVal; + this.alarmTime = alarmTime; + this.taskId = taskId; + this.createTime=new Date(); + } } \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java index ed384a0..95e912c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java @@ -30,4 +30,11 @@ * @return */ Integer selectCountByTaskId(Long id,Long robotId); + + /** + * 根据任务id查询是否已经产生中子源告警 + * @param taskId + * @return + */ + boolean getAlarmByTask(Long taskId); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java index ff145c2..7b63157 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java @@ -31,4 +31,13 @@ * @param info 机器信息 */ void reloadTask(StartTrackRequest request, RobotInfo info); + + /** + * 根据状态和类型查询任务 + * @param status + * @param taskType + * @param discernType + * @return + */ + List getTaskListByStatus(Integer status,Integer taskType,Integer discernType); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java index ec75b52..3b4b676 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -24,14 +24,9 @@ @RequestMapping("/config") public class DetectorConfigController extends BaseController { - @Autowired private IDetectorConfigService configService; - - /** - * 获取下发参数日志列表 - */ @ApiOperation("根据探测仪id获取下发参数列表") @PostMapping(value = "/list") @ResponseBody @@ -42,21 +37,6 @@ return ResponseDataDTO.success(configService.list(queryWrapper)); } -// /** -// * 获取下发参数日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = configService.selectPage(page,query); -// return super.packForBT(page); -// } - - /** - * 新增下发参数日志 - */ @ApiOperation("保存参数") @PostMapping(value = "/addConfig") @ResponseBody @@ -64,56 +44,10 @@ return ResponseDataDTO.success(configService.save(config)); } - /** - * 下发参数 - */ @ApiOperation("下发参数") @PostMapping(value = "/sendConfig") @ResponseBody public ResponseDataDTO sendConfig(DetectorConfig config) { return ResponseDataDTO.success(configService.sendConfig(config)); } -// -// /** -// * 删除下发参数日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @PostMapping(value = "/detail/{configId}") -// @ResponseBody -// public Object detail(@PathVariable("configId") String configId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(configService.selectById(configId)); -// return resultData; -// } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java index 64278d3..122ad9b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -26,10 +26,6 @@ @Autowired private IDetectorLogService logService; - - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/list") @ResponseBody @ApiOperation("根据探测仪id获取升降压操作列表") @@ -40,78 +36,10 @@ return ResponseDataDTO.success(logService.list(queryWrapper)); } - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/getLastRecord") @ResponseBody @ApiOperation("根据探测仪id获取升降压最新记录") public Object getLastRecord(Long detectorId) { return ResponseDataDTO.success(logService.getLastRecord(detectorId)); } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = logService.selectPage(page,query); -// return super.packForBT(page); -// } - -// /** -// * 新增升降压操作日志 -// */ -// @PostMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @PostMapping(value = "/detail/{logId}") -// @ResponseBody -// public Object detail(@PathVariable("logId") String logId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(logService.selectById(logId)); -// return resultData; -// } } 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 d560517..4d738a4 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 @@ -27,11 +27,6 @@ @Autowired private IPsdService iPsdService; - /** - * 中子源控制 - * - * @param command 控制指令类型（start-加压开始工作，stop-退高压，停止工作） - */ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @PostMapping("/control") @ResponseBody @@ -49,7 +44,6 @@ return ResponseDataDTO.success(iPsdService.getPsdAlarm(taskId)); } - @ApiOperation("控制台曲线显示,需传taskId") @PostMapping("/dataList") @ResponseBody @@ -62,7 +56,6 @@ @PostMapping("/hsList") @ResponseBody public ResponseDataDTO hsList(HsRequest request) { - return ResponseDataDTO.success(neutronOptService.hsList(request.getDetectorId(), request.getType(), request.getX1(), @@ -70,6 +63,4 @@ request.getX3(), request.getX4())); } - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java index 32a300d..45ad573 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IPsdService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,81 +14,4 @@ @RequestMapping("/psd") public class PsdController extends BaseController { - - @Autowired - private IPsdService psdService; - - -// /** -// * 获取探测器PSD数据列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return psdService.selectList(null); -// } -// -// /** -// * 获取探测器PSD数据分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = psdService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增探测器PSD数据 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Psd psd) { -// psdService.insert(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除探测器PSD数据 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String psdId) { -// psdService.deleteById(psdId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("psdIds") List psdIds) { -// psdService.deleteBatchIds(psdIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改探测器PSD数据 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Psd psd) { -// psdService.updateById(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 探测器PSD数据详情 -// */ -// @RequestMapping(value = "/detail/{psdId}") -// @ResponseBody -// public Object detail(@PathVariable("psdId") String psdId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(psdService.selectById(psdId)); -// return resultData; -// } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java index c9d0ca8..88640fc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IVolService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,10 +14,4 @@ @RequestMapping("/vol") public class VolController extends BaseController { - - @Autowired - private IVolService volService; - - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java index 462f31a..9c69d3c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java @@ -23,4 +23,6 @@ List hsList(Long detectorId,String type); + void insertPsdAlarms(); + } 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 f1adc1e..79193f9 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 @@ -10,15 +10,18 @@ import com.casic.missiles.modular.neutron.dto.PsdDataDTO; import com.casic.missiles.modular.neutron.model.Psd; import com.casic.missiles.modular.neutron.service.IPsdService; +import com.casic.missiles.modular.robot.model.AlarmRecord; import com.casic.missiles.modular.robot.model.RobotInfo; import com.casic.missiles.modular.robot.model.RobotTrajectoryInfo; import com.casic.missiles.modular.robot.model.TaskInfo; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; import com.casic.missiles.modular.robot.service.IRobotInfoService; import com.casic.missiles.modular.robot.service.IRobotTrajectoryInfoService; import com.casic.missiles.modular.robot.service.ITaskInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -42,6 +45,8 @@ private AbstractDictService dictService; @Autowired private IRobotInfoService robotInfoService; + @Autowired + private IAlarmRecordService iAlarmRecordService; @Override @@ -58,7 +63,7 @@ long countX = DateUtil.between(DateUtil.parseDateTime(last.getTimeCount()), DateUtil.parseDateTime(startTime), DateUnit.SECOND, true); for (int i = 0; i <= countX / 5; i++) { if (i == 0) { - psdDataDTOS.add(new PsdDataDTO("0", "0")); + psdDataDTOS.add(new PsdDataDTO("0", "0")); continue; } int countY = 0; @@ -74,7 +79,7 @@ } } } - psdDataDTO.setValueCount(String.format("%.2f",countY*1.00 / 5)); + psdDataDTO.setValueCount(String.format("%.2f", countY * 1.00 / 5)); psdDataDTOS.add(psdDataDTO); } } @@ -112,7 +117,40 @@ } @Override - public List hsList(Long detectorId,String type) { + public List hsList(Long detectorId, String type) { return null; } + + @Override + public void insertPsdAlarms() { + + //先查询正在巡检任务信息 + List taskInfoList = iTaskInfoService.getTaskListByStatus(0, 1, 1); + List alarmRecordList = new ArrayList<>(); + + for (TaskInfo taskInfo : taskInfoList) { + if (iAlarmRecordService.getAlarmByTask(taskInfo.getId())) continue; + String startTime = ObjectUtil.isNotEmpty(taskInfo.getStartTime()) ? DateUtil.formatDateTime(taskInfo.getStartTime()) : taskInfo.getStartTime() + ""; + Long robotId = taskInfo.getRobotId(); + //查询满足13个中子的时间 + List alarmTimeList = this.baseMapper.getPsdAlarm(startTime, robotId); + if (ObjectUtil.isNotEmpty(alarmTimeList) && alarmTimeList.size() >= 13) { + String alarmTime = alarmTimeList.get(12); + AlarmRecord alarmRecord = new AlarmRecord(robotId, + new BigDecimal(13), + DateUtil.parseDateTime(alarmTime), + taskInfo.getId()); + //用这个时间取查询最近的巡检点位 + RobotTrajectoryInfo trajectoryInfo = trajectoryInfoService.getRobotTrajectoryInfoByTime(alarmTime, robotId); + if (ObjectUtil.isNotEmpty(trajectoryInfo)) { + alarmRecord.setX(trajectoryInfo.getPostionX()); + alarmRecord.setY(trajectoryInfo.getPostionY()); + } + alarmRecordList.add(alarmRecord); + } + } + if (null != alarmRecordList && alarmRecordList.size() > 0) { + iAlarmRecordService.saveBatch(alarmRecordList); + } + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java index ebd4f4c..976e419 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java @@ -145,4 +145,15 @@ + "taskId=" + taskId + "}"; } + + public AlarmRecord() { + } + + public AlarmRecord(Long robotId, BigDecimal monitorVal, Date alarmTime, Long taskId) { + this.robotId = robotId; + this.monitorVal = monitorVal; + this.alarmTime = alarmTime; + this.taskId = taskId; + this.createTime=new Date(); + } } \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java index ed384a0..95e912c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java @@ -30,4 +30,11 @@ * @return */ Integer selectCountByTaskId(Long id,Long robotId); + + /** + * 根据任务id查询是否已经产生中子源告警 + * @param taskId + * @return + */ + boolean getAlarmByTask(Long taskId); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java index ff145c2..7b63157 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java @@ -31,4 +31,13 @@ * @param info 机器信息 */ void reloadTask(StartTrackRequest request, RobotInfo info); + + /** + * 根据状态和类型查询任务 + * @param status + * @param taskType + * @param discernType + * @return + */ + List getTaskListByStatus(Integer status,Integer taskType,Integer discernType); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java index a0ec69d..3a22f77 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java @@ -29,6 +29,7 @@ public class AlarmRecordServiceImpl extends ServiceImpl implements IAlarmRecordService { private final IRobotInfoService robotInfoService; private final AbstractDictService dictService; + public AlarmRecordServiceImpl(@Lazy IRobotInfoService robotInfoService, AbstractDictService dictService) { this.robotInfoService = robotInfoService; this.dictService = dictService; @@ -67,4 +68,11 @@ Integer num = this.count(query); return num; } + + @Override + public boolean getAlarmByTask(Long taskId) { + QueryWrapper query = new QueryWrapper<>(); + query.eq("task_id", taskId); + return this.baseMapper.selectCount(query) > 0 ? true : false; + } } \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java index ec75b52..3b4b676 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -24,14 +24,9 @@ @RequestMapping("/config") public class DetectorConfigController extends BaseController { - @Autowired private IDetectorConfigService configService; - - /** - * 获取下发参数日志列表 - */ @ApiOperation("根据探测仪id获取下发参数列表") @PostMapping(value = "/list") @ResponseBody @@ -42,21 +37,6 @@ return ResponseDataDTO.success(configService.list(queryWrapper)); } -// /** -// * 获取下发参数日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = configService.selectPage(page,query); -// return super.packForBT(page); -// } - - /** - * 新增下发参数日志 - */ @ApiOperation("保存参数") @PostMapping(value = "/addConfig") @ResponseBody @@ -64,56 +44,10 @@ return ResponseDataDTO.success(configService.save(config)); } - /** - * 下发参数 - */ @ApiOperation("下发参数") @PostMapping(value = "/sendConfig") @ResponseBody public ResponseDataDTO sendConfig(DetectorConfig config) { return ResponseDataDTO.success(configService.sendConfig(config)); } -// -// /** -// * 删除下发参数日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @PostMapping(value = "/detail/{configId}") -// @ResponseBody -// public Object detail(@PathVariable("configId") String configId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(configService.selectById(configId)); -// return resultData; -// } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java index 64278d3..122ad9b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -26,10 +26,6 @@ @Autowired private IDetectorLogService logService; - - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/list") @ResponseBody @ApiOperation("根据探测仪id获取升降压操作列表") @@ -40,78 +36,10 @@ return ResponseDataDTO.success(logService.list(queryWrapper)); } - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/getLastRecord") @ResponseBody @ApiOperation("根据探测仪id获取升降压最新记录") public Object getLastRecord(Long detectorId) { return ResponseDataDTO.success(logService.getLastRecord(detectorId)); } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = logService.selectPage(page,query); -// return super.packForBT(page); -// } - -// /** -// * 新增升降压操作日志 -// */ -// @PostMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @PostMapping(value = "/detail/{logId}") -// @ResponseBody -// public Object detail(@PathVariable("logId") String logId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(logService.selectById(logId)); -// return resultData; -// } } 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 d560517..4d738a4 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 @@ -27,11 +27,6 @@ @Autowired private IPsdService iPsdService; - /** - * 中子源控制 - * - * @param command 控制指令类型（start-加压开始工作，stop-退高压，停止工作） - */ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @PostMapping("/control") @ResponseBody @@ -49,7 +44,6 @@ return ResponseDataDTO.success(iPsdService.getPsdAlarm(taskId)); } - @ApiOperation("控制台曲线显示,需传taskId") @PostMapping("/dataList") @ResponseBody @@ -62,7 +56,6 @@ @PostMapping("/hsList") @ResponseBody public ResponseDataDTO hsList(HsRequest request) { - return ResponseDataDTO.success(neutronOptService.hsList(request.getDetectorId(), request.getType(), request.getX1(), @@ -70,6 +63,4 @@ request.getX3(), request.getX4())); } - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java index 32a300d..45ad573 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IPsdService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,81 +14,4 @@ @RequestMapping("/psd") public class PsdController extends BaseController { - - @Autowired - private IPsdService psdService; - - -// /** -// * 获取探测器PSD数据列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return psdService.selectList(null); -// } -// -// /** -// * 获取探测器PSD数据分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = psdService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增探测器PSD数据 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Psd psd) { -// psdService.insert(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除探测器PSD数据 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String psdId) { -// psdService.deleteById(psdId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("psdIds") List psdIds) { -// psdService.deleteBatchIds(psdIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改探测器PSD数据 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Psd psd) { -// psdService.updateById(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 探测器PSD数据详情 -// */ -// @RequestMapping(value = "/detail/{psdId}") -// @ResponseBody -// public Object detail(@PathVariable("psdId") String psdId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(psdService.selectById(psdId)); -// return resultData; -// } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java index c9d0ca8..88640fc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IVolService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,10 +14,4 @@ @RequestMapping("/vol") public class VolController extends BaseController { - - @Autowired - private IVolService volService; - - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java index 462f31a..9c69d3c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java @@ -23,4 +23,6 @@ List hsList(Long detectorId,String type); + void insertPsdAlarms(); + } 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 f1adc1e..79193f9 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 @@ -10,15 +10,18 @@ import com.casic.missiles.modular.neutron.dto.PsdDataDTO; import com.casic.missiles.modular.neutron.model.Psd; import com.casic.missiles.modular.neutron.service.IPsdService; +import com.casic.missiles.modular.robot.model.AlarmRecord; import com.casic.missiles.modular.robot.model.RobotInfo; import com.casic.missiles.modular.robot.model.RobotTrajectoryInfo; import com.casic.missiles.modular.robot.model.TaskInfo; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; import com.casic.missiles.modular.robot.service.IRobotInfoService; import com.casic.missiles.modular.robot.service.IRobotTrajectoryInfoService; import com.casic.missiles.modular.robot.service.ITaskInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -42,6 +45,8 @@ private AbstractDictService dictService; @Autowired private IRobotInfoService robotInfoService; + @Autowired + private IAlarmRecordService iAlarmRecordService; @Override @@ -58,7 +63,7 @@ long countX = DateUtil.between(DateUtil.parseDateTime(last.getTimeCount()), DateUtil.parseDateTime(startTime), DateUnit.SECOND, true); for (int i = 0; i <= countX / 5; i++) { if (i == 0) { - psdDataDTOS.add(new PsdDataDTO("0", "0")); + psdDataDTOS.add(new PsdDataDTO("0", "0")); continue; } int countY = 0; @@ -74,7 +79,7 @@ } } } - psdDataDTO.setValueCount(String.format("%.2f",countY*1.00 / 5)); + psdDataDTO.setValueCount(String.format("%.2f", countY * 1.00 / 5)); psdDataDTOS.add(psdDataDTO); } } @@ -112,7 +117,40 @@ } @Override - public List hsList(Long detectorId,String type) { + public List hsList(Long detectorId, String type) { return null; } + + @Override + public void insertPsdAlarms() { + + //先查询正在巡检任务信息 + List taskInfoList = iTaskInfoService.getTaskListByStatus(0, 1, 1); + List alarmRecordList = new ArrayList<>(); + + for (TaskInfo taskInfo : taskInfoList) { + if (iAlarmRecordService.getAlarmByTask(taskInfo.getId())) continue; + String startTime = ObjectUtil.isNotEmpty(taskInfo.getStartTime()) ? DateUtil.formatDateTime(taskInfo.getStartTime()) : taskInfo.getStartTime() + ""; + Long robotId = taskInfo.getRobotId(); + //查询满足13个中子的时间 + List alarmTimeList = this.baseMapper.getPsdAlarm(startTime, robotId); + if (ObjectUtil.isNotEmpty(alarmTimeList) && alarmTimeList.size() >= 13) { + String alarmTime = alarmTimeList.get(12); + AlarmRecord alarmRecord = new AlarmRecord(robotId, + new BigDecimal(13), + DateUtil.parseDateTime(alarmTime), + taskInfo.getId()); + //用这个时间取查询最近的巡检点位 + RobotTrajectoryInfo trajectoryInfo = trajectoryInfoService.getRobotTrajectoryInfoByTime(alarmTime, robotId); + if (ObjectUtil.isNotEmpty(trajectoryInfo)) { + alarmRecord.setX(trajectoryInfo.getPostionX()); + alarmRecord.setY(trajectoryInfo.getPostionY()); + } + alarmRecordList.add(alarmRecord); + } + } + if (null != alarmRecordList && alarmRecordList.size() > 0) { + iAlarmRecordService.saveBatch(alarmRecordList); + } + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java index ebd4f4c..976e419 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java @@ -145,4 +145,15 @@ + "taskId=" + taskId + "}"; } + + public AlarmRecord() { + } + + public AlarmRecord(Long robotId, BigDecimal monitorVal, Date alarmTime, Long taskId) { + this.robotId = robotId; + this.monitorVal = monitorVal; + this.alarmTime = alarmTime; + this.taskId = taskId; + this.createTime=new Date(); + } } \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java index ed384a0..95e912c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java @@ -30,4 +30,11 @@ * @return */ Integer selectCountByTaskId(Long id,Long robotId); + + /** + * 根据任务id查询是否已经产生中子源告警 + * @param taskId + * @return + */ + boolean getAlarmByTask(Long taskId); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java index ff145c2..7b63157 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java @@ -31,4 +31,13 @@ * @param info 机器信息 */ void reloadTask(StartTrackRequest request, RobotInfo info); + + /** + * 根据状态和类型查询任务 + * @param status + * @param taskType + * @param discernType + * @return + */ + List getTaskListByStatus(Integer status,Integer taskType,Integer discernType); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java index a0ec69d..3a22f77 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java @@ -29,6 +29,7 @@ public class AlarmRecordServiceImpl extends ServiceImpl implements IAlarmRecordService { private final IRobotInfoService robotInfoService; private final AbstractDictService dictService; + public AlarmRecordServiceImpl(@Lazy IRobotInfoService robotInfoService, AbstractDictService dictService) { this.robotInfoService = robotInfoService; this.dictService = dictService; @@ -67,4 +68,11 @@ Integer num = this.count(query); return num; } + + @Override + public boolean getAlarmByTask(Long taskId) { + QueryWrapper query = new QueryWrapper<>(); + query.eq("task_id", taskId); + return this.baseMapper.selectCount(query) > 0 ? true : false; + } } \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java index 9f2c93c..50b508e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -135,4 +136,14 @@ statusInfoService.updateCurrTask(robotId, null, null); } } + + + @Override + public List getTaskListByStatus(Integer status, Integer taskType, Integer discernType) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(null != status, "task_status", status); + queryWrapper.eq(null != taskType, "task_type", taskType); + queryWrapper.eq(null != discernType, "discern_type", discernType); + return this.list(queryWrapper); + } } \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java index ec75b52..3b4b676 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -24,14 +24,9 @@ @RequestMapping("/config") public class DetectorConfigController extends BaseController { - @Autowired private IDetectorConfigService configService; - - /** - * 获取下发参数日志列表 - */ @ApiOperation("根据探测仪id获取下发参数列表") @PostMapping(value = "/list") @ResponseBody @@ -42,21 +37,6 @@ return ResponseDataDTO.success(configService.list(queryWrapper)); } -// /** -// * 获取下发参数日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = configService.selectPage(page,query); -// return super.packForBT(page); -// } - - /** - * 新增下发参数日志 - */ @ApiOperation("保存参数") @PostMapping(value = "/addConfig") @ResponseBody @@ -64,56 +44,10 @@ return ResponseDataDTO.success(configService.save(config)); } - /** - * 下发参数 - */ @ApiOperation("下发参数") @PostMapping(value = "/sendConfig") @ResponseBody public ResponseDataDTO sendConfig(DetectorConfig config) { return ResponseDataDTO.success(configService.sendConfig(config)); } -// -// /** -// * 删除下发参数日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @PostMapping(value = "/detail/{configId}") -// @ResponseBody -// public Object detail(@PathVariable("configId") String configId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(configService.selectById(configId)); -// return resultData; -// } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java index 64278d3..122ad9b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -26,10 +26,6 @@ @Autowired private IDetectorLogService logService; - - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/list") @ResponseBody @ApiOperation("根据探测仪id获取升降压操作列表") @@ -40,78 +36,10 @@ return ResponseDataDTO.success(logService.list(queryWrapper)); } - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/getLastRecord") @ResponseBody @ApiOperation("根据探测仪id获取升降压最新记录") public Object getLastRecord(Long detectorId) { return ResponseDataDTO.success(logService.getLastRecord(detectorId)); } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = logService.selectPage(page,query); -// return super.packForBT(page); -// } - -// /** -// * 新增升降压操作日志 -// */ -// @PostMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @PostMapping(value = "/detail/{logId}") -// @ResponseBody -// public Object detail(@PathVariable("logId") String logId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(logService.selectById(logId)); -// return resultData; -// } } 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 d560517..4d738a4 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 @@ -27,11 +27,6 @@ @Autowired private IPsdService iPsdService; - /** - * 中子源控制 - * - * @param command 控制指令类型（start-加压开始工作，stop-退高压，停止工作） - */ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @PostMapping("/control") @ResponseBody @@ -49,7 +44,6 @@ return ResponseDataDTO.success(iPsdService.getPsdAlarm(taskId)); } - @ApiOperation("控制台曲线显示,需传taskId") @PostMapping("/dataList") @ResponseBody @@ -62,7 +56,6 @@ @PostMapping("/hsList") @ResponseBody public ResponseDataDTO hsList(HsRequest request) { - return ResponseDataDTO.success(neutronOptService.hsList(request.getDetectorId(), request.getType(), request.getX1(), @@ -70,6 +63,4 @@ request.getX3(), request.getX4())); } - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java index 32a300d..45ad573 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IPsdService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,81 +14,4 @@ @RequestMapping("/psd") public class PsdController extends BaseController { - - @Autowired - private IPsdService psdService; - - -// /** -// * 获取探测器PSD数据列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return psdService.selectList(null); -// } -// -// /** -// * 获取探测器PSD数据分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = psdService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增探测器PSD数据 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Psd psd) { -// psdService.insert(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除探测器PSD数据 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String psdId) { -// psdService.deleteById(psdId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("psdIds") List psdIds) { -// psdService.deleteBatchIds(psdIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改探测器PSD数据 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Psd psd) { -// psdService.updateById(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 探测器PSD数据详情 -// */ -// @RequestMapping(value = "/detail/{psdId}") -// @ResponseBody -// public Object detail(@PathVariable("psdId") String psdId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(psdService.selectById(psdId)); -// return resultData; -// } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java index c9d0ca8..88640fc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IVolService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,10 +14,4 @@ @RequestMapping("/vol") public class VolController extends BaseController { - - @Autowired - private IVolService volService; - - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java index 462f31a..9c69d3c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java @@ -23,4 +23,6 @@ List hsList(Long detectorId,String type); + void insertPsdAlarms(); + } 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 f1adc1e..79193f9 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 @@ -10,15 +10,18 @@ import com.casic.missiles.modular.neutron.dto.PsdDataDTO; import com.casic.missiles.modular.neutron.model.Psd; import com.casic.missiles.modular.neutron.service.IPsdService; +import com.casic.missiles.modular.robot.model.AlarmRecord; import com.casic.missiles.modular.robot.model.RobotInfo; import com.casic.missiles.modular.robot.model.RobotTrajectoryInfo; import com.casic.missiles.modular.robot.model.TaskInfo; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; import com.casic.missiles.modular.robot.service.IRobotInfoService; import com.casic.missiles.modular.robot.service.IRobotTrajectoryInfoService; import com.casic.missiles.modular.robot.service.ITaskInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -42,6 +45,8 @@ private AbstractDictService dictService; @Autowired private IRobotInfoService robotInfoService; + @Autowired + private IAlarmRecordService iAlarmRecordService; @Override @@ -58,7 +63,7 @@ long countX = DateUtil.between(DateUtil.parseDateTime(last.getTimeCount()), DateUtil.parseDateTime(startTime), DateUnit.SECOND, true); for (int i = 0; i <= countX / 5; i++) { if (i == 0) { - psdDataDTOS.add(new PsdDataDTO("0", "0")); + psdDataDTOS.add(new PsdDataDTO("0", "0")); continue; } int countY = 0; @@ -74,7 +79,7 @@ } } } - psdDataDTO.setValueCount(String.format("%.2f",countY*1.00 / 5)); + psdDataDTO.setValueCount(String.format("%.2f", countY * 1.00 / 5)); psdDataDTOS.add(psdDataDTO); } } @@ -112,7 +117,40 @@ } @Override - public List hsList(Long detectorId,String type) { + public List hsList(Long detectorId, String type) { return null; } + + @Override + public void insertPsdAlarms() { + + //先查询正在巡检任务信息 + List taskInfoList = iTaskInfoService.getTaskListByStatus(0, 1, 1); + List alarmRecordList = new ArrayList<>(); + + for (TaskInfo taskInfo : taskInfoList) { + if (iAlarmRecordService.getAlarmByTask(taskInfo.getId())) continue; + String startTime = ObjectUtil.isNotEmpty(taskInfo.getStartTime()) ? DateUtil.formatDateTime(taskInfo.getStartTime()) : taskInfo.getStartTime() + ""; + Long robotId = taskInfo.getRobotId(); + //查询满足13个中子的时间 + List alarmTimeList = this.baseMapper.getPsdAlarm(startTime, robotId); + if (ObjectUtil.isNotEmpty(alarmTimeList) && alarmTimeList.size() >= 13) { + String alarmTime = alarmTimeList.get(12); + AlarmRecord alarmRecord = new AlarmRecord(robotId, + new BigDecimal(13), + DateUtil.parseDateTime(alarmTime), + taskInfo.getId()); + //用这个时间取查询最近的巡检点位 + RobotTrajectoryInfo trajectoryInfo = trajectoryInfoService.getRobotTrajectoryInfoByTime(alarmTime, robotId); + if (ObjectUtil.isNotEmpty(trajectoryInfo)) { + alarmRecord.setX(trajectoryInfo.getPostionX()); + alarmRecord.setY(trajectoryInfo.getPostionY()); + } + alarmRecordList.add(alarmRecord); + } + } + if (null != alarmRecordList && alarmRecordList.size() > 0) { + iAlarmRecordService.saveBatch(alarmRecordList); + } + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java index ebd4f4c..976e419 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java @@ -145,4 +145,15 @@ + "taskId=" + taskId + "}"; } + + public AlarmRecord() { + } + + public AlarmRecord(Long robotId, BigDecimal monitorVal, Date alarmTime, Long taskId) { + this.robotId = robotId; + this.monitorVal = monitorVal; + this.alarmTime = alarmTime; + this.taskId = taskId; + this.createTime=new Date(); + } } \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java index ed384a0..95e912c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java @@ -30,4 +30,11 @@ * @return */ Integer selectCountByTaskId(Long id,Long robotId); + + /** + * 根据任务id查询是否已经产生中子源告警 + * @param taskId + * @return + */ + boolean getAlarmByTask(Long taskId); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java index ff145c2..7b63157 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java @@ -31,4 +31,13 @@ * @param info 机器信息 */ void reloadTask(StartTrackRequest request, RobotInfo info); + + /** + * 根据状态和类型查询任务 + * @param status + * @param taskType + * @param discernType + * @return + */ + List getTaskListByStatus(Integer status,Integer taskType,Integer discernType); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java index a0ec69d..3a22f77 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java @@ -29,6 +29,7 @@ public class AlarmRecordServiceImpl extends ServiceImpl implements IAlarmRecordService { private final IRobotInfoService robotInfoService; private final AbstractDictService dictService; + public AlarmRecordServiceImpl(@Lazy IRobotInfoService robotInfoService, AbstractDictService dictService) { this.robotInfoService = robotInfoService; this.dictService = dictService; @@ -67,4 +68,11 @@ Integer num = this.count(query); return num; } + + @Override + public boolean getAlarmByTask(Long taskId) { + QueryWrapper query = new QueryWrapper<>(); + query.eq("task_id", taskId); + return this.baseMapper.selectCount(query) > 0 ? true : false; + } } \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java index 9f2c93c..50b508e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -135,4 +136,14 @@ statusInfoService.updateCurrTask(robotId, null, null); } } + + + @Override + public List getTaskListByStatus(Integer status, Integer taskType, Integer discernType) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(null != status, "task_status", status); + queryWrapper.eq(null != taskType, "task_type", taskType); + queryWrapper.eq(null != discernType, "discern_type", discernType); + return this.list(queryWrapper); + } } \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/quartz/AlarmQuartz.java b/casic-server/src/main/java/com/casic/missiles/quartz/AlarmQuartz.java new file mode 100644 index 0000000..f1a263b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/quartz/AlarmQuartz.java @@ -0,0 +1,26 @@ +package com.casic.missiles.quartz; + +import com.casic.missiles.modular.neutron.service.IPsdService; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Date; + +@Component +public class AlarmQuartz implements Job { + /** + * 执行定时任务 * * @param jobExecutionContext * @throws JobExecutionException + */ + + @Autowired + IPsdService iPsdService; + @Override + public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + + //根据每次巡检写入中子数超过基准报警记录 + iPsdService.insertPsdAlarms(); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java index ec75b52..3b4b676 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -24,14 +24,9 @@ @RequestMapping("/config") public class DetectorConfigController extends BaseController { - @Autowired private IDetectorConfigService configService; - - /** - * 获取下发参数日志列表 - */ @ApiOperation("根据探测仪id获取下发参数列表") @PostMapping(value = "/list") @ResponseBody @@ -42,21 +37,6 @@ return ResponseDataDTO.success(configService.list(queryWrapper)); } -// /** -// * 获取下发参数日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = configService.selectPage(page,query); -// return super.packForBT(page); -// } - - /** - * 新增下发参数日志 - */ @ApiOperation("保存参数") @PostMapping(value = "/addConfig") @ResponseBody @@ -64,56 +44,10 @@ return ResponseDataDTO.success(configService.save(config)); } - /** - * 下发参数 - */ @ApiOperation("下发参数") @PostMapping(value = "/sendConfig") @ResponseBody public ResponseDataDTO sendConfig(DetectorConfig config) { return ResponseDataDTO.success(configService.sendConfig(config)); } -// -// /** -// * 删除下发参数日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @PostMapping(value = "/detail/{configId}") -// @ResponseBody -// public Object detail(@PathVariable("configId") String configId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(configService.selectById(configId)); -// return resultData; -// } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java index 64278d3..122ad9b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -26,10 +26,6 @@ @Autowired private IDetectorLogService logService; - - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/list") @ResponseBody @ApiOperation("根据探测仪id获取升降压操作列表") @@ -40,78 +36,10 @@ return ResponseDataDTO.success(logService.list(queryWrapper)); } - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/getLastRecord") @ResponseBody @ApiOperation("根据探测仪id获取升降压最新记录") public Object getLastRecord(Long detectorId) { return ResponseDataDTO.success(logService.getLastRecord(detectorId)); } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = logService.selectPage(page,query); -// return super.packForBT(page); -// } - -// /** -// * 新增升降压操作日志 -// */ -// @PostMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @PostMapping(value = "/detail/{logId}") -// @ResponseBody -// public Object detail(@PathVariable("logId") String logId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(logService.selectById(logId)); -// return resultData; -// } } 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 d560517..4d738a4 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 @@ -27,11 +27,6 @@ @Autowired private IPsdService iPsdService; - /** - * 中子源控制 - * - * @param command 控制指令类型（start-加压开始工作，stop-退高压，停止工作） - */ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @PostMapping("/control") @ResponseBody @@ -49,7 +44,6 @@ return ResponseDataDTO.success(iPsdService.getPsdAlarm(taskId)); } - @ApiOperation("控制台曲线显示,需传taskId") @PostMapping("/dataList") @ResponseBody @@ -62,7 +56,6 @@ @PostMapping("/hsList") @ResponseBody public ResponseDataDTO hsList(HsRequest request) { - return ResponseDataDTO.success(neutronOptService.hsList(request.getDetectorId(), request.getType(), request.getX1(), @@ -70,6 +63,4 @@ request.getX3(), request.getX4())); } - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java index 32a300d..45ad573 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IPsdService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,81 +14,4 @@ @RequestMapping("/psd") public class PsdController extends BaseController { - - @Autowired - private IPsdService psdService; - - -// /** -// * 获取探测器PSD数据列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return psdService.selectList(null); -// } -// -// /** -// * 获取探测器PSD数据分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = psdService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增探测器PSD数据 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Psd psd) { -// psdService.insert(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除探测器PSD数据 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String psdId) { -// psdService.deleteById(psdId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("psdIds") List psdIds) { -// psdService.deleteBatchIds(psdIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改探测器PSD数据 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Psd psd) { -// psdService.updateById(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 探测器PSD数据详情 -// */ -// @RequestMapping(value = "/detail/{psdId}") -// @ResponseBody -// public Object detail(@PathVariable("psdId") String psdId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(psdService.selectById(psdId)); -// return resultData; -// } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java index c9d0ca8..88640fc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IVolService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,10 +14,4 @@ @RequestMapping("/vol") public class VolController extends BaseController { - - @Autowired - private IVolService volService; - - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java index 462f31a..9c69d3c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java @@ -23,4 +23,6 @@ List hsList(Long detectorId,String type); + void insertPsdAlarms(); + } 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 f1adc1e..79193f9 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 @@ -10,15 +10,18 @@ import com.casic.missiles.modular.neutron.dto.PsdDataDTO; import com.casic.missiles.modular.neutron.model.Psd; import com.casic.missiles.modular.neutron.service.IPsdService; +import com.casic.missiles.modular.robot.model.AlarmRecord; import com.casic.missiles.modular.robot.model.RobotInfo; import com.casic.missiles.modular.robot.model.RobotTrajectoryInfo; import com.casic.missiles.modular.robot.model.TaskInfo; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; import com.casic.missiles.modular.robot.service.IRobotInfoService; import com.casic.missiles.modular.robot.service.IRobotTrajectoryInfoService; import com.casic.missiles.modular.robot.service.ITaskInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -42,6 +45,8 @@ private AbstractDictService dictService; @Autowired private IRobotInfoService robotInfoService; + @Autowired + private IAlarmRecordService iAlarmRecordService; @Override @@ -58,7 +63,7 @@ long countX = DateUtil.between(DateUtil.parseDateTime(last.getTimeCount()), DateUtil.parseDateTime(startTime), DateUnit.SECOND, true); for (int i = 0; i <= countX / 5; i++) { if (i == 0) { - psdDataDTOS.add(new PsdDataDTO("0", "0")); + psdDataDTOS.add(new PsdDataDTO("0", "0")); continue; } int countY = 0; @@ -74,7 +79,7 @@ } } } - psdDataDTO.setValueCount(String.format("%.2f",countY*1.00 / 5)); + psdDataDTO.setValueCount(String.format("%.2f", countY * 1.00 / 5)); psdDataDTOS.add(psdDataDTO); } } @@ -112,7 +117,40 @@ } @Override - public List hsList(Long detectorId,String type) { + public List hsList(Long detectorId, String type) { return null; } + + @Override + public void insertPsdAlarms() { + + //先查询正在巡检任务信息 + List taskInfoList = iTaskInfoService.getTaskListByStatus(0, 1, 1); + List alarmRecordList = new ArrayList<>(); + + for (TaskInfo taskInfo : taskInfoList) { + if (iAlarmRecordService.getAlarmByTask(taskInfo.getId())) continue; + String startTime = ObjectUtil.isNotEmpty(taskInfo.getStartTime()) ? DateUtil.formatDateTime(taskInfo.getStartTime()) : taskInfo.getStartTime() + ""; + Long robotId = taskInfo.getRobotId(); + //查询满足13个中子的时间 + List alarmTimeList = this.baseMapper.getPsdAlarm(startTime, robotId); + if (ObjectUtil.isNotEmpty(alarmTimeList) && alarmTimeList.size() >= 13) { + String alarmTime = alarmTimeList.get(12); + AlarmRecord alarmRecord = new AlarmRecord(robotId, + new BigDecimal(13), + DateUtil.parseDateTime(alarmTime), + taskInfo.getId()); + //用这个时间取查询最近的巡检点位 + RobotTrajectoryInfo trajectoryInfo = trajectoryInfoService.getRobotTrajectoryInfoByTime(alarmTime, robotId); + if (ObjectUtil.isNotEmpty(trajectoryInfo)) { + alarmRecord.setX(trajectoryInfo.getPostionX()); + alarmRecord.setY(trajectoryInfo.getPostionY()); + } + alarmRecordList.add(alarmRecord); + } + } + if (null != alarmRecordList && alarmRecordList.size() > 0) { + iAlarmRecordService.saveBatch(alarmRecordList); + } + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java index ebd4f4c..976e419 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java @@ -145,4 +145,15 @@ + "taskId=" + taskId + "}"; } + + public AlarmRecord() { + } + + public AlarmRecord(Long robotId, BigDecimal monitorVal, Date alarmTime, Long taskId) { + this.robotId = robotId; + this.monitorVal = monitorVal; + this.alarmTime = alarmTime; + this.taskId = taskId; + this.createTime=new Date(); + } } \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java index ed384a0..95e912c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java @@ -30,4 +30,11 @@ * @return */ Integer selectCountByTaskId(Long id,Long robotId); + + /** + * 根据任务id查询是否已经产生中子源告警 + * @param taskId + * @return + */ + boolean getAlarmByTask(Long taskId); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java index ff145c2..7b63157 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java @@ -31,4 +31,13 @@ * @param info 机器信息 */ void reloadTask(StartTrackRequest request, RobotInfo info); + + /** + * 根据状态和类型查询任务 + * @param status + * @param taskType + * @param discernType + * @return + */ + List getTaskListByStatus(Integer status,Integer taskType,Integer discernType); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java index a0ec69d..3a22f77 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java @@ -29,6 +29,7 @@ public class AlarmRecordServiceImpl extends ServiceImpl implements IAlarmRecordService { private final IRobotInfoService robotInfoService; private final AbstractDictService dictService; + public AlarmRecordServiceImpl(@Lazy IRobotInfoService robotInfoService, AbstractDictService dictService) { this.robotInfoService = robotInfoService; this.dictService = dictService; @@ -67,4 +68,11 @@ Integer num = this.count(query); return num; } + + @Override + public boolean getAlarmByTask(Long taskId) { + QueryWrapper query = new QueryWrapper<>(); + query.eq("task_id", taskId); + return this.baseMapper.selectCount(query) > 0 ? true : false; + } } \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java index 9f2c93c..50b508e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -135,4 +136,14 @@ statusInfoService.updateCurrTask(robotId, null, null); } } + + + @Override + public List getTaskListByStatus(Integer status, Integer taskType, Integer discernType) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(null != status, "task_status", status); + queryWrapper.eq(null != taskType, "task_type", taskType); + queryWrapper.eq(null != discernType, "discern_type", discernType); + return this.list(queryWrapper); + } } \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/quartz/AlarmQuartz.java b/casic-server/src/main/java/com/casic/missiles/quartz/AlarmQuartz.java new file mode 100644 index 0000000..f1a263b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/quartz/AlarmQuartz.java @@ -0,0 +1,26 @@ +package com.casic.missiles.quartz; + +import com.casic.missiles.modular.neutron.service.IPsdService; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Date; + +@Component +public class AlarmQuartz implements Job { + /** + * 执行定时任务 * * @param jobExecutionContext * @throws JobExecutionException + */ + + @Autowired + IPsdService iPsdService; + @Override + public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + + //根据每次巡检写入中子数超过基准报警记录 + iPsdService.insertPsdAlarms(); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/quartz/QuartzConfig.java b/casic-server/src/main/java/com/casic/missiles/quartz/QuartzConfig.java new file mode 100644 index 0000000..f8865cb --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/quartz/QuartzConfig.java @@ -0,0 +1,27 @@ +package com.casic.missiles.quartz; + +import org.quartz.*; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class QuartzConfig { + @Bean + public JobDetail alarmQuartzDetail() { + return JobBuilder.newJob(AlarmQuartz.class).withIdentity("alarmQuartz"). + storeDurably().build(); + } + + @Bean + public Trigger alarmQuartzTrigger() { + SimpleScheduleBuilder scheduleBuilder = SimpleScheduleBuilder.simpleSchedule() + //设置时间周期单位秒 每隔两秒实行一次 + .withIntervalInSeconds(30) + .repeatForever(); + return TriggerBuilder.newTrigger().forJob(alarmQuartzDetail()) + .withIdentity("alarmQuartz") + .withSchedule(scheduleBuilder) + .build(); + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java index ec75b52..3b4b676 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -24,14 +24,9 @@ @RequestMapping("/config") public class DetectorConfigController extends BaseController { - @Autowired private IDetectorConfigService configService; - - /** - * 获取下发参数日志列表 - */ @ApiOperation("根据探测仪id获取下发参数列表") @PostMapping(value = "/list") @ResponseBody @@ -42,21 +37,6 @@ return ResponseDataDTO.success(configService.list(queryWrapper)); } -// /** -// * 获取下发参数日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = configService.selectPage(page,query); -// return super.packForBT(page); -// } - - /** - * 新增下发参数日志 - */ @ApiOperation("保存参数") @PostMapping(value = "/addConfig") @ResponseBody @@ -64,56 +44,10 @@ return ResponseDataDTO.success(configService.save(config)); } - /** - * 下发参数 - */ @ApiOperation("下发参数") @PostMapping(value = "/sendConfig") @ResponseBody public ResponseDataDTO sendConfig(DetectorConfig config) { return ResponseDataDTO.success(configService.sendConfig(config)); } -// -// /** -// * 删除下发参数日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @PostMapping(value = "/detail/{configId}") -// @ResponseBody -// public Object detail(@PathVariable("configId") String configId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(configService.selectById(configId)); -// return resultData; -// } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java index 64278d3..122ad9b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -26,10 +26,6 @@ @Autowired private IDetectorLogService logService; - - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/list") @ResponseBody @ApiOperation("根据探测仪id获取升降压操作列表") @@ -40,78 +36,10 @@ return ResponseDataDTO.success(logService.list(queryWrapper)); } - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/getLastRecord") @ResponseBody @ApiOperation("根据探测仪id获取升降压最新记录") public Object getLastRecord(Long detectorId) { return ResponseDataDTO.success(logService.getLastRecord(detectorId)); } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = logService.selectPage(page,query); -// return super.packForBT(page); -// } - -// /** -// * 新增升降压操作日志 -// */ -// @PostMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @PostMapping(value = "/detail/{logId}") -// @ResponseBody -// public Object detail(@PathVariable("logId") String logId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(logService.selectById(logId)); -// return resultData; -// } } 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 d560517..4d738a4 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 @@ -27,11 +27,6 @@ @Autowired private IPsdService iPsdService; - /** - * 中子源控制 - * - * @param command 控制指令类型（start-加压开始工作，stop-退高压，停止工作） - */ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @PostMapping("/control") @ResponseBody @@ -49,7 +44,6 @@ return ResponseDataDTO.success(iPsdService.getPsdAlarm(taskId)); } - @ApiOperation("控制台曲线显示,需传taskId") @PostMapping("/dataList") @ResponseBody @@ -62,7 +56,6 @@ @PostMapping("/hsList") @ResponseBody public ResponseDataDTO hsList(HsRequest request) { - return ResponseDataDTO.success(neutronOptService.hsList(request.getDetectorId(), request.getType(), request.getX1(), @@ -70,6 +63,4 @@ request.getX3(), request.getX4())); } - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java index 32a300d..45ad573 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IPsdService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,81 +14,4 @@ @RequestMapping("/psd") public class PsdController extends BaseController { - - @Autowired - private IPsdService psdService; - - -// /** -// * 获取探测器PSD数据列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return psdService.selectList(null); -// } -// -// /** -// * 获取探测器PSD数据分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = psdService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增探测器PSD数据 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Psd psd) { -// psdService.insert(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除探测器PSD数据 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String psdId) { -// psdService.deleteById(psdId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("psdIds") List psdIds) { -// psdService.deleteBatchIds(psdIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改探测器PSD数据 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Psd psd) { -// psdService.updateById(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 探测器PSD数据详情 -// */ -// @RequestMapping(value = "/detail/{psdId}") -// @ResponseBody -// public Object detail(@PathVariable("psdId") String psdId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(psdService.selectById(psdId)); -// return resultData; -// } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java index c9d0ca8..88640fc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IVolService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,10 +14,4 @@ @RequestMapping("/vol") public class VolController extends BaseController { - - @Autowired - private IVolService volService; - - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java index 462f31a..9c69d3c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java @@ -23,4 +23,6 @@ List hsList(Long detectorId,String type); + void insertPsdAlarms(); + } 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 f1adc1e..79193f9 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 @@ -10,15 +10,18 @@ import com.casic.missiles.modular.neutron.dto.PsdDataDTO; import com.casic.missiles.modular.neutron.model.Psd; import com.casic.missiles.modular.neutron.service.IPsdService; +import com.casic.missiles.modular.robot.model.AlarmRecord; import com.casic.missiles.modular.robot.model.RobotInfo; import com.casic.missiles.modular.robot.model.RobotTrajectoryInfo; import com.casic.missiles.modular.robot.model.TaskInfo; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; import com.casic.missiles.modular.robot.service.IRobotInfoService; import com.casic.missiles.modular.robot.service.IRobotTrajectoryInfoService; import com.casic.missiles.modular.robot.service.ITaskInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -42,6 +45,8 @@ private AbstractDictService dictService; @Autowired private IRobotInfoService robotInfoService; + @Autowired + private IAlarmRecordService iAlarmRecordService; @Override @@ -58,7 +63,7 @@ long countX = DateUtil.between(DateUtil.parseDateTime(last.getTimeCount()), DateUtil.parseDateTime(startTime), DateUnit.SECOND, true); for (int i = 0; i <= countX / 5; i++) { if (i == 0) { - psdDataDTOS.add(new PsdDataDTO("0", "0")); + psdDataDTOS.add(new PsdDataDTO("0", "0")); continue; } int countY = 0; @@ -74,7 +79,7 @@ } } } - psdDataDTO.setValueCount(String.format("%.2f",countY*1.00 / 5)); + psdDataDTO.setValueCount(String.format("%.2f", countY * 1.00 / 5)); psdDataDTOS.add(psdDataDTO); } } @@ -112,7 +117,40 @@ } @Override - public List hsList(Long detectorId,String type) { + public List hsList(Long detectorId, String type) { return null; } + + @Override + public void insertPsdAlarms() { + + //先查询正在巡检任务信息 + List taskInfoList = iTaskInfoService.getTaskListByStatus(0, 1, 1); + List alarmRecordList = new ArrayList<>(); + + for (TaskInfo taskInfo : taskInfoList) { + if (iAlarmRecordService.getAlarmByTask(taskInfo.getId())) continue; + String startTime = ObjectUtil.isNotEmpty(taskInfo.getStartTime()) ? DateUtil.formatDateTime(taskInfo.getStartTime()) : taskInfo.getStartTime() + ""; + Long robotId = taskInfo.getRobotId(); + //查询满足13个中子的时间 + List alarmTimeList = this.baseMapper.getPsdAlarm(startTime, robotId); + if (ObjectUtil.isNotEmpty(alarmTimeList) && alarmTimeList.size() >= 13) { + String alarmTime = alarmTimeList.get(12); + AlarmRecord alarmRecord = new AlarmRecord(robotId, + new BigDecimal(13), + DateUtil.parseDateTime(alarmTime), + taskInfo.getId()); + //用这个时间取查询最近的巡检点位 + RobotTrajectoryInfo trajectoryInfo = trajectoryInfoService.getRobotTrajectoryInfoByTime(alarmTime, robotId); + if (ObjectUtil.isNotEmpty(trajectoryInfo)) { + alarmRecord.setX(trajectoryInfo.getPostionX()); + alarmRecord.setY(trajectoryInfo.getPostionY()); + } + alarmRecordList.add(alarmRecord); + } + } + if (null != alarmRecordList && alarmRecordList.size() > 0) { + iAlarmRecordService.saveBatch(alarmRecordList); + } + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java index ebd4f4c..976e419 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java @@ -145,4 +145,15 @@ + "taskId=" + taskId + "}"; } + + public AlarmRecord() { + } + + public AlarmRecord(Long robotId, BigDecimal monitorVal, Date alarmTime, Long taskId) { + this.robotId = robotId; + this.monitorVal = monitorVal; + this.alarmTime = alarmTime; + this.taskId = taskId; + this.createTime=new Date(); + } } \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java index ed384a0..95e912c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java @@ -30,4 +30,11 @@ * @return */ Integer selectCountByTaskId(Long id,Long robotId); + + /** + * 根据任务id查询是否已经产生中子源告警 + * @param taskId + * @return + */ + boolean getAlarmByTask(Long taskId); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java index ff145c2..7b63157 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java @@ -31,4 +31,13 @@ * @param info 机器信息 */ void reloadTask(StartTrackRequest request, RobotInfo info); + + /** + * 根据状态和类型查询任务 + * @param status + * @param taskType + * @param discernType + * @return + */ + List getTaskListByStatus(Integer status,Integer taskType,Integer discernType); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java index a0ec69d..3a22f77 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java @@ -29,6 +29,7 @@ public class AlarmRecordServiceImpl extends ServiceImpl implements IAlarmRecordService { private final IRobotInfoService robotInfoService; private final AbstractDictService dictService; + public AlarmRecordServiceImpl(@Lazy IRobotInfoService robotInfoService, AbstractDictService dictService) { this.robotInfoService = robotInfoService; this.dictService = dictService; @@ -67,4 +68,11 @@ Integer num = this.count(query); return num; } + + @Override + public boolean getAlarmByTask(Long taskId) { + QueryWrapper query = new QueryWrapper<>(); + query.eq("task_id", taskId); + return this.baseMapper.selectCount(query) > 0 ? true : false; + } } \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java index 9f2c93c..50b508e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -135,4 +136,14 @@ statusInfoService.updateCurrTask(robotId, null, null); } } + + + @Override + public List getTaskListByStatus(Integer status, Integer taskType, Integer discernType) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(null != status, "task_status", status); + queryWrapper.eq(null != taskType, "task_type", taskType); + queryWrapper.eq(null != discernType, "discern_type", discernType); + return this.list(queryWrapper); + } } \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/quartz/AlarmQuartz.java b/casic-server/src/main/java/com/casic/missiles/quartz/AlarmQuartz.java new file mode 100644 index 0000000..f1a263b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/quartz/AlarmQuartz.java @@ -0,0 +1,26 @@ +package com.casic.missiles.quartz; + +import com.casic.missiles.modular.neutron.service.IPsdService; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Date; + +@Component +public class AlarmQuartz implements Job { + /** + * 执行定时任务 * * @param jobExecutionContext * @throws JobExecutionException + */ + + @Autowired + IPsdService iPsdService; + @Override + public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + + //根据每次巡检写入中子数超过基准报警记录 + iPsdService.insertPsdAlarms(); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/quartz/QuartzConfig.java b/casic-server/src/main/java/com/casic/missiles/quartz/QuartzConfig.java new file mode 100644 index 0000000..f8865cb --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/quartz/QuartzConfig.java @@ -0,0 +1,27 @@ +package com.casic.missiles.quartz; + +import org.quartz.*; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class QuartzConfig { + @Bean + public JobDetail alarmQuartzDetail() { + return JobBuilder.newJob(AlarmQuartz.class).withIdentity("alarmQuartz"). + storeDurably().build(); + } + + @Bean + public Trigger alarmQuartzTrigger() { + SimpleScheduleBuilder scheduleBuilder = SimpleScheduleBuilder.simpleSchedule() + //设置时间周期单位秒 每隔两秒实行一次 + .withIntervalInSeconds(30) + .repeatForever(); + return TriggerBuilder.newTrigger().forJob(alarmQuartzDetail()) + .withIdentity("alarmQuartz") + .withSchedule(scheduleBuilder) + .build(); + } + +} diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index db10efc..bf403dd 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -4,9 +4,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/casic_robot_inspection?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true + url: jdbc:mysql://111.198.10.15:11336/casic_robot_inspection?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=GMT%2B8 username: root - password: 123456 + password: Casic203 jms: pub-sub-domain: true # session: diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java index ec75b52..3b4b676 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -24,14 +24,9 @@ @RequestMapping("/config") public class DetectorConfigController extends BaseController { - @Autowired private IDetectorConfigService configService; - - /** - * 获取下发参数日志列表 - */ @ApiOperation("根据探测仪id获取下发参数列表") @PostMapping(value = "/list") @ResponseBody @@ -42,21 +37,6 @@ return ResponseDataDTO.success(configService.list(queryWrapper)); } -// /** -// * 获取下发参数日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = configService.selectPage(page,query); -// return super.packForBT(page); -// } - - /** - * 新增下发参数日志 - */ @ApiOperation("保存参数") @PostMapping(value = "/addConfig") @ResponseBody @@ -64,56 +44,10 @@ return ResponseDataDTO.success(configService.save(config)); } - /** - * 下发参数 - */ @ApiOperation("下发参数") @PostMapping(value = "/sendConfig") @ResponseBody public ResponseDataDTO sendConfig(DetectorConfig config) { return ResponseDataDTO.success(configService.sendConfig(config)); } -// -// /** -// * 删除下发参数日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @PostMapping(value = "/detail/{configId}") -// @ResponseBody -// public Object detail(@PathVariable("configId") String configId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(configService.selectById(configId)); -// return resultData; -// } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java index 64278d3..122ad9b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -26,10 +26,6 @@ @Autowired private IDetectorLogService logService; - - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/list") @ResponseBody @ApiOperation("根据探测仪id获取升降压操作列表") @@ -40,78 +36,10 @@ return ResponseDataDTO.success(logService.list(queryWrapper)); } - /** - * 获取升降压操作日志列表 - */ @PostMapping(value = "/getLastRecord") @ResponseBody @ApiOperation("根据探测仪id获取升降压最新记录") public Object getLastRecord(Long detectorId) { return ResponseDataDTO.success(logService.getLastRecord(detectorId)); } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @PostMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = logService.selectPage(page,query); -// return super.packForBT(page); -// } - -// /** -// * 新增升降压操作日志 -// */ -// @PostMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @PostMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @PostMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @PostMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @PostMapping(value = "/detail/{logId}") -// @ResponseBody -// public Object detail(@PathVariable("logId") String logId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(logService.selectById(logId)); -// return resultData; -// } } 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 d560517..4d738a4 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 @@ -27,11 +27,6 @@ @Autowired private IPsdService iPsdService; - /** - * 中子源控制 - * - * @param command 控制指令类型（start-加压开始工作，stop-退高压，停止工作） - */ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @PostMapping("/control") @ResponseBody @@ -49,7 +44,6 @@ return ResponseDataDTO.success(iPsdService.getPsdAlarm(taskId)); } - @ApiOperation("控制台曲线显示,需传taskId") @PostMapping("/dataList") @ResponseBody @@ -62,7 +56,6 @@ @PostMapping("/hsList") @ResponseBody public ResponseDataDTO hsList(HsRequest request) { - return ResponseDataDTO.success(neutronOptService.hsList(request.getDetectorId(), request.getType(), request.getX1(), @@ -70,6 +63,4 @@ request.getX3(), request.getX4())); } - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java index 32a300d..45ad573 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/PsdController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IPsdService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,81 +14,4 @@ @RequestMapping("/psd") public class PsdController extends BaseController { - - @Autowired - private IPsdService psdService; - - -// /** -// * 获取探测器PSD数据列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return psdService.selectList(null); -// } -// -// /** -// * 获取探测器PSD数据分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = psdService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增探测器PSD数据 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Psd psd) { -// psdService.insert(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除探测器PSD数据 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String psdId) { -// psdService.deleteById(psdId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("psdIds") List psdIds) { -// psdService.deleteBatchIds(psdIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改探测器PSD数据 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Psd psd) { -// psdService.updateById(psd); -// return SUCCESS_TIP; -// } -// -// /** -// * 探测器PSD数据详情 -// */ -// @RequestMapping(value = "/detail/{psdId}") -// @ResponseBody -// public Object detail(@PathVariable("psdId") String psdId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(psdService.selectById(psdId)); -// return resultData; -// } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java index c9d0ca8..88640fc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/VolController.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.neutron.controller; import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IVolService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,10 +14,4 @@ @RequestMapping("/vol") public class VolController extends BaseController { - - @Autowired - private IVolService volService; - - - } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java index 462f31a..9c69d3c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java @@ -23,4 +23,6 @@ List hsList(Long detectorId,String type); + void insertPsdAlarms(); + } 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 f1adc1e..79193f9 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 @@ -10,15 +10,18 @@ import com.casic.missiles.modular.neutron.dto.PsdDataDTO; import com.casic.missiles.modular.neutron.model.Psd; import com.casic.missiles.modular.neutron.service.IPsdService; +import com.casic.missiles.modular.robot.model.AlarmRecord; import com.casic.missiles.modular.robot.model.RobotInfo; import com.casic.missiles.modular.robot.model.RobotTrajectoryInfo; import com.casic.missiles.modular.robot.model.TaskInfo; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; import com.casic.missiles.modular.robot.service.IRobotInfoService; import com.casic.missiles.modular.robot.service.IRobotTrajectoryInfoService; import com.casic.missiles.modular.robot.service.ITaskInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -42,6 +45,8 @@ private AbstractDictService dictService; @Autowired private IRobotInfoService robotInfoService; + @Autowired + private IAlarmRecordService iAlarmRecordService; @Override @@ -58,7 +63,7 @@ long countX = DateUtil.between(DateUtil.parseDateTime(last.getTimeCount()), DateUtil.parseDateTime(startTime), DateUnit.SECOND, true); for (int i = 0; i <= countX / 5; i++) { if (i == 0) { - psdDataDTOS.add(new PsdDataDTO("0", "0")); + psdDataDTOS.add(new PsdDataDTO("0", "0")); continue; } int countY = 0; @@ -74,7 +79,7 @@ } } } - psdDataDTO.setValueCount(String.format("%.2f",countY*1.00 / 5)); + psdDataDTO.setValueCount(String.format("%.2f", countY * 1.00 / 5)); psdDataDTOS.add(psdDataDTO); } } @@ -112,7 +117,40 @@ } @Override - public List hsList(Long detectorId,String type) { + public List hsList(Long detectorId, String type) { return null; } + + @Override + public void insertPsdAlarms() { + + //先查询正在巡检任务信息 + List taskInfoList = iTaskInfoService.getTaskListByStatus(0, 1, 1); + List alarmRecordList = new ArrayList<>(); + + for (TaskInfo taskInfo : taskInfoList) { + if (iAlarmRecordService.getAlarmByTask(taskInfo.getId())) continue; + String startTime = ObjectUtil.isNotEmpty(taskInfo.getStartTime()) ? DateUtil.formatDateTime(taskInfo.getStartTime()) : taskInfo.getStartTime() + ""; + Long robotId = taskInfo.getRobotId(); + //查询满足13个中子的时间 + List alarmTimeList = this.baseMapper.getPsdAlarm(startTime, robotId); + if (ObjectUtil.isNotEmpty(alarmTimeList) && alarmTimeList.size() >= 13) { + String alarmTime = alarmTimeList.get(12); + AlarmRecord alarmRecord = new AlarmRecord(robotId, + new BigDecimal(13), + DateUtil.parseDateTime(alarmTime), + taskInfo.getId()); + //用这个时间取查询最近的巡检点位 + RobotTrajectoryInfo trajectoryInfo = trajectoryInfoService.getRobotTrajectoryInfoByTime(alarmTime, robotId); + if (ObjectUtil.isNotEmpty(trajectoryInfo)) { + alarmRecord.setX(trajectoryInfo.getPostionX()); + alarmRecord.setY(trajectoryInfo.getPostionY()); + } + alarmRecordList.add(alarmRecord); + } + } + if (null != alarmRecordList && alarmRecordList.size() > 0) { + iAlarmRecordService.saveBatch(alarmRecordList); + } + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java index ebd4f4c..976e419 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java @@ -145,4 +145,15 @@ + "taskId=" + taskId + "}"; } + + public AlarmRecord() { + } + + public AlarmRecord(Long robotId, BigDecimal monitorVal, Date alarmTime, Long taskId) { + this.robotId = robotId; + this.monitorVal = monitorVal; + this.alarmTime = alarmTime; + this.taskId = taskId; + this.createTime=new Date(); + } } \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java index ed384a0..95e912c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java @@ -30,4 +30,11 @@ * @return */ Integer selectCountByTaskId(Long id,Long robotId); + + /** + * 根据任务id查询是否已经产生中子源告警 + * @param taskId + * @return + */ + boolean getAlarmByTask(Long taskId); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java index ff145c2..7b63157 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java @@ -31,4 +31,13 @@ * @param info 机器信息 */ void reloadTask(StartTrackRequest request, RobotInfo info); + + /** + * 根据状态和类型查询任务 + * @param status + * @param taskType + * @param discernType + * @return + */ + List getTaskListByStatus(Integer status,Integer taskType,Integer discernType); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java index a0ec69d..3a22f77 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java @@ -29,6 +29,7 @@ public class AlarmRecordServiceImpl extends ServiceImpl implements IAlarmRecordService { private final IRobotInfoService robotInfoService; private final AbstractDictService dictService; + public AlarmRecordServiceImpl(@Lazy IRobotInfoService robotInfoService, AbstractDictService dictService) { this.robotInfoService = robotInfoService; this.dictService = dictService; @@ -67,4 +68,11 @@ Integer num = this.count(query); return num; } + + @Override + public boolean getAlarmByTask(Long taskId) { + QueryWrapper query = new QueryWrapper<>(); + query.eq("task_id", taskId); + return this.baseMapper.selectCount(query) > 0 ? true : false; + } } \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java index 9f2c93c..50b508e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -135,4 +136,14 @@ statusInfoService.updateCurrTask(robotId, null, null); } } + + + @Override + public List getTaskListByStatus(Integer status, Integer taskType, Integer discernType) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(null != status, "task_status", status); + queryWrapper.eq(null != taskType, "task_type", taskType); + queryWrapper.eq(null != discernType, "discern_type", discernType); + return this.list(queryWrapper); + } } \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/quartz/AlarmQuartz.java b/casic-server/src/main/java/com/casic/missiles/quartz/AlarmQuartz.java new file mode 100644 index 0000000..f1a263b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/quartz/AlarmQuartz.java @@ -0,0 +1,26 @@ +package com.casic.missiles.quartz; + +import com.casic.missiles.modular.neutron.service.IPsdService; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Date; + +@Component +public class AlarmQuartz implements Job { + /** + * 执行定时任务 * * @param jobExecutionContext * @throws JobExecutionException + */ + + @Autowired + IPsdService iPsdService; + @Override + public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + + //根据每次巡检写入中子数超过基准报警记录 + iPsdService.insertPsdAlarms(); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/quartz/QuartzConfig.java b/casic-server/src/main/java/com/casic/missiles/quartz/QuartzConfig.java new file mode 100644 index 0000000..f8865cb --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/quartz/QuartzConfig.java @@ -0,0 +1,27 @@ +package com.casic.missiles.quartz; + +import org.quartz.*; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class QuartzConfig { + @Bean + public JobDetail alarmQuartzDetail() { + return JobBuilder.newJob(AlarmQuartz.class).withIdentity("alarmQuartz"). + storeDurably().build(); + } + + @Bean + public Trigger alarmQuartzTrigger() { + SimpleScheduleBuilder scheduleBuilder = SimpleScheduleBuilder.simpleSchedule() + //设置时间周期单位秒 每隔两秒实行一次 + .withIntervalInSeconds(30) + .repeatForever(); + return TriggerBuilder.newTrigger().forJob(alarmQuartzDetail()) + .withIdentity("alarmQuartz") + .withSchedule(scheduleBuilder) + .build(); + } + +} diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index db10efc..bf403dd 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -4,9 +4,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/casic_robot_inspection?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true + url: jdbc:mysql://111.198.10.15:11336/casic_robot_inspection?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=GMT%2B8 username: root - password: 123456 + password: Casic203 jms: pub-sub-domain: true # session: diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 348d4f3..b3c29a0 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -37,8 +37,8 @@ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒 session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒 no-login-urls: /user/login,/kaptcha,/config/baseConfig - hikSdk: D:\workspace\server\keti\casic-robot-inspection\casic-web\src\main\resources\config\hiklib\HCNetSDK.dll - hikPlay: D:\workspace\server\keti\casic-robot-inspection\casic-web\src\main\resources\config\hiklib\PlayCtrl.dll + hikSdk: D:\code\robot\casic-robot-inspection\casic-web\src\main\resources\config\hiklib\HCNetSDK.dll + hikPlay: D:\code\robot\casic-robot-inspection\casic-web\src\main\resources\config\hiklib\PlayCtrl.dll config: export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\ config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\