diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java new file mode 100644 index 0000000..d20ef1a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器参数下发记录 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorConfigMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java new file mode 100644 index 0000000..d20ef1a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器参数下发记录 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorConfigMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java new file mode 100644 index 0000000..5c4b005 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器升降压操作日志 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorLogMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java new file mode 100644 index 0000000..d20ef1a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器参数下发记录 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorConfigMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java new file mode 100644 index 0000000..5c4b005 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器升降压操作日志 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorLogMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java deleted file mode 100644 index d3aedd4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器升降压操作日志 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface LogMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java new file mode 100644 index 0000000..d20ef1a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器参数下发记录 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorConfigMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java new file mode 100644 index 0000000..5c4b005 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器升降压操作日志 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorLogMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java deleted file mode 100644 index d3aedd4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器升降压操作日志 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface LogMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml deleted file mode 100644 index 5a02cdb..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java new file mode 100644 index 0000000..d20ef1a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器参数下发记录 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorConfigMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java new file mode 100644 index 0000000..5c4b005 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器升降压操作日志 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorLogMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java deleted file mode 100644 index d3aedd4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器升降压操作日志 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface LogMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml deleted file mode 100644 index 5a02cdb..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml new file mode 100644 index 0000000..806dcd8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java new file mode 100644 index 0000000..d20ef1a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器参数下发记录 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorConfigMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java new file mode 100644 index 0000000..5c4b005 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器升降压操作日志 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorLogMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java deleted file mode 100644 index d3aedd4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器升降压操作日志 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface LogMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml deleted file mode 100644 index 5a02cdb..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml new file mode 100644 index 0000000..806dcd8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml new file mode 100644 index 0000000..707991d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java new file mode 100644 index 0000000..d20ef1a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器参数下发记录 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorConfigMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java new file mode 100644 index 0000000..5c4b005 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器升降压操作日志 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorLogMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java deleted file mode 100644 index d3aedd4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器升降压操作日志 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface LogMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml deleted file mode 100644 index 5a02cdb..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml new file mode 100644 index 0000000..806dcd8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml new file mode 100644 index 0000000..707991d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml deleted file mode 100644 index 6d3190f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java new file mode 100644 index 0000000..d20ef1a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器参数下发记录 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorConfigMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java new file mode 100644 index 0000000..5c4b005 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器升降压操作日志 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorLogMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java deleted file mode 100644 index d3aedd4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器升降压操作日志 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface LogMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml deleted file mode 100644 index 5a02cdb..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml new file mode 100644 index 0000000..806dcd8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml new file mode 100644 index 0000000..707991d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml deleted file mode 100644 index 6d3190f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java deleted file mode 100644 index 720460d..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器参数下发记录 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_config") -@ApiModel(value = "配置信息对象", description = "配置信息记录表") -public class Config extends Model { - - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "降压时间") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - - private Long detectorId; - /** - * 高压参数 - */ - @ApiModelProperty(value = "高压参数") - @TableField("VOL_6") - private String vol6; - /** - * 高速-波形采样-触发方式 - */ - @TableField("RAW_TRIG") - @ApiModelProperty(value = "高速-波形采样-触发方式") - private String rawTrig; - /** - * 高速-波形采样-触发周期 - */ - @TableField("RAW_PERIOD") - @ApiModelProperty(value = "高速-波形采样-触发周期") - private String rawPeriod; - /** - * 高速-波形采样-触发阈值 - */ - @TableField("RAW_VTH") - @ApiModelProperty(value = "高速-波形采样-触发阈值") - private String rawVth; - /** - * 高速-波形采样-采取点数 - */ - @TableField("RAW_SAMPLE") - @ApiModelProperty(value = "高速-波形采样-采取点数") - private String rawSample; - /** - * 高速-波形甑别-E最大值 - */ - @TableField("PSD_E") - @ApiModelProperty(value = "高速-波形甑别-E最大值") - private String psdE; - /** - * 高速-波形甑别-触发方式 - */ - @TableField("PSD_TRIG") - @ApiModelProperty(value = "高速-波形甑别-触发方式") - private String psdTrig; - /** - * 高速-波形甑别-触发周期 - */ - @TableField("PSD_PERIOD") - @ApiModelProperty(value = " 高速-波形甑别-触发周期") - private String psdPeriod; - /** - * 高速-波形甑别-触发阈值 - */ - @TableField("PSD_VTH") - @ApiModelProperty(value = "高速-波形甑别-触发阈值") - private String psdVth; - /** - * 高速-波形甑别-门偏移 - */ - @TableField("PSD_OFFSET") - @ApiModelProperty(value = "高速-波形甑别-门偏移") - private String psdOffset; - /** - * 高速-波形甑别-长门 - */ - @TableField("PSD_LONG_GATE") - @ApiModelProperty(value = "高速-波形甑别-长门") - private String psdLongGate; - /** - * 高速-波形甑别-短门 - */ - @TableField("PSD_SHORT_GATE") - @ApiModelProperty(value = "高速-波形甑别-短门") - private String psdShortGate; - /** - * 时间 - */ - @TableField("CREATE_TIME") - @ApiModelProperty(value = "时间") - private String createTime; - /** - * 备注 - */ - @TableField("DESCRIPTION") - @ApiModelProperty(value = "备注") - private String description; - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java new file mode 100644 index 0000000..d20ef1a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器参数下发记录 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorConfigMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java new file mode 100644 index 0000000..5c4b005 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器升降压操作日志 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorLogMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java deleted file mode 100644 index d3aedd4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器升降压操作日志 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface LogMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml deleted file mode 100644 index 5a02cdb..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml new file mode 100644 index 0000000..806dcd8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml new file mode 100644 index 0000000..707991d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml deleted file mode 100644 index 6d3190f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java deleted file mode 100644 index 720460d..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器参数下发记录 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_config") -@ApiModel(value = "配置信息对象", description = "配置信息记录表") -public class Config extends Model { - - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "降压时间") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - - private Long detectorId; - /** - * 高压参数 - */ - @ApiModelProperty(value = "高压参数") - @TableField("VOL_6") - private String vol6; - /** - * 高速-波形采样-触发方式 - */ - @TableField("RAW_TRIG") - @ApiModelProperty(value = "高速-波形采样-触发方式") - private String rawTrig; - /** - * 高速-波形采样-触发周期 - */ - @TableField("RAW_PERIOD") - @ApiModelProperty(value = "高速-波形采样-触发周期") - private String rawPeriod; - /** - * 高速-波形采样-触发阈值 - */ - @TableField("RAW_VTH") - @ApiModelProperty(value = "高速-波形采样-触发阈值") - private String rawVth; - /** - * 高速-波形采样-采取点数 - */ - @TableField("RAW_SAMPLE") - @ApiModelProperty(value = "高速-波形采样-采取点数") - private String rawSample; - /** - * 高速-波形甑别-E最大值 - */ - @TableField("PSD_E") - @ApiModelProperty(value = "高速-波形甑别-E最大值") - private String psdE; - /** - * 高速-波形甑别-触发方式 - */ - @TableField("PSD_TRIG") - @ApiModelProperty(value = "高速-波形甑别-触发方式") - private String psdTrig; - /** - * 高速-波形甑别-触发周期 - */ - @TableField("PSD_PERIOD") - @ApiModelProperty(value = " 高速-波形甑别-触发周期") - private String psdPeriod; - /** - * 高速-波形甑别-触发阈值 - */ - @TableField("PSD_VTH") - @ApiModelProperty(value = "高速-波形甑别-触发阈值") - private String psdVth; - /** - * 高速-波形甑别-门偏移 - */ - @TableField("PSD_OFFSET") - @ApiModelProperty(value = "高速-波形甑别-门偏移") - private String psdOffset; - /** - * 高速-波形甑别-长门 - */ - @TableField("PSD_LONG_GATE") - @ApiModelProperty(value = "高速-波形甑别-长门") - private String psdLongGate; - /** - * 高速-波形甑别-短门 - */ - @TableField("PSD_SHORT_GATE") - @ApiModelProperty(value = "高速-波形甑别-短门") - private String psdShortGate; - /** - * 时间 - */ - @TableField("CREATE_TIME") - @ApiModelProperty(value = "时间") - private String createTime; - /** - * 备注 - */ - @TableField("DESCRIPTION") - @ApiModelProperty(value = "备注") - private String description; - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java new file mode 100644 index 0000000..b6e4611 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java @@ -0,0 +1,131 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器参数下发记录 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_config") +@ApiModel(value = "配置信息对象", description = "配置信息记录表") +public class DetectorConfig extends Model { + + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "降压时间") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + + private Long detectorId; + /** + * 高压参数 + */ + @ApiModelProperty(value = "高压参数,一般设置1.2V") + @TableField("VOL_6") + private String vol6; + /** + * 高速-波形采样-触发方式 + */ + @TableField("RAW_TRIG") + @ApiModelProperty(value = "高速-波形采样-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String rawTrig; + /** + * 高速-波形采样-触发周期 + */ + @TableField("RAW_PERIOD") + @ApiModelProperty(value = "高速-波形采样-触发周期") + private String rawPeriod; + /** + * 高速-波形采样-触发阈值 + */ + @TableField("RAW_VTH") + @ApiModelProperty(value = "高速-波形采样-触发阈值") + private String rawVth; + /** + * 高速-波形采样-采取点数 + */ + @TableField("RAW_SAMPLE") + @ApiModelProperty(value = "高速-波形采样-采取点数") + private String rawSample; + /** + * 高速-波形甑别-E最大值 + */ + @TableField("PSD_E") + @ApiModelProperty(value = "高速-波形甑别-E最大值") + private String psdE; + /** + * 高速-波形甑别-触发方式 + */ + @TableField("PSD_TRIG") + @ApiModelProperty(value = "高速-波形甑别-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String psdTrig; + /** + * 高速-波形甑别-触发周期 + */ + @TableField("PSD_PERIOD") + @ApiModelProperty(value = "高速-波形甑别-触发周期") + private String psdPeriod; + /** + * 高速-波形甑别-触发阈值 + */ + @TableField("PSD_VTH") + @ApiModelProperty(value = "高速-波形甑别-触发阈值") + private String psdVth; + /** + * 高速-波形甑别-门偏移 + */ + @TableField("PSD_OFFSET") + @ApiModelProperty(value = "高速-波形甑别-门偏移") + private String psdOffset; + /** + * 高速-波形甑别-长门 + */ + @TableField("PSD_LONG_GATE") + @ApiModelProperty(value = "高速-波形甑别-长门") + private String psdLongGate; + /** + * 高速-波形甑别-短门 + */ + @TableField("PSD_SHORT_GATE") + @ApiModelProperty(value = "高速-波形甑别-短门") + private String psdShortGate; + /** + * 时间 + */ + @TableField("CREATE_TIME") + @ApiModelProperty(value = "时间") + private String createTime; + /** + * 备注 + */ + @TableField("DESCRIPTION") + @ApiModelProperty(value = "备注") + private String description; + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java new file mode 100644 index 0000000..d20ef1a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器参数下发记录 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorConfigMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java new file mode 100644 index 0000000..5c4b005 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器升降压操作日志 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorLogMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java deleted file mode 100644 index d3aedd4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器升降压操作日志 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface LogMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml deleted file mode 100644 index 5a02cdb..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml new file mode 100644 index 0000000..806dcd8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml new file mode 100644 index 0000000..707991d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml deleted file mode 100644 index 6d3190f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java deleted file mode 100644 index 720460d..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器参数下发记录 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_config") -@ApiModel(value = "配置信息对象", description = "配置信息记录表") -public class Config extends Model { - - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "降压时间") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - - private Long detectorId; - /** - * 高压参数 - */ - @ApiModelProperty(value = "高压参数") - @TableField("VOL_6") - private String vol6; - /** - * 高速-波形采样-触发方式 - */ - @TableField("RAW_TRIG") - @ApiModelProperty(value = "高速-波形采样-触发方式") - private String rawTrig; - /** - * 高速-波形采样-触发周期 - */ - @TableField("RAW_PERIOD") - @ApiModelProperty(value = "高速-波形采样-触发周期") - private String rawPeriod; - /** - * 高速-波形采样-触发阈值 - */ - @TableField("RAW_VTH") - @ApiModelProperty(value = "高速-波形采样-触发阈值") - private String rawVth; - /** - * 高速-波形采样-采取点数 - */ - @TableField("RAW_SAMPLE") - @ApiModelProperty(value = "高速-波形采样-采取点数") - private String rawSample; - /** - * 高速-波形甑别-E最大值 - */ - @TableField("PSD_E") - @ApiModelProperty(value = "高速-波形甑别-E最大值") - private String psdE; - /** - * 高速-波形甑别-触发方式 - */ - @TableField("PSD_TRIG") - @ApiModelProperty(value = "高速-波形甑别-触发方式") - private String psdTrig; - /** - * 高速-波形甑别-触发周期 - */ - @TableField("PSD_PERIOD") - @ApiModelProperty(value = " 高速-波形甑别-触发周期") - private String psdPeriod; - /** - * 高速-波形甑别-触发阈值 - */ - @TableField("PSD_VTH") - @ApiModelProperty(value = "高速-波形甑别-触发阈值") - private String psdVth; - /** - * 高速-波形甑别-门偏移 - */ - @TableField("PSD_OFFSET") - @ApiModelProperty(value = "高速-波形甑别-门偏移") - private String psdOffset; - /** - * 高速-波形甑别-长门 - */ - @TableField("PSD_LONG_GATE") - @ApiModelProperty(value = "高速-波形甑别-长门") - private String psdLongGate; - /** - * 高速-波形甑别-短门 - */ - @TableField("PSD_SHORT_GATE") - @ApiModelProperty(value = "高速-波形甑别-短门") - private String psdShortGate; - /** - * 时间 - */ - @TableField("CREATE_TIME") - @ApiModelProperty(value = "时间") - private String createTime; - /** - * 备注 - */ - @TableField("DESCRIPTION") - @ApiModelProperty(value = "备注") - private String description; - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java new file mode 100644 index 0000000..b6e4611 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java @@ -0,0 +1,131 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器参数下发记录 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_config") +@ApiModel(value = "配置信息对象", description = "配置信息记录表") +public class DetectorConfig extends Model { + + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "降压时间") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + + private Long detectorId; + /** + * 高压参数 + */ + @ApiModelProperty(value = "高压参数,一般设置1.2V") + @TableField("VOL_6") + private String vol6; + /** + * 高速-波形采样-触发方式 + */ + @TableField("RAW_TRIG") + @ApiModelProperty(value = "高速-波形采样-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String rawTrig; + /** + * 高速-波形采样-触发周期 + */ + @TableField("RAW_PERIOD") + @ApiModelProperty(value = "高速-波形采样-触发周期") + private String rawPeriod; + /** + * 高速-波形采样-触发阈值 + */ + @TableField("RAW_VTH") + @ApiModelProperty(value = "高速-波形采样-触发阈值") + private String rawVth; + /** + * 高速-波形采样-采取点数 + */ + @TableField("RAW_SAMPLE") + @ApiModelProperty(value = "高速-波形采样-采取点数") + private String rawSample; + /** + * 高速-波形甑别-E最大值 + */ + @TableField("PSD_E") + @ApiModelProperty(value = "高速-波形甑别-E最大值") + private String psdE; + /** + * 高速-波形甑别-触发方式 + */ + @TableField("PSD_TRIG") + @ApiModelProperty(value = "高速-波形甑别-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String psdTrig; + /** + * 高速-波形甑别-触发周期 + */ + @TableField("PSD_PERIOD") + @ApiModelProperty(value = "高速-波形甑别-触发周期") + private String psdPeriod; + /** + * 高速-波形甑别-触发阈值 + */ + @TableField("PSD_VTH") + @ApiModelProperty(value = "高速-波形甑别-触发阈值") + private String psdVth; + /** + * 高速-波形甑别-门偏移 + */ + @TableField("PSD_OFFSET") + @ApiModelProperty(value = "高速-波形甑别-门偏移") + private String psdOffset; + /** + * 高速-波形甑别-长门 + */ + @TableField("PSD_LONG_GATE") + @ApiModelProperty(value = "高速-波形甑别-长门") + private String psdLongGate; + /** + * 高速-波形甑别-短门 + */ + @TableField("PSD_SHORT_GATE") + @ApiModelProperty(value = "高速-波形甑别-短门") + private String psdShortGate; + /** + * 时间 + */ + @TableField("CREATE_TIME") + @ApiModelProperty(value = "时间") + private String createTime; + /** + * 备注 + */ + @TableField("DESCRIPTION") + @ApiModelProperty(value = "备注") + private String description; + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java new file mode 100644 index 0000000..178a924 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器升降压操作日志 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_log") +@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") +public class DetectorLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "主键") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + private Long detectorId; + /** + * 升压时间 + */ + @ApiModelProperty(value = "升压时间") + @TableField("INCREASE_TIME") + private String increaseTime; + /** + * 降压时间 + */ + @ApiModelProperty(value = "降压时间") + @TableField("DECREASE_TIME") + private String decreaseTime; + /** + * 当前状态 + */ + @ApiModelProperty(value = "当前状态,0:空闲，1:升压，2:降压") + @TableField("STATUS") + private String status; + /** + * 通道号 + */ + @ApiModelProperty(value = "通道号") + @TableField("CHANNEL") + private String channel; + /** + * 时间 + */ + @ApiModelProperty(value = "时间") + @TableField("CREATE_TIME") + private String createTime; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + @TableField("DESCRIPTION") + private String description; + + public DetectorLog() { + } + + public DetectorLog(Long detectorId, String increaseTime, + String decreaseTime, String status, + String channel, String createTime) { + this.detectorId = detectorId; + this.increaseTime = increaseTime; + this.decreaseTime = decreaseTime; + this.status = status; + this.channel = channel; + this.createTime = createTime; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java new file mode 100644 index 0000000..d20ef1a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器参数下发记录 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorConfigMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java new file mode 100644 index 0000000..5c4b005 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器升降压操作日志 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorLogMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java deleted file mode 100644 index d3aedd4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器升降压操作日志 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface LogMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml deleted file mode 100644 index 5a02cdb..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml new file mode 100644 index 0000000..806dcd8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml new file mode 100644 index 0000000..707991d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml deleted file mode 100644 index 6d3190f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java deleted file mode 100644 index 720460d..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器参数下发记录 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_config") -@ApiModel(value = "配置信息对象", description = "配置信息记录表") -public class Config extends Model { - - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "降压时间") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - - private Long detectorId; - /** - * 高压参数 - */ - @ApiModelProperty(value = "高压参数") - @TableField("VOL_6") - private String vol6; - /** - * 高速-波形采样-触发方式 - */ - @TableField("RAW_TRIG") - @ApiModelProperty(value = "高速-波形采样-触发方式") - private String rawTrig; - /** - * 高速-波形采样-触发周期 - */ - @TableField("RAW_PERIOD") - @ApiModelProperty(value = "高速-波形采样-触发周期") - private String rawPeriod; - /** - * 高速-波形采样-触发阈值 - */ - @TableField("RAW_VTH") - @ApiModelProperty(value = "高速-波形采样-触发阈值") - private String rawVth; - /** - * 高速-波形采样-采取点数 - */ - @TableField("RAW_SAMPLE") - @ApiModelProperty(value = "高速-波形采样-采取点数") - private String rawSample; - /** - * 高速-波形甑别-E最大值 - */ - @TableField("PSD_E") - @ApiModelProperty(value = "高速-波形甑别-E最大值") - private String psdE; - /** - * 高速-波形甑别-触发方式 - */ - @TableField("PSD_TRIG") - @ApiModelProperty(value = "高速-波形甑别-触发方式") - private String psdTrig; - /** - * 高速-波形甑别-触发周期 - */ - @TableField("PSD_PERIOD") - @ApiModelProperty(value = " 高速-波形甑别-触发周期") - private String psdPeriod; - /** - * 高速-波形甑别-触发阈值 - */ - @TableField("PSD_VTH") - @ApiModelProperty(value = "高速-波形甑别-触发阈值") - private String psdVth; - /** - * 高速-波形甑别-门偏移 - */ - @TableField("PSD_OFFSET") - @ApiModelProperty(value = "高速-波形甑别-门偏移") - private String psdOffset; - /** - * 高速-波形甑别-长门 - */ - @TableField("PSD_LONG_GATE") - @ApiModelProperty(value = "高速-波形甑别-长门") - private String psdLongGate; - /** - * 高速-波形甑别-短门 - */ - @TableField("PSD_SHORT_GATE") - @ApiModelProperty(value = "高速-波形甑别-短门") - private String psdShortGate; - /** - * 时间 - */ - @TableField("CREATE_TIME") - @ApiModelProperty(value = "时间") - private String createTime; - /** - * 备注 - */ - @TableField("DESCRIPTION") - @ApiModelProperty(value = "备注") - private String description; - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java new file mode 100644 index 0000000..b6e4611 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java @@ -0,0 +1,131 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器参数下发记录 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_config") +@ApiModel(value = "配置信息对象", description = "配置信息记录表") +public class DetectorConfig extends Model { + + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "降压时间") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + + private Long detectorId; + /** + * 高压参数 + */ + @ApiModelProperty(value = "高压参数,一般设置1.2V") + @TableField("VOL_6") + private String vol6; + /** + * 高速-波形采样-触发方式 + */ + @TableField("RAW_TRIG") + @ApiModelProperty(value = "高速-波形采样-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String rawTrig; + /** + * 高速-波形采样-触发周期 + */ + @TableField("RAW_PERIOD") + @ApiModelProperty(value = "高速-波形采样-触发周期") + private String rawPeriod; + /** + * 高速-波形采样-触发阈值 + */ + @TableField("RAW_VTH") + @ApiModelProperty(value = "高速-波形采样-触发阈值") + private String rawVth; + /** + * 高速-波形采样-采取点数 + */ + @TableField("RAW_SAMPLE") + @ApiModelProperty(value = "高速-波形采样-采取点数") + private String rawSample; + /** + * 高速-波形甑别-E最大值 + */ + @TableField("PSD_E") + @ApiModelProperty(value = "高速-波形甑别-E最大值") + private String psdE; + /** + * 高速-波形甑别-触发方式 + */ + @TableField("PSD_TRIG") + @ApiModelProperty(value = "高速-波形甑别-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String psdTrig; + /** + * 高速-波形甑别-触发周期 + */ + @TableField("PSD_PERIOD") + @ApiModelProperty(value = "高速-波形甑别-触发周期") + private String psdPeriod; + /** + * 高速-波形甑别-触发阈值 + */ + @TableField("PSD_VTH") + @ApiModelProperty(value = "高速-波形甑别-触发阈值") + private String psdVth; + /** + * 高速-波形甑别-门偏移 + */ + @TableField("PSD_OFFSET") + @ApiModelProperty(value = "高速-波形甑别-门偏移") + private String psdOffset; + /** + * 高速-波形甑别-长门 + */ + @TableField("PSD_LONG_GATE") + @ApiModelProperty(value = "高速-波形甑别-长门") + private String psdLongGate; + /** + * 高速-波形甑别-短门 + */ + @TableField("PSD_SHORT_GATE") + @ApiModelProperty(value = "高速-波形甑别-短门") + private String psdShortGate; + /** + * 时间 + */ + @TableField("CREATE_TIME") + @ApiModelProperty(value = "时间") + private String createTime; + /** + * 备注 + */ + @TableField("DESCRIPTION") + @ApiModelProperty(value = "备注") + private String description; + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java new file mode 100644 index 0000000..178a924 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器升降压操作日志 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_log") +@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") +public class DetectorLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "主键") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + private Long detectorId; + /** + * 升压时间 + */ + @ApiModelProperty(value = "升压时间") + @TableField("INCREASE_TIME") + private String increaseTime; + /** + * 降压时间 + */ + @ApiModelProperty(value = "降压时间") + @TableField("DECREASE_TIME") + private String decreaseTime; + /** + * 当前状态 + */ + @ApiModelProperty(value = "当前状态,0:空闲，1:升压，2:降压") + @TableField("STATUS") + private String status; + /** + * 通道号 + */ + @ApiModelProperty(value = "通道号") + @TableField("CHANNEL") + private String channel; + /** + * 时间 + */ + @ApiModelProperty(value = "时间") + @TableField("CREATE_TIME") + private String createTime; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + @TableField("DESCRIPTION") + private String description; + + public DetectorLog() { + } + + public DetectorLog(Long detectorId, String increaseTime, + String decreaseTime, String status, + String channel, String createTime) { + this.detectorId = detectorId; + this.increaseTime = increaseTime; + this.decreaseTime = decreaseTime; + this.status = status; + this.channel = channel; + this.createTime = createTime; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java deleted file mode 100644 index b128e3b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器升降压操作日志 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_log") -@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") -public class Log extends Model { - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "主键") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - private Long detectorId; - /** - * 升压时间 - */ - @ApiModelProperty(value = "升压时间") - @TableField("INCREASE_TIME") - private String increaseTime; - /** - * 降压时间 - */ - @ApiModelProperty(value = "降压时间") - @TableField("DECREASE_TIME") - private String decreaseTime; - /** - * 当前状态 - */ - @ApiModelProperty(value = "当前状态") - @TableField("STATUS") - private String status; - /** - * 通道号 - */ - @ApiModelProperty(value = "通道号") - @TableField("CHANNEL") - private String channel; - /** - * 时间 - */ - @ApiModelProperty(value = "时间") - @TableField("CREATE_TIME") - private String createTime; - /** - * 备注 - */ - @ApiModelProperty(value = "备注") - @TableField("DESCRIPTION") - private String description; -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java new file mode 100644 index 0000000..d20ef1a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器参数下发记录 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorConfigMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java new file mode 100644 index 0000000..5c4b005 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器升降压操作日志 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorLogMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java deleted file mode 100644 index d3aedd4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器升降压操作日志 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface LogMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml deleted file mode 100644 index 5a02cdb..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml new file mode 100644 index 0000000..806dcd8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml new file mode 100644 index 0000000..707991d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml deleted file mode 100644 index 6d3190f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java deleted file mode 100644 index 720460d..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器参数下发记录 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_config") -@ApiModel(value = "配置信息对象", description = "配置信息记录表") -public class Config extends Model { - - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "降压时间") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - - private Long detectorId; - /** - * 高压参数 - */ - @ApiModelProperty(value = "高压参数") - @TableField("VOL_6") - private String vol6; - /** - * 高速-波形采样-触发方式 - */ - @TableField("RAW_TRIG") - @ApiModelProperty(value = "高速-波形采样-触发方式") - private String rawTrig; - /** - * 高速-波形采样-触发周期 - */ - @TableField("RAW_PERIOD") - @ApiModelProperty(value = "高速-波形采样-触发周期") - private String rawPeriod; - /** - * 高速-波形采样-触发阈值 - */ - @TableField("RAW_VTH") - @ApiModelProperty(value = "高速-波形采样-触发阈值") - private String rawVth; - /** - * 高速-波形采样-采取点数 - */ - @TableField("RAW_SAMPLE") - @ApiModelProperty(value = "高速-波形采样-采取点数") - private String rawSample; - /** - * 高速-波形甑别-E最大值 - */ - @TableField("PSD_E") - @ApiModelProperty(value = "高速-波形甑别-E最大值") - private String psdE; - /** - * 高速-波形甑别-触发方式 - */ - @TableField("PSD_TRIG") - @ApiModelProperty(value = "高速-波形甑别-触发方式") - private String psdTrig; - /** - * 高速-波形甑别-触发周期 - */ - @TableField("PSD_PERIOD") - @ApiModelProperty(value = " 高速-波形甑别-触发周期") - private String psdPeriod; - /** - * 高速-波形甑别-触发阈值 - */ - @TableField("PSD_VTH") - @ApiModelProperty(value = "高速-波形甑别-触发阈值") - private String psdVth; - /** - * 高速-波形甑别-门偏移 - */ - @TableField("PSD_OFFSET") - @ApiModelProperty(value = "高速-波形甑别-门偏移") - private String psdOffset; - /** - * 高速-波形甑别-长门 - */ - @TableField("PSD_LONG_GATE") - @ApiModelProperty(value = "高速-波形甑别-长门") - private String psdLongGate; - /** - * 高速-波形甑别-短门 - */ - @TableField("PSD_SHORT_GATE") - @ApiModelProperty(value = "高速-波形甑别-短门") - private String psdShortGate; - /** - * 时间 - */ - @TableField("CREATE_TIME") - @ApiModelProperty(value = "时间") - private String createTime; - /** - * 备注 - */ - @TableField("DESCRIPTION") - @ApiModelProperty(value = "备注") - private String description; - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java new file mode 100644 index 0000000..b6e4611 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java @@ -0,0 +1,131 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器参数下发记录 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_config") +@ApiModel(value = "配置信息对象", description = "配置信息记录表") +public class DetectorConfig extends Model { + + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "降压时间") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + + private Long detectorId; + /** + * 高压参数 + */ + @ApiModelProperty(value = "高压参数,一般设置1.2V") + @TableField("VOL_6") + private String vol6; + /** + * 高速-波形采样-触发方式 + */ + @TableField("RAW_TRIG") + @ApiModelProperty(value = "高速-波形采样-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String rawTrig; + /** + * 高速-波形采样-触发周期 + */ + @TableField("RAW_PERIOD") + @ApiModelProperty(value = "高速-波形采样-触发周期") + private String rawPeriod; + /** + * 高速-波形采样-触发阈值 + */ + @TableField("RAW_VTH") + @ApiModelProperty(value = "高速-波形采样-触发阈值") + private String rawVth; + /** + * 高速-波形采样-采取点数 + */ + @TableField("RAW_SAMPLE") + @ApiModelProperty(value = "高速-波形采样-采取点数") + private String rawSample; + /** + * 高速-波形甑别-E最大值 + */ + @TableField("PSD_E") + @ApiModelProperty(value = "高速-波形甑别-E最大值") + private String psdE; + /** + * 高速-波形甑别-触发方式 + */ + @TableField("PSD_TRIG") + @ApiModelProperty(value = "高速-波形甑别-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String psdTrig; + /** + * 高速-波形甑别-触发周期 + */ + @TableField("PSD_PERIOD") + @ApiModelProperty(value = "高速-波形甑别-触发周期") + private String psdPeriod; + /** + * 高速-波形甑别-触发阈值 + */ + @TableField("PSD_VTH") + @ApiModelProperty(value = "高速-波形甑别-触发阈值") + private String psdVth; + /** + * 高速-波形甑别-门偏移 + */ + @TableField("PSD_OFFSET") + @ApiModelProperty(value = "高速-波形甑别-门偏移") + private String psdOffset; + /** + * 高速-波形甑别-长门 + */ + @TableField("PSD_LONG_GATE") + @ApiModelProperty(value = "高速-波形甑别-长门") + private String psdLongGate; + /** + * 高速-波形甑别-短门 + */ + @TableField("PSD_SHORT_GATE") + @ApiModelProperty(value = "高速-波形甑别-短门") + private String psdShortGate; + /** + * 时间 + */ + @TableField("CREATE_TIME") + @ApiModelProperty(value = "时间") + private String createTime; + /** + * 备注 + */ + @TableField("DESCRIPTION") + @ApiModelProperty(value = "备注") + private String description; + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java new file mode 100644 index 0000000..178a924 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器升降压操作日志 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_log") +@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") +public class DetectorLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "主键") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + private Long detectorId; + /** + * 升压时间 + */ + @ApiModelProperty(value = "升压时间") + @TableField("INCREASE_TIME") + private String increaseTime; + /** + * 降压时间 + */ + @ApiModelProperty(value = "降压时间") + @TableField("DECREASE_TIME") + private String decreaseTime; + /** + * 当前状态 + */ + @ApiModelProperty(value = "当前状态,0:空闲，1:升压，2:降压") + @TableField("STATUS") + private String status; + /** + * 通道号 + */ + @ApiModelProperty(value = "通道号") + @TableField("CHANNEL") + private String channel; + /** + * 时间 + */ + @ApiModelProperty(value = "时间") + @TableField("CREATE_TIME") + private String createTime; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + @TableField("DESCRIPTION") + private String description; + + public DetectorLog() { + } + + public DetectorLog(Long detectorId, String increaseTime, + String decreaseTime, String status, + String channel, String createTime) { + this.detectorId = detectorId; + this.increaseTime = increaseTime; + this.decreaseTime = decreaseTime; + this.status = status; + this.channel = channel; + this.createTime = createTime; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java deleted file mode 100644 index b128e3b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器升降压操作日志 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_log") -@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") -public class Log extends Model { - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "主键") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - private Long detectorId; - /** - * 升压时间 - */ - @ApiModelProperty(value = "升压时间") - @TableField("INCREASE_TIME") - private String increaseTime; - /** - * 降压时间 - */ - @ApiModelProperty(value = "降压时间") - @TableField("DECREASE_TIME") - private String decreaseTime; - /** - * 当前状态 - */ - @ApiModelProperty(value = "当前状态") - @TableField("STATUS") - private String status; - /** - * 通道号 - */ - @ApiModelProperty(value = "通道号") - @TableField("CHANNEL") - private String channel; - /** - * 时间 - */ - @ApiModelProperty(value = "时间") - @TableField("CREATE_TIME") - private String createTime; - /** - * 备注 - */ - @ApiModelProperty(value = "备注") - @TableField("DESCRIPTION") - private String description; -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java deleted file mode 100644 index f5a5336..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.service; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 探测器参数下发记录 服务类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface IConfigService extends IService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java new file mode 100644 index 0000000..d20ef1a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器参数下发记录 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorConfigMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java new file mode 100644 index 0000000..5c4b005 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器升降压操作日志 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorLogMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java deleted file mode 100644 index d3aedd4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器升降压操作日志 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface LogMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml deleted file mode 100644 index 5a02cdb..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml new file mode 100644 index 0000000..806dcd8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml new file mode 100644 index 0000000..707991d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml deleted file mode 100644 index 6d3190f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java deleted file mode 100644 index 720460d..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器参数下发记录 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_config") -@ApiModel(value = "配置信息对象", description = "配置信息记录表") -public class Config extends Model { - - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "降压时间") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - - private Long detectorId; - /** - * 高压参数 - */ - @ApiModelProperty(value = "高压参数") - @TableField("VOL_6") - private String vol6; - /** - * 高速-波形采样-触发方式 - */ - @TableField("RAW_TRIG") - @ApiModelProperty(value = "高速-波形采样-触发方式") - private String rawTrig; - /** - * 高速-波形采样-触发周期 - */ - @TableField("RAW_PERIOD") - @ApiModelProperty(value = "高速-波形采样-触发周期") - private String rawPeriod; - /** - * 高速-波形采样-触发阈值 - */ - @TableField("RAW_VTH") - @ApiModelProperty(value = "高速-波形采样-触发阈值") - private String rawVth; - /** - * 高速-波形采样-采取点数 - */ - @TableField("RAW_SAMPLE") - @ApiModelProperty(value = "高速-波形采样-采取点数") - private String rawSample; - /** - * 高速-波形甑别-E最大值 - */ - @TableField("PSD_E") - @ApiModelProperty(value = "高速-波形甑别-E最大值") - private String psdE; - /** - * 高速-波形甑别-触发方式 - */ - @TableField("PSD_TRIG") - @ApiModelProperty(value = "高速-波形甑别-触发方式") - private String psdTrig; - /** - * 高速-波形甑别-触发周期 - */ - @TableField("PSD_PERIOD") - @ApiModelProperty(value = " 高速-波形甑别-触发周期") - private String psdPeriod; - /** - * 高速-波形甑别-触发阈值 - */ - @TableField("PSD_VTH") - @ApiModelProperty(value = "高速-波形甑别-触发阈值") - private String psdVth; - /** - * 高速-波形甑别-门偏移 - */ - @TableField("PSD_OFFSET") - @ApiModelProperty(value = "高速-波形甑别-门偏移") - private String psdOffset; - /** - * 高速-波形甑别-长门 - */ - @TableField("PSD_LONG_GATE") - @ApiModelProperty(value = "高速-波形甑别-长门") - private String psdLongGate; - /** - * 高速-波形甑别-短门 - */ - @TableField("PSD_SHORT_GATE") - @ApiModelProperty(value = "高速-波形甑别-短门") - private String psdShortGate; - /** - * 时间 - */ - @TableField("CREATE_TIME") - @ApiModelProperty(value = "时间") - private String createTime; - /** - * 备注 - */ - @TableField("DESCRIPTION") - @ApiModelProperty(value = "备注") - private String description; - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java new file mode 100644 index 0000000..b6e4611 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java @@ -0,0 +1,131 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器参数下发记录 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_config") +@ApiModel(value = "配置信息对象", description = "配置信息记录表") +public class DetectorConfig extends Model { + + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "降压时间") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + + private Long detectorId; + /** + * 高压参数 + */ + @ApiModelProperty(value = "高压参数,一般设置1.2V") + @TableField("VOL_6") + private String vol6; + /** + * 高速-波形采样-触发方式 + */ + @TableField("RAW_TRIG") + @ApiModelProperty(value = "高速-波形采样-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String rawTrig; + /** + * 高速-波形采样-触发周期 + */ + @TableField("RAW_PERIOD") + @ApiModelProperty(value = "高速-波形采样-触发周期") + private String rawPeriod; + /** + * 高速-波形采样-触发阈值 + */ + @TableField("RAW_VTH") + @ApiModelProperty(value = "高速-波形采样-触发阈值") + private String rawVth; + /** + * 高速-波形采样-采取点数 + */ + @TableField("RAW_SAMPLE") + @ApiModelProperty(value = "高速-波形采样-采取点数") + private String rawSample; + /** + * 高速-波形甑别-E最大值 + */ + @TableField("PSD_E") + @ApiModelProperty(value = "高速-波形甑别-E最大值") + private String psdE; + /** + * 高速-波形甑别-触发方式 + */ + @TableField("PSD_TRIG") + @ApiModelProperty(value = "高速-波形甑别-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String psdTrig; + /** + * 高速-波形甑别-触发周期 + */ + @TableField("PSD_PERIOD") + @ApiModelProperty(value = "高速-波形甑别-触发周期") + private String psdPeriod; + /** + * 高速-波形甑别-触发阈值 + */ + @TableField("PSD_VTH") + @ApiModelProperty(value = "高速-波形甑别-触发阈值") + private String psdVth; + /** + * 高速-波形甑别-门偏移 + */ + @TableField("PSD_OFFSET") + @ApiModelProperty(value = "高速-波形甑别-门偏移") + private String psdOffset; + /** + * 高速-波形甑别-长门 + */ + @TableField("PSD_LONG_GATE") + @ApiModelProperty(value = "高速-波形甑别-长门") + private String psdLongGate; + /** + * 高速-波形甑别-短门 + */ + @TableField("PSD_SHORT_GATE") + @ApiModelProperty(value = "高速-波形甑别-短门") + private String psdShortGate; + /** + * 时间 + */ + @TableField("CREATE_TIME") + @ApiModelProperty(value = "时间") + private String createTime; + /** + * 备注 + */ + @TableField("DESCRIPTION") + @ApiModelProperty(value = "备注") + private String description; + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java new file mode 100644 index 0000000..178a924 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器升降压操作日志 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_log") +@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") +public class DetectorLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "主键") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + private Long detectorId; + /** + * 升压时间 + */ + @ApiModelProperty(value = "升压时间") + @TableField("INCREASE_TIME") + private String increaseTime; + /** + * 降压时间 + */ + @ApiModelProperty(value = "降压时间") + @TableField("DECREASE_TIME") + private String decreaseTime; + /** + * 当前状态 + */ + @ApiModelProperty(value = "当前状态,0:空闲，1:升压，2:降压") + @TableField("STATUS") + private String status; + /** + * 通道号 + */ + @ApiModelProperty(value = "通道号") + @TableField("CHANNEL") + private String channel; + /** + * 时间 + */ + @ApiModelProperty(value = "时间") + @TableField("CREATE_TIME") + private String createTime; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + @TableField("DESCRIPTION") + private String description; + + public DetectorLog() { + } + + public DetectorLog(Long detectorId, String increaseTime, + String decreaseTime, String status, + String channel, String createTime) { + this.detectorId = detectorId; + this.increaseTime = increaseTime; + this.decreaseTime = decreaseTime; + this.status = status; + this.channel = channel; + this.createTime = createTime; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java deleted file mode 100644 index b128e3b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器升降压操作日志 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_log") -@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") -public class Log extends Model { - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "主键") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - private Long detectorId; - /** - * 升压时间 - */ - @ApiModelProperty(value = "升压时间") - @TableField("INCREASE_TIME") - private String increaseTime; - /** - * 降压时间 - */ - @ApiModelProperty(value = "降压时间") - @TableField("DECREASE_TIME") - private String decreaseTime; - /** - * 当前状态 - */ - @ApiModelProperty(value = "当前状态") - @TableField("STATUS") - private String status; - /** - * 通道号 - */ - @ApiModelProperty(value = "通道号") - @TableField("CHANNEL") - private String channel; - /** - * 时间 - */ - @ApiModelProperty(value = "时间") - @TableField("CREATE_TIME") - private String createTime; - /** - * 备注 - */ - @ApiModelProperty(value = "备注") - @TableField("DESCRIPTION") - private String description; -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java deleted file mode 100644 index f5a5336..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.service; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 探测器参数下发记录 服务类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface IConfigService extends IService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java new file mode 100644 index 0000000..69b1688 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.neutron.service; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 探测器参数下发记录 服务类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface IDetectorConfigService extends IService { + + boolean sendConfig(DetectorConfig config); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java new file mode 100644 index 0000000..d20ef1a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器参数下发记录 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorConfigMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java new file mode 100644 index 0000000..5c4b005 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器升降压操作日志 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorLogMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java deleted file mode 100644 index d3aedd4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器升降压操作日志 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface LogMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml deleted file mode 100644 index 5a02cdb..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml new file mode 100644 index 0000000..806dcd8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml new file mode 100644 index 0000000..707991d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml deleted file mode 100644 index 6d3190f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java deleted file mode 100644 index 720460d..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器参数下发记录 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_config") -@ApiModel(value = "配置信息对象", description = "配置信息记录表") -public class Config extends Model { - - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "降压时间") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - - private Long detectorId; - /** - * 高压参数 - */ - @ApiModelProperty(value = "高压参数") - @TableField("VOL_6") - private String vol6; - /** - * 高速-波形采样-触发方式 - */ - @TableField("RAW_TRIG") - @ApiModelProperty(value = "高速-波形采样-触发方式") - private String rawTrig; - /** - * 高速-波形采样-触发周期 - */ - @TableField("RAW_PERIOD") - @ApiModelProperty(value = "高速-波形采样-触发周期") - private String rawPeriod; - /** - * 高速-波形采样-触发阈值 - */ - @TableField("RAW_VTH") - @ApiModelProperty(value = "高速-波形采样-触发阈值") - private String rawVth; - /** - * 高速-波形采样-采取点数 - */ - @TableField("RAW_SAMPLE") - @ApiModelProperty(value = "高速-波形采样-采取点数") - private String rawSample; - /** - * 高速-波形甑别-E最大值 - */ - @TableField("PSD_E") - @ApiModelProperty(value = "高速-波形甑别-E最大值") - private String psdE; - /** - * 高速-波形甑别-触发方式 - */ - @TableField("PSD_TRIG") - @ApiModelProperty(value = "高速-波形甑别-触发方式") - private String psdTrig; - /** - * 高速-波形甑别-触发周期 - */ - @TableField("PSD_PERIOD") - @ApiModelProperty(value = " 高速-波形甑别-触发周期") - private String psdPeriod; - /** - * 高速-波形甑别-触发阈值 - */ - @TableField("PSD_VTH") - @ApiModelProperty(value = "高速-波形甑别-触发阈值") - private String psdVth; - /** - * 高速-波形甑别-门偏移 - */ - @TableField("PSD_OFFSET") - @ApiModelProperty(value = "高速-波形甑别-门偏移") - private String psdOffset; - /** - * 高速-波形甑别-长门 - */ - @TableField("PSD_LONG_GATE") - @ApiModelProperty(value = "高速-波形甑别-长门") - private String psdLongGate; - /** - * 高速-波形甑别-短门 - */ - @TableField("PSD_SHORT_GATE") - @ApiModelProperty(value = "高速-波形甑别-短门") - private String psdShortGate; - /** - * 时间 - */ - @TableField("CREATE_TIME") - @ApiModelProperty(value = "时间") - private String createTime; - /** - * 备注 - */ - @TableField("DESCRIPTION") - @ApiModelProperty(value = "备注") - private String description; - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java new file mode 100644 index 0000000..b6e4611 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java @@ -0,0 +1,131 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器参数下发记录 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_config") +@ApiModel(value = "配置信息对象", description = "配置信息记录表") +public class DetectorConfig extends Model { + + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "降压时间") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + + private Long detectorId; + /** + * 高压参数 + */ + @ApiModelProperty(value = "高压参数,一般设置1.2V") + @TableField("VOL_6") + private String vol6; + /** + * 高速-波形采样-触发方式 + */ + @TableField("RAW_TRIG") + @ApiModelProperty(value = "高速-波形采样-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String rawTrig; + /** + * 高速-波形采样-触发周期 + */ + @TableField("RAW_PERIOD") + @ApiModelProperty(value = "高速-波形采样-触发周期") + private String rawPeriod; + /** + * 高速-波形采样-触发阈值 + */ + @TableField("RAW_VTH") + @ApiModelProperty(value = "高速-波形采样-触发阈值") + private String rawVth; + /** + * 高速-波形采样-采取点数 + */ + @TableField("RAW_SAMPLE") + @ApiModelProperty(value = "高速-波形采样-采取点数") + private String rawSample; + /** + * 高速-波形甑别-E最大值 + */ + @TableField("PSD_E") + @ApiModelProperty(value = "高速-波形甑别-E最大值") + private String psdE; + /** + * 高速-波形甑别-触发方式 + */ + @TableField("PSD_TRIG") + @ApiModelProperty(value = "高速-波形甑别-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String psdTrig; + /** + * 高速-波形甑别-触发周期 + */ + @TableField("PSD_PERIOD") + @ApiModelProperty(value = "高速-波形甑别-触发周期") + private String psdPeriod; + /** + * 高速-波形甑别-触发阈值 + */ + @TableField("PSD_VTH") + @ApiModelProperty(value = "高速-波形甑别-触发阈值") + private String psdVth; + /** + * 高速-波形甑别-门偏移 + */ + @TableField("PSD_OFFSET") + @ApiModelProperty(value = "高速-波形甑别-门偏移") + private String psdOffset; + /** + * 高速-波形甑别-长门 + */ + @TableField("PSD_LONG_GATE") + @ApiModelProperty(value = "高速-波形甑别-长门") + private String psdLongGate; + /** + * 高速-波形甑别-短门 + */ + @TableField("PSD_SHORT_GATE") + @ApiModelProperty(value = "高速-波形甑别-短门") + private String psdShortGate; + /** + * 时间 + */ + @TableField("CREATE_TIME") + @ApiModelProperty(value = "时间") + private String createTime; + /** + * 备注 + */ + @TableField("DESCRIPTION") + @ApiModelProperty(value = "备注") + private String description; + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java new file mode 100644 index 0000000..178a924 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器升降压操作日志 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_log") +@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") +public class DetectorLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "主键") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + private Long detectorId; + /** + * 升压时间 + */ + @ApiModelProperty(value = "升压时间") + @TableField("INCREASE_TIME") + private String increaseTime; + /** + * 降压时间 + */ + @ApiModelProperty(value = "降压时间") + @TableField("DECREASE_TIME") + private String decreaseTime; + /** + * 当前状态 + */ + @ApiModelProperty(value = "当前状态,0:空闲，1:升压，2:降压") + @TableField("STATUS") + private String status; + /** + * 通道号 + */ + @ApiModelProperty(value = "通道号") + @TableField("CHANNEL") + private String channel; + /** + * 时间 + */ + @ApiModelProperty(value = "时间") + @TableField("CREATE_TIME") + private String createTime; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + @TableField("DESCRIPTION") + private String description; + + public DetectorLog() { + } + + public DetectorLog(Long detectorId, String increaseTime, + String decreaseTime, String status, + String channel, String createTime) { + this.detectorId = detectorId; + this.increaseTime = increaseTime; + this.decreaseTime = decreaseTime; + this.status = status; + this.channel = channel; + this.createTime = createTime; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java deleted file mode 100644 index b128e3b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器升降压操作日志 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_log") -@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") -public class Log extends Model { - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "主键") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - private Long detectorId; - /** - * 升压时间 - */ - @ApiModelProperty(value = "升压时间") - @TableField("INCREASE_TIME") - private String increaseTime; - /** - * 降压时间 - */ - @ApiModelProperty(value = "降压时间") - @TableField("DECREASE_TIME") - private String decreaseTime; - /** - * 当前状态 - */ - @ApiModelProperty(value = "当前状态") - @TableField("STATUS") - private String status; - /** - * 通道号 - */ - @ApiModelProperty(value = "通道号") - @TableField("CHANNEL") - private String channel; - /** - * 时间 - */ - @ApiModelProperty(value = "时间") - @TableField("CREATE_TIME") - private String createTime; - /** - * 备注 - */ - @ApiModelProperty(value = "备注") - @TableField("DESCRIPTION") - private String description; -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java deleted file mode 100644 index f5a5336..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.service; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 探测器参数下发记录 服务类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface IConfigService extends IService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java new file mode 100644 index 0000000..69b1688 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.neutron.service; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 探测器参数下发记录 服务类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface IDetectorConfigService extends IService { + + boolean sendConfig(DetectorConfig config); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java new file mode 100644 index 0000000..ede899d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java @@ -0,0 +1,26 @@ +package com.casic.missiles.modular.neutron.service; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 探测器升降压操作日志 服务类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface IDetectorLogService extends IService { + + /** + * + * @param channel 加压通道号 + * @param status 当前状态 + * @return + */ + boolean addLog(Long detectorId,String channel,String status); + + DetectorLog getLastRecord(Long detectorId); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java new file mode 100644 index 0000000..d20ef1a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器参数下发记录 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorConfigMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java new file mode 100644 index 0000000..5c4b005 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器升降压操作日志 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorLogMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java deleted file mode 100644 index d3aedd4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器升降压操作日志 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface LogMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml deleted file mode 100644 index 5a02cdb..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml new file mode 100644 index 0000000..806dcd8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml new file mode 100644 index 0000000..707991d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml deleted file mode 100644 index 6d3190f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java deleted file mode 100644 index 720460d..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器参数下发记录 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_config") -@ApiModel(value = "配置信息对象", description = "配置信息记录表") -public class Config extends Model { - - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "降压时间") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - - private Long detectorId; - /** - * 高压参数 - */ - @ApiModelProperty(value = "高压参数") - @TableField("VOL_6") - private String vol6; - /** - * 高速-波形采样-触发方式 - */ - @TableField("RAW_TRIG") - @ApiModelProperty(value = "高速-波形采样-触发方式") - private String rawTrig; - /** - * 高速-波形采样-触发周期 - */ - @TableField("RAW_PERIOD") - @ApiModelProperty(value = "高速-波形采样-触发周期") - private String rawPeriod; - /** - * 高速-波形采样-触发阈值 - */ - @TableField("RAW_VTH") - @ApiModelProperty(value = "高速-波形采样-触发阈值") - private String rawVth; - /** - * 高速-波形采样-采取点数 - */ - @TableField("RAW_SAMPLE") - @ApiModelProperty(value = "高速-波形采样-采取点数") - private String rawSample; - /** - * 高速-波形甑别-E最大值 - */ - @TableField("PSD_E") - @ApiModelProperty(value = "高速-波形甑别-E最大值") - private String psdE; - /** - * 高速-波形甑别-触发方式 - */ - @TableField("PSD_TRIG") - @ApiModelProperty(value = "高速-波形甑别-触发方式") - private String psdTrig; - /** - * 高速-波形甑别-触发周期 - */ - @TableField("PSD_PERIOD") - @ApiModelProperty(value = " 高速-波形甑别-触发周期") - private String psdPeriod; - /** - * 高速-波形甑别-触发阈值 - */ - @TableField("PSD_VTH") - @ApiModelProperty(value = "高速-波形甑别-触发阈值") - private String psdVth; - /** - * 高速-波形甑别-门偏移 - */ - @TableField("PSD_OFFSET") - @ApiModelProperty(value = "高速-波形甑别-门偏移") - private String psdOffset; - /** - * 高速-波形甑别-长门 - */ - @TableField("PSD_LONG_GATE") - @ApiModelProperty(value = "高速-波形甑别-长门") - private String psdLongGate; - /** - * 高速-波形甑别-短门 - */ - @TableField("PSD_SHORT_GATE") - @ApiModelProperty(value = "高速-波形甑别-短门") - private String psdShortGate; - /** - * 时间 - */ - @TableField("CREATE_TIME") - @ApiModelProperty(value = "时间") - private String createTime; - /** - * 备注 - */ - @TableField("DESCRIPTION") - @ApiModelProperty(value = "备注") - private String description; - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java new file mode 100644 index 0000000..b6e4611 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java @@ -0,0 +1,131 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器参数下发记录 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_config") +@ApiModel(value = "配置信息对象", description = "配置信息记录表") +public class DetectorConfig extends Model { + + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "降压时间") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + + private Long detectorId; + /** + * 高压参数 + */ + @ApiModelProperty(value = "高压参数,一般设置1.2V") + @TableField("VOL_6") + private String vol6; + /** + * 高速-波形采样-触发方式 + */ + @TableField("RAW_TRIG") + @ApiModelProperty(value = "高速-波形采样-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String rawTrig; + /** + * 高速-波形采样-触发周期 + */ + @TableField("RAW_PERIOD") + @ApiModelProperty(value = "高速-波形采样-触发周期") + private String rawPeriod; + /** + * 高速-波形采样-触发阈值 + */ + @TableField("RAW_VTH") + @ApiModelProperty(value = "高速-波形采样-触发阈值") + private String rawVth; + /** + * 高速-波形采样-采取点数 + */ + @TableField("RAW_SAMPLE") + @ApiModelProperty(value = "高速-波形采样-采取点数") + private String rawSample; + /** + * 高速-波形甑别-E最大值 + */ + @TableField("PSD_E") + @ApiModelProperty(value = "高速-波形甑别-E最大值") + private String psdE; + /** + * 高速-波形甑别-触发方式 + */ + @TableField("PSD_TRIG") + @ApiModelProperty(value = "高速-波形甑别-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String psdTrig; + /** + * 高速-波形甑别-触发周期 + */ + @TableField("PSD_PERIOD") + @ApiModelProperty(value = "高速-波形甑别-触发周期") + private String psdPeriod; + /** + * 高速-波形甑别-触发阈值 + */ + @TableField("PSD_VTH") + @ApiModelProperty(value = "高速-波形甑别-触发阈值") + private String psdVth; + /** + * 高速-波形甑别-门偏移 + */ + @TableField("PSD_OFFSET") + @ApiModelProperty(value = "高速-波形甑别-门偏移") + private String psdOffset; + /** + * 高速-波形甑别-长门 + */ + @TableField("PSD_LONG_GATE") + @ApiModelProperty(value = "高速-波形甑别-长门") + private String psdLongGate; + /** + * 高速-波形甑别-短门 + */ + @TableField("PSD_SHORT_GATE") + @ApiModelProperty(value = "高速-波形甑别-短门") + private String psdShortGate; + /** + * 时间 + */ + @TableField("CREATE_TIME") + @ApiModelProperty(value = "时间") + private String createTime; + /** + * 备注 + */ + @TableField("DESCRIPTION") + @ApiModelProperty(value = "备注") + private String description; + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java new file mode 100644 index 0000000..178a924 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器升降压操作日志 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_log") +@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") +public class DetectorLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "主键") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + private Long detectorId; + /** + * 升压时间 + */ + @ApiModelProperty(value = "升压时间") + @TableField("INCREASE_TIME") + private String increaseTime; + /** + * 降压时间 + */ + @ApiModelProperty(value = "降压时间") + @TableField("DECREASE_TIME") + private String decreaseTime; + /** + * 当前状态 + */ + @ApiModelProperty(value = "当前状态,0:空闲，1:升压，2:降压") + @TableField("STATUS") + private String status; + /** + * 通道号 + */ + @ApiModelProperty(value = "通道号") + @TableField("CHANNEL") + private String channel; + /** + * 时间 + */ + @ApiModelProperty(value = "时间") + @TableField("CREATE_TIME") + private String createTime; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + @TableField("DESCRIPTION") + private String description; + + public DetectorLog() { + } + + public DetectorLog(Long detectorId, String increaseTime, + String decreaseTime, String status, + String channel, String createTime) { + this.detectorId = detectorId; + this.increaseTime = increaseTime; + this.decreaseTime = decreaseTime; + this.status = status; + this.channel = channel; + this.createTime = createTime; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java deleted file mode 100644 index b128e3b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器升降压操作日志 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_log") -@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") -public class Log extends Model { - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "主键") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - private Long detectorId; - /** - * 升压时间 - */ - @ApiModelProperty(value = "升压时间") - @TableField("INCREASE_TIME") - private String increaseTime; - /** - * 降压时间 - */ - @ApiModelProperty(value = "降压时间") - @TableField("DECREASE_TIME") - private String decreaseTime; - /** - * 当前状态 - */ - @ApiModelProperty(value = "当前状态") - @TableField("STATUS") - private String status; - /** - * 通道号 - */ - @ApiModelProperty(value = "通道号") - @TableField("CHANNEL") - private String channel; - /** - * 时间 - */ - @ApiModelProperty(value = "时间") - @TableField("CREATE_TIME") - private String createTime; - /** - * 备注 - */ - @ApiModelProperty(value = "备注") - @TableField("DESCRIPTION") - private String description; -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java deleted file mode 100644 index f5a5336..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.service; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 探测器参数下发记录 服务类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface IConfigService extends IService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java new file mode 100644 index 0000000..69b1688 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.neutron.service; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 探测器参数下发记录 服务类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface IDetectorConfigService extends IService { + + boolean sendConfig(DetectorConfig config); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java new file mode 100644 index 0000000..ede899d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java @@ -0,0 +1,26 @@ +package com.casic.missiles.modular.neutron.service; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 探测器升降压操作日志 服务类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface IDetectorLogService extends IService { + + /** + * + * @param channel 加压通道号 + * @param status 当前状态 + * @return + */ + boolean addLog(Long detectorId,String channel,String status); + + DetectorLog getLastRecord(Long detectorId); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java deleted file mode 100644 index 357beef..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.service; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 探测器升降压操作日志 服务类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ILogService extends IService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java new file mode 100644 index 0000000..d20ef1a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器参数下发记录 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorConfigMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java new file mode 100644 index 0000000..5c4b005 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器升降压操作日志 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorLogMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java deleted file mode 100644 index d3aedd4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器升降压操作日志 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface LogMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml deleted file mode 100644 index 5a02cdb..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml new file mode 100644 index 0000000..806dcd8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml new file mode 100644 index 0000000..707991d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml deleted file mode 100644 index 6d3190f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java deleted file mode 100644 index 720460d..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器参数下发记录 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_config") -@ApiModel(value = "配置信息对象", description = "配置信息记录表") -public class Config extends Model { - - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "降压时间") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - - private Long detectorId; - /** - * 高压参数 - */ - @ApiModelProperty(value = "高压参数") - @TableField("VOL_6") - private String vol6; - /** - * 高速-波形采样-触发方式 - */ - @TableField("RAW_TRIG") - @ApiModelProperty(value = "高速-波形采样-触发方式") - private String rawTrig; - /** - * 高速-波形采样-触发周期 - */ - @TableField("RAW_PERIOD") - @ApiModelProperty(value = "高速-波形采样-触发周期") - private String rawPeriod; - /** - * 高速-波形采样-触发阈值 - */ - @TableField("RAW_VTH") - @ApiModelProperty(value = "高速-波形采样-触发阈值") - private String rawVth; - /** - * 高速-波形采样-采取点数 - */ - @TableField("RAW_SAMPLE") - @ApiModelProperty(value = "高速-波形采样-采取点数") - private String rawSample; - /** - * 高速-波形甑别-E最大值 - */ - @TableField("PSD_E") - @ApiModelProperty(value = "高速-波形甑别-E最大值") - private String psdE; - /** - * 高速-波形甑别-触发方式 - */ - @TableField("PSD_TRIG") - @ApiModelProperty(value = "高速-波形甑别-触发方式") - private String psdTrig; - /** - * 高速-波形甑别-触发周期 - */ - @TableField("PSD_PERIOD") - @ApiModelProperty(value = " 高速-波形甑别-触发周期") - private String psdPeriod; - /** - * 高速-波形甑别-触发阈值 - */ - @TableField("PSD_VTH") - @ApiModelProperty(value = "高速-波形甑别-触发阈值") - private String psdVth; - /** - * 高速-波形甑别-门偏移 - */ - @TableField("PSD_OFFSET") - @ApiModelProperty(value = "高速-波形甑别-门偏移") - private String psdOffset; - /** - * 高速-波形甑别-长门 - */ - @TableField("PSD_LONG_GATE") - @ApiModelProperty(value = "高速-波形甑别-长门") - private String psdLongGate; - /** - * 高速-波形甑别-短门 - */ - @TableField("PSD_SHORT_GATE") - @ApiModelProperty(value = "高速-波形甑别-短门") - private String psdShortGate; - /** - * 时间 - */ - @TableField("CREATE_TIME") - @ApiModelProperty(value = "时间") - private String createTime; - /** - * 备注 - */ - @TableField("DESCRIPTION") - @ApiModelProperty(value = "备注") - private String description; - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java new file mode 100644 index 0000000..b6e4611 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java @@ -0,0 +1,131 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器参数下发记录 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_config") +@ApiModel(value = "配置信息对象", description = "配置信息记录表") +public class DetectorConfig extends Model { + + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "降压时间") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + + private Long detectorId; + /** + * 高压参数 + */ + @ApiModelProperty(value = "高压参数,一般设置1.2V") + @TableField("VOL_6") + private String vol6; + /** + * 高速-波形采样-触发方式 + */ + @TableField("RAW_TRIG") + @ApiModelProperty(value = "高速-波形采样-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String rawTrig; + /** + * 高速-波形采样-触发周期 + */ + @TableField("RAW_PERIOD") + @ApiModelProperty(value = "高速-波形采样-触发周期") + private String rawPeriod; + /** + * 高速-波形采样-触发阈值 + */ + @TableField("RAW_VTH") + @ApiModelProperty(value = "高速-波形采样-触发阈值") + private String rawVth; + /** + * 高速-波形采样-采取点数 + */ + @TableField("RAW_SAMPLE") + @ApiModelProperty(value = "高速-波形采样-采取点数") + private String rawSample; + /** + * 高速-波形甑别-E最大值 + */ + @TableField("PSD_E") + @ApiModelProperty(value = "高速-波形甑别-E最大值") + private String psdE; + /** + * 高速-波形甑别-触发方式 + */ + @TableField("PSD_TRIG") + @ApiModelProperty(value = "高速-波形甑别-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String psdTrig; + /** + * 高速-波形甑别-触发周期 + */ + @TableField("PSD_PERIOD") + @ApiModelProperty(value = "高速-波形甑别-触发周期") + private String psdPeriod; + /** + * 高速-波形甑别-触发阈值 + */ + @TableField("PSD_VTH") + @ApiModelProperty(value = "高速-波形甑别-触发阈值") + private String psdVth; + /** + * 高速-波形甑别-门偏移 + */ + @TableField("PSD_OFFSET") + @ApiModelProperty(value = "高速-波形甑别-门偏移") + private String psdOffset; + /** + * 高速-波形甑别-长门 + */ + @TableField("PSD_LONG_GATE") + @ApiModelProperty(value = "高速-波形甑别-长门") + private String psdLongGate; + /** + * 高速-波形甑别-短门 + */ + @TableField("PSD_SHORT_GATE") + @ApiModelProperty(value = "高速-波形甑别-短门") + private String psdShortGate; + /** + * 时间 + */ + @TableField("CREATE_TIME") + @ApiModelProperty(value = "时间") + private String createTime; + /** + * 备注 + */ + @TableField("DESCRIPTION") + @ApiModelProperty(value = "备注") + private String description; + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java new file mode 100644 index 0000000..178a924 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器升降压操作日志 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_log") +@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") +public class DetectorLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "主键") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + private Long detectorId; + /** + * 升压时间 + */ + @ApiModelProperty(value = "升压时间") + @TableField("INCREASE_TIME") + private String increaseTime; + /** + * 降压时间 + */ + @ApiModelProperty(value = "降压时间") + @TableField("DECREASE_TIME") + private String decreaseTime; + /** + * 当前状态 + */ + @ApiModelProperty(value = "当前状态,0:空闲，1:升压，2:降压") + @TableField("STATUS") + private String status; + /** + * 通道号 + */ + @ApiModelProperty(value = "通道号") + @TableField("CHANNEL") + private String channel; + /** + * 时间 + */ + @ApiModelProperty(value = "时间") + @TableField("CREATE_TIME") + private String createTime; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + @TableField("DESCRIPTION") + private String description; + + public DetectorLog() { + } + + public DetectorLog(Long detectorId, String increaseTime, + String decreaseTime, String status, + String channel, String createTime) { + this.detectorId = detectorId; + this.increaseTime = increaseTime; + this.decreaseTime = decreaseTime; + this.status = status; + this.channel = channel; + this.createTime = createTime; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java deleted file mode 100644 index b128e3b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器升降压操作日志 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_log") -@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") -public class Log extends Model { - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "主键") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - private Long detectorId; - /** - * 升压时间 - */ - @ApiModelProperty(value = "升压时间") - @TableField("INCREASE_TIME") - private String increaseTime; - /** - * 降压时间 - */ - @ApiModelProperty(value = "降压时间") - @TableField("DECREASE_TIME") - private String decreaseTime; - /** - * 当前状态 - */ - @ApiModelProperty(value = "当前状态") - @TableField("STATUS") - private String status; - /** - * 通道号 - */ - @ApiModelProperty(value = "通道号") - @TableField("CHANNEL") - private String channel; - /** - * 时间 - */ - @ApiModelProperty(value = "时间") - @TableField("CREATE_TIME") - private String createTime; - /** - * 备注 - */ - @ApiModelProperty(value = "备注") - @TableField("DESCRIPTION") - private String description; -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java deleted file mode 100644 index f5a5336..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.service; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 探测器参数下发记录 服务类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface IConfigService extends IService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java new file mode 100644 index 0000000..69b1688 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.neutron.service; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 探测器参数下发记录 服务类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface IDetectorConfigService extends IService { + + boolean sendConfig(DetectorConfig config); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java new file mode 100644 index 0000000..ede899d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java @@ -0,0 +1,26 @@ +package com.casic.missiles.modular.neutron.service; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 探测器升降压操作日志 服务类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface IDetectorLogService extends IService { + + /** + * + * @param channel 加压通道号 + * @param status 当前状态 + * @return + */ + boolean addLog(Long detectorId,String channel,String status); + + DetectorLog getLastRecord(Long detectorId); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java deleted file mode 100644 index 357beef..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.service; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 探测器升降压操作日志 服务类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ILogService extends IService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java index cf1b357..34d7056 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java @@ -14,12 +14,12 @@ * 中子源设备初始化 * tcp控制指令表依次发送指令 1-16 */ - void deviceInit(); + void deviceInit(Long detectorId); /** * No.2 加压，开始工作 */ - void pressurize(); + void pressurize(Long detectorId); /** * No.3 解析 @@ -30,9 +30,14 @@ /** * No.4 退高压，停止工作 */ - void depress(); + void depress(Long detectorId); - void control(String command); + /** + * + * @param command 指令 + * @param detectorId 探测器id + */ + void control(String command,Long detectorId); List alarmList(Long taskId); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java new file mode 100644 index 0000000..d20ef1a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器参数下发记录 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorConfigMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java new file mode 100644 index 0000000..5c4b005 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器升降压操作日志 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorLogMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java deleted file mode 100644 index d3aedd4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器升降压操作日志 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface LogMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml deleted file mode 100644 index 5a02cdb..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml new file mode 100644 index 0000000..806dcd8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml new file mode 100644 index 0000000..707991d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml deleted file mode 100644 index 6d3190f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java deleted file mode 100644 index 720460d..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器参数下发记录 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_config") -@ApiModel(value = "配置信息对象", description = "配置信息记录表") -public class Config extends Model { - - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "降压时间") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - - private Long detectorId; - /** - * 高压参数 - */ - @ApiModelProperty(value = "高压参数") - @TableField("VOL_6") - private String vol6; - /** - * 高速-波形采样-触发方式 - */ - @TableField("RAW_TRIG") - @ApiModelProperty(value = "高速-波形采样-触发方式") - private String rawTrig; - /** - * 高速-波形采样-触发周期 - */ - @TableField("RAW_PERIOD") - @ApiModelProperty(value = "高速-波形采样-触发周期") - private String rawPeriod; - /** - * 高速-波形采样-触发阈值 - */ - @TableField("RAW_VTH") - @ApiModelProperty(value = "高速-波形采样-触发阈值") - private String rawVth; - /** - * 高速-波形采样-采取点数 - */ - @TableField("RAW_SAMPLE") - @ApiModelProperty(value = "高速-波形采样-采取点数") - private String rawSample; - /** - * 高速-波形甑别-E最大值 - */ - @TableField("PSD_E") - @ApiModelProperty(value = "高速-波形甑别-E最大值") - private String psdE; - /** - * 高速-波形甑别-触发方式 - */ - @TableField("PSD_TRIG") - @ApiModelProperty(value = "高速-波形甑别-触发方式") - private String psdTrig; - /** - * 高速-波形甑别-触发周期 - */ - @TableField("PSD_PERIOD") - @ApiModelProperty(value = " 高速-波形甑别-触发周期") - private String psdPeriod; - /** - * 高速-波形甑别-触发阈值 - */ - @TableField("PSD_VTH") - @ApiModelProperty(value = "高速-波形甑别-触发阈值") - private String psdVth; - /** - * 高速-波形甑别-门偏移 - */ - @TableField("PSD_OFFSET") - @ApiModelProperty(value = "高速-波形甑别-门偏移") - private String psdOffset; - /** - * 高速-波形甑别-长门 - */ - @TableField("PSD_LONG_GATE") - @ApiModelProperty(value = "高速-波形甑别-长门") - private String psdLongGate; - /** - * 高速-波形甑别-短门 - */ - @TableField("PSD_SHORT_GATE") - @ApiModelProperty(value = "高速-波形甑别-短门") - private String psdShortGate; - /** - * 时间 - */ - @TableField("CREATE_TIME") - @ApiModelProperty(value = "时间") - private String createTime; - /** - * 备注 - */ - @TableField("DESCRIPTION") - @ApiModelProperty(value = "备注") - private String description; - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java new file mode 100644 index 0000000..b6e4611 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java @@ -0,0 +1,131 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器参数下发记录 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_config") +@ApiModel(value = "配置信息对象", description = "配置信息记录表") +public class DetectorConfig extends Model { + + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "降压时间") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + + private Long detectorId; + /** + * 高压参数 + */ + @ApiModelProperty(value = "高压参数,一般设置1.2V") + @TableField("VOL_6") + private String vol6; + /** + * 高速-波形采样-触发方式 + */ + @TableField("RAW_TRIG") + @ApiModelProperty(value = "高速-波形采样-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String rawTrig; + /** + * 高速-波形采样-触发周期 + */ + @TableField("RAW_PERIOD") + @ApiModelProperty(value = "高速-波形采样-触发周期") + private String rawPeriod; + /** + * 高速-波形采样-触发阈值 + */ + @TableField("RAW_VTH") + @ApiModelProperty(value = "高速-波形采样-触发阈值") + private String rawVth; + /** + * 高速-波形采样-采取点数 + */ + @TableField("RAW_SAMPLE") + @ApiModelProperty(value = "高速-波形采样-采取点数") + private String rawSample; + /** + * 高速-波形甑别-E最大值 + */ + @TableField("PSD_E") + @ApiModelProperty(value = "高速-波形甑别-E最大值") + private String psdE; + /** + * 高速-波形甑别-触发方式 + */ + @TableField("PSD_TRIG") + @ApiModelProperty(value = "高速-波形甑别-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String psdTrig; + /** + * 高速-波形甑别-触发周期 + */ + @TableField("PSD_PERIOD") + @ApiModelProperty(value = "高速-波形甑别-触发周期") + private String psdPeriod; + /** + * 高速-波形甑别-触发阈值 + */ + @TableField("PSD_VTH") + @ApiModelProperty(value = "高速-波形甑别-触发阈值") + private String psdVth; + /** + * 高速-波形甑别-门偏移 + */ + @TableField("PSD_OFFSET") + @ApiModelProperty(value = "高速-波形甑别-门偏移") + private String psdOffset; + /** + * 高速-波形甑别-长门 + */ + @TableField("PSD_LONG_GATE") + @ApiModelProperty(value = "高速-波形甑别-长门") + private String psdLongGate; + /** + * 高速-波形甑别-短门 + */ + @TableField("PSD_SHORT_GATE") + @ApiModelProperty(value = "高速-波形甑别-短门") + private String psdShortGate; + /** + * 时间 + */ + @TableField("CREATE_TIME") + @ApiModelProperty(value = "时间") + private String createTime; + /** + * 备注 + */ + @TableField("DESCRIPTION") + @ApiModelProperty(value = "备注") + private String description; + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java new file mode 100644 index 0000000..178a924 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器升降压操作日志 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_log") +@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") +public class DetectorLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "主键") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + private Long detectorId; + /** + * 升压时间 + */ + @ApiModelProperty(value = "升压时间") + @TableField("INCREASE_TIME") + private String increaseTime; + /** + * 降压时间 + */ + @ApiModelProperty(value = "降压时间") + @TableField("DECREASE_TIME") + private String decreaseTime; + /** + * 当前状态 + */ + @ApiModelProperty(value = "当前状态,0:空闲，1:升压，2:降压") + @TableField("STATUS") + private String status; + /** + * 通道号 + */ + @ApiModelProperty(value = "通道号") + @TableField("CHANNEL") + private String channel; + /** + * 时间 + */ + @ApiModelProperty(value = "时间") + @TableField("CREATE_TIME") + private String createTime; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + @TableField("DESCRIPTION") + private String description; + + public DetectorLog() { + } + + public DetectorLog(Long detectorId, String increaseTime, + String decreaseTime, String status, + String channel, String createTime) { + this.detectorId = detectorId; + this.increaseTime = increaseTime; + this.decreaseTime = decreaseTime; + this.status = status; + this.channel = channel; + this.createTime = createTime; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java deleted file mode 100644 index b128e3b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器升降压操作日志 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_log") -@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") -public class Log extends Model { - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "主键") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - private Long detectorId; - /** - * 升压时间 - */ - @ApiModelProperty(value = "升压时间") - @TableField("INCREASE_TIME") - private String increaseTime; - /** - * 降压时间 - */ - @ApiModelProperty(value = "降压时间") - @TableField("DECREASE_TIME") - private String decreaseTime; - /** - * 当前状态 - */ - @ApiModelProperty(value = "当前状态") - @TableField("STATUS") - private String status; - /** - * 通道号 - */ - @ApiModelProperty(value = "通道号") - @TableField("CHANNEL") - private String channel; - /** - * 时间 - */ - @ApiModelProperty(value = "时间") - @TableField("CREATE_TIME") - private String createTime; - /** - * 备注 - */ - @ApiModelProperty(value = "备注") - @TableField("DESCRIPTION") - private String description; -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java deleted file mode 100644 index f5a5336..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.service; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 探测器参数下发记录 服务类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface IConfigService extends IService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java new file mode 100644 index 0000000..69b1688 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.neutron.service; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 探测器参数下发记录 服务类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface IDetectorConfigService extends IService { + + boolean sendConfig(DetectorConfig config); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java new file mode 100644 index 0000000..ede899d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java @@ -0,0 +1,26 @@ +package com.casic.missiles.modular.neutron.service; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 探测器升降压操作日志 服务类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface IDetectorLogService extends IService { + + /** + * + * @param channel 加压通道号 + * @param status 当前状态 + * @return + */ + boolean addLog(Long detectorId,String channel,String status); + + DetectorLog getLastRecord(Long detectorId); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java deleted file mode 100644 index 357beef..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.service; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 探测器升降压操作日志 服务类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ILogService extends IService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java index cf1b357..34d7056 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java @@ -14,12 +14,12 @@ * 中子源设备初始化 * tcp控制指令表依次发送指令 1-16 */ - void deviceInit(); + void deviceInit(Long detectorId); /** * No.2 加压，开始工作 */ - void pressurize(); + void pressurize(Long detectorId); /** * No.3 解析 @@ -30,9 +30,14 @@ /** * No.4 退高压，停止工作 */ - void depress(); + void depress(Long detectorId); - void control(String command); + /** + * + * @param command 指令 + * @param detectorId 探测器id + */ + void control(String command,Long detectorId); List alarmList(Long taskId); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/ConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/ConfigServiceImpl.java deleted file mode 100644 index cbb63a7..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/ConfigServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.neutron.service.impl; - -import com.casic.missiles.modular.neutron.model.Config; -import com.casic.missiles.modular.neutron.dao.ConfigMapper; -import com.casic.missiles.modular.neutron.service.IConfigService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 探测器参数下发记录 服务实现类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Service -public class ConfigServiceImpl extends ServiceImpl implements IConfigService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java new file mode 100644 index 0000000..d20ef1a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器参数下发记录 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorConfigMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java new file mode 100644 index 0000000..5c4b005 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器升降压操作日志 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorLogMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java deleted file mode 100644 index d3aedd4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器升降压操作日志 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface LogMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml deleted file mode 100644 index 5a02cdb..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml new file mode 100644 index 0000000..806dcd8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml new file mode 100644 index 0000000..707991d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml deleted file mode 100644 index 6d3190f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java deleted file mode 100644 index 720460d..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器参数下发记录 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_config") -@ApiModel(value = "配置信息对象", description = "配置信息记录表") -public class Config extends Model { - - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "降压时间") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - - private Long detectorId; - /** - * 高压参数 - */ - @ApiModelProperty(value = "高压参数") - @TableField("VOL_6") - private String vol6; - /** - * 高速-波形采样-触发方式 - */ - @TableField("RAW_TRIG") - @ApiModelProperty(value = "高速-波形采样-触发方式") - private String rawTrig; - /** - * 高速-波形采样-触发周期 - */ - @TableField("RAW_PERIOD") - @ApiModelProperty(value = "高速-波形采样-触发周期") - private String rawPeriod; - /** - * 高速-波形采样-触发阈值 - */ - @TableField("RAW_VTH") - @ApiModelProperty(value = "高速-波形采样-触发阈值") - private String rawVth; - /** - * 高速-波形采样-采取点数 - */ - @TableField("RAW_SAMPLE") - @ApiModelProperty(value = "高速-波形采样-采取点数") - private String rawSample; - /** - * 高速-波形甑别-E最大值 - */ - @TableField("PSD_E") - @ApiModelProperty(value = "高速-波形甑别-E最大值") - private String psdE; - /** - * 高速-波形甑别-触发方式 - */ - @TableField("PSD_TRIG") - @ApiModelProperty(value = "高速-波形甑别-触发方式") - private String psdTrig; - /** - * 高速-波形甑别-触发周期 - */ - @TableField("PSD_PERIOD") - @ApiModelProperty(value = " 高速-波形甑别-触发周期") - private String psdPeriod; - /** - * 高速-波形甑别-触发阈值 - */ - @TableField("PSD_VTH") - @ApiModelProperty(value = "高速-波形甑别-触发阈值") - private String psdVth; - /** - * 高速-波形甑别-门偏移 - */ - @TableField("PSD_OFFSET") - @ApiModelProperty(value = "高速-波形甑别-门偏移") - private String psdOffset; - /** - * 高速-波形甑别-长门 - */ - @TableField("PSD_LONG_GATE") - @ApiModelProperty(value = "高速-波形甑别-长门") - private String psdLongGate; - /** - * 高速-波形甑别-短门 - */ - @TableField("PSD_SHORT_GATE") - @ApiModelProperty(value = "高速-波形甑别-短门") - private String psdShortGate; - /** - * 时间 - */ - @TableField("CREATE_TIME") - @ApiModelProperty(value = "时间") - private String createTime; - /** - * 备注 - */ - @TableField("DESCRIPTION") - @ApiModelProperty(value = "备注") - private String description; - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java new file mode 100644 index 0000000..b6e4611 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java @@ -0,0 +1,131 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器参数下发记录 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_config") +@ApiModel(value = "配置信息对象", description = "配置信息记录表") +public class DetectorConfig extends Model { + + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "降压时间") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + + private Long detectorId; + /** + * 高压参数 + */ + @ApiModelProperty(value = "高压参数,一般设置1.2V") + @TableField("VOL_6") + private String vol6; + /** + * 高速-波形采样-触发方式 + */ + @TableField("RAW_TRIG") + @ApiModelProperty(value = "高速-波形采样-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String rawTrig; + /** + * 高速-波形采样-触发周期 + */ + @TableField("RAW_PERIOD") + @ApiModelProperty(value = "高速-波形采样-触发周期") + private String rawPeriod; + /** + * 高速-波形采样-触发阈值 + */ + @TableField("RAW_VTH") + @ApiModelProperty(value = "高速-波形采样-触发阈值") + private String rawVth; + /** + * 高速-波形采样-采取点数 + */ + @TableField("RAW_SAMPLE") + @ApiModelProperty(value = "高速-波形采样-采取点数") + private String rawSample; + /** + * 高速-波形甑别-E最大值 + */ + @TableField("PSD_E") + @ApiModelProperty(value = "高速-波形甑别-E最大值") + private String psdE; + /** + * 高速-波形甑别-触发方式 + */ + @TableField("PSD_TRIG") + @ApiModelProperty(value = "高速-波形甑别-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String psdTrig; + /** + * 高速-波形甑别-触发周期 + */ + @TableField("PSD_PERIOD") + @ApiModelProperty(value = "高速-波形甑别-触发周期") + private String psdPeriod; + /** + * 高速-波形甑别-触发阈值 + */ + @TableField("PSD_VTH") + @ApiModelProperty(value = "高速-波形甑别-触发阈值") + private String psdVth; + /** + * 高速-波形甑别-门偏移 + */ + @TableField("PSD_OFFSET") + @ApiModelProperty(value = "高速-波形甑别-门偏移") + private String psdOffset; + /** + * 高速-波形甑别-长门 + */ + @TableField("PSD_LONG_GATE") + @ApiModelProperty(value = "高速-波形甑别-长门") + private String psdLongGate; + /** + * 高速-波形甑别-短门 + */ + @TableField("PSD_SHORT_GATE") + @ApiModelProperty(value = "高速-波形甑别-短门") + private String psdShortGate; + /** + * 时间 + */ + @TableField("CREATE_TIME") + @ApiModelProperty(value = "时间") + private String createTime; + /** + * 备注 + */ + @TableField("DESCRIPTION") + @ApiModelProperty(value = "备注") + private String description; + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java new file mode 100644 index 0000000..178a924 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器升降压操作日志 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_log") +@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") +public class DetectorLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "主键") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + private Long detectorId; + /** + * 升压时间 + */ + @ApiModelProperty(value = "升压时间") + @TableField("INCREASE_TIME") + private String increaseTime; + /** + * 降压时间 + */ + @ApiModelProperty(value = "降压时间") + @TableField("DECREASE_TIME") + private String decreaseTime; + /** + * 当前状态 + */ + @ApiModelProperty(value = "当前状态,0:空闲，1:升压，2:降压") + @TableField("STATUS") + private String status; + /** + * 通道号 + */ + @ApiModelProperty(value = "通道号") + @TableField("CHANNEL") + private String channel; + /** + * 时间 + */ + @ApiModelProperty(value = "时间") + @TableField("CREATE_TIME") + private String createTime; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + @TableField("DESCRIPTION") + private String description; + + public DetectorLog() { + } + + public DetectorLog(Long detectorId, String increaseTime, + String decreaseTime, String status, + String channel, String createTime) { + this.detectorId = detectorId; + this.increaseTime = increaseTime; + this.decreaseTime = decreaseTime; + this.status = status; + this.channel = channel; + this.createTime = createTime; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java deleted file mode 100644 index b128e3b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器升降压操作日志 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_log") -@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") -public class Log extends Model { - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "主键") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - private Long detectorId; - /** - * 升压时间 - */ - @ApiModelProperty(value = "升压时间") - @TableField("INCREASE_TIME") - private String increaseTime; - /** - * 降压时间 - */ - @ApiModelProperty(value = "降压时间") - @TableField("DECREASE_TIME") - private String decreaseTime; - /** - * 当前状态 - */ - @ApiModelProperty(value = "当前状态") - @TableField("STATUS") - private String status; - /** - * 通道号 - */ - @ApiModelProperty(value = "通道号") - @TableField("CHANNEL") - private String channel; - /** - * 时间 - */ - @ApiModelProperty(value = "时间") - @TableField("CREATE_TIME") - private String createTime; - /** - * 备注 - */ - @ApiModelProperty(value = "备注") - @TableField("DESCRIPTION") - private String description; -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java deleted file mode 100644 index f5a5336..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.service; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 探测器参数下发记录 服务类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface IConfigService extends IService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java new file mode 100644 index 0000000..69b1688 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.neutron.service; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 探测器参数下发记录 服务类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface IDetectorConfigService extends IService { + + boolean sendConfig(DetectorConfig config); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java new file mode 100644 index 0000000..ede899d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java @@ -0,0 +1,26 @@ +package com.casic.missiles.modular.neutron.service; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 探测器升降压操作日志 服务类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface IDetectorLogService extends IService { + + /** + * + * @param channel 加压通道号 + * @param status 当前状态 + * @return + */ + boolean addLog(Long detectorId,String channel,String status); + + DetectorLog getLastRecord(Long detectorId); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java deleted file mode 100644 index 357beef..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.service; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 探测器升降压操作日志 服务类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ILogService extends IService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java index cf1b357..34d7056 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java @@ -14,12 +14,12 @@ * 中子源设备初始化 * tcp控制指令表依次发送指令 1-16 */ - void deviceInit(); + void deviceInit(Long detectorId); /** * No.2 加压，开始工作 */ - void pressurize(); + void pressurize(Long detectorId); /** * No.3 解析 @@ -30,9 +30,14 @@ /** * No.4 退高压，停止工作 */ - void depress(); + void depress(Long detectorId); - void control(String command); + /** + * + * @param command 指令 + * @param detectorId 探测器id + */ + void control(String command,Long detectorId); List alarmList(Long taskId); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/ConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/ConfigServiceImpl.java deleted file mode 100644 index cbb63a7..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/ConfigServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.neutron.service.impl; - -import com.casic.missiles.modular.neutron.model.Config; -import com.casic.missiles.modular.neutron.dao.ConfigMapper; -import com.casic.missiles.modular.neutron.service.IConfigService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 探测器参数下发记录 服务实现类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Service -public class ConfigServiceImpl extends ServiceImpl implements IConfigService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorConfigServiceImpl.java new file mode 100644 index 0000000..c15e68c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorConfigServiceImpl.java @@ -0,0 +1,49 @@ +package com.casic.missiles.modular.neutron.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.neutron.dao.DetectorConfigMapper; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import com.casic.missiles.netty.InstructCode; +import com.casic.missiles.netty.NettyClient; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + *

+ * 探测器参数下发记录 服务实现类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Service +public class DetectorConfigServiceImpl extends ServiceImpl implements IDetectorConfigService { + + @Resource + private NettyClient nettyClient; + + @Override + public boolean sendConfig(DetectorConfig config) { + + //toDo:发送对应设备 + String[] codeArr = InstructCode.getInitCode(6, Float.valueOf(config.getVol6()), + Integer.valueOf(config.getRawTrig()), Integer.valueOf(config.getRawPeriod()), + Integer.valueOf(config.getRawVth()), Integer.valueOf(config.getPsdTrig()), + Integer.valueOf(config.getPsdPeriod()), Integer.valueOf(config.getPsdVth()), + Integer.valueOf(config.getPsdOffset()), Integer.valueOf(config.getPsdLongGate()), + Integer.valueOf(config.getPsdShortGate())); + + try { + for (int i = 1; i <= codeArr.length / 3; i++) { + nettyClient.send(codeArr[i * 3 - 1]); + Thread.sleep(500); + } + } catch (InterruptedException e) { + e.printStackTrace(); + return false; + } + return true; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java new file mode 100644 index 0000000..d20ef1a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器参数下发记录 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorConfigMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java new file mode 100644 index 0000000..5c4b005 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器升降压操作日志 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorLogMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java deleted file mode 100644 index d3aedd4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器升降压操作日志 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface LogMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml deleted file mode 100644 index 5a02cdb..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml new file mode 100644 index 0000000..806dcd8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml new file mode 100644 index 0000000..707991d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml deleted file mode 100644 index 6d3190f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java deleted file mode 100644 index 720460d..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器参数下发记录 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_config") -@ApiModel(value = "配置信息对象", description = "配置信息记录表") -public class Config extends Model { - - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "降压时间") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - - private Long detectorId; - /** - * 高压参数 - */ - @ApiModelProperty(value = "高压参数") - @TableField("VOL_6") - private String vol6; - /** - * 高速-波形采样-触发方式 - */ - @TableField("RAW_TRIG") - @ApiModelProperty(value = "高速-波形采样-触发方式") - private String rawTrig; - /** - * 高速-波形采样-触发周期 - */ - @TableField("RAW_PERIOD") - @ApiModelProperty(value = "高速-波形采样-触发周期") - private String rawPeriod; - /** - * 高速-波形采样-触发阈值 - */ - @TableField("RAW_VTH") - @ApiModelProperty(value = "高速-波形采样-触发阈值") - private String rawVth; - /** - * 高速-波形采样-采取点数 - */ - @TableField("RAW_SAMPLE") - @ApiModelProperty(value = "高速-波形采样-采取点数") - private String rawSample; - /** - * 高速-波形甑别-E最大值 - */ - @TableField("PSD_E") - @ApiModelProperty(value = "高速-波形甑别-E最大值") - private String psdE; - /** - * 高速-波形甑别-触发方式 - */ - @TableField("PSD_TRIG") - @ApiModelProperty(value = "高速-波形甑别-触发方式") - private String psdTrig; - /** - * 高速-波形甑别-触发周期 - */ - @TableField("PSD_PERIOD") - @ApiModelProperty(value = " 高速-波形甑别-触发周期") - private String psdPeriod; - /** - * 高速-波形甑别-触发阈值 - */ - @TableField("PSD_VTH") - @ApiModelProperty(value = "高速-波形甑别-触发阈值") - private String psdVth; - /** - * 高速-波形甑别-门偏移 - */ - @TableField("PSD_OFFSET") - @ApiModelProperty(value = "高速-波形甑别-门偏移") - private String psdOffset; - /** - * 高速-波形甑别-长门 - */ - @TableField("PSD_LONG_GATE") - @ApiModelProperty(value = "高速-波形甑别-长门") - private String psdLongGate; - /** - * 高速-波形甑别-短门 - */ - @TableField("PSD_SHORT_GATE") - @ApiModelProperty(value = "高速-波形甑别-短门") - private String psdShortGate; - /** - * 时间 - */ - @TableField("CREATE_TIME") - @ApiModelProperty(value = "时间") - private String createTime; - /** - * 备注 - */ - @TableField("DESCRIPTION") - @ApiModelProperty(value = "备注") - private String description; - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java new file mode 100644 index 0000000..b6e4611 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java @@ -0,0 +1,131 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器参数下发记录 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_config") +@ApiModel(value = "配置信息对象", description = "配置信息记录表") +public class DetectorConfig extends Model { + + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "降压时间") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + + private Long detectorId; + /** + * 高压参数 + */ + @ApiModelProperty(value = "高压参数,一般设置1.2V") + @TableField("VOL_6") + private String vol6; + /** + * 高速-波形采样-触发方式 + */ + @TableField("RAW_TRIG") + @ApiModelProperty(value = "高速-波形采样-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String rawTrig; + /** + * 高速-波形采样-触发周期 + */ + @TableField("RAW_PERIOD") + @ApiModelProperty(value = "高速-波形采样-触发周期") + private String rawPeriod; + /** + * 高速-波形采样-触发阈值 + */ + @TableField("RAW_VTH") + @ApiModelProperty(value = "高速-波形采样-触发阈值") + private String rawVth; + /** + * 高速-波形采样-采取点数 + */ + @TableField("RAW_SAMPLE") + @ApiModelProperty(value = "高速-波形采样-采取点数") + private String rawSample; + /** + * 高速-波形甑别-E最大值 + */ + @TableField("PSD_E") + @ApiModelProperty(value = "高速-波形甑别-E最大值") + private String psdE; + /** + * 高速-波形甑别-触发方式 + */ + @TableField("PSD_TRIG") + @ApiModelProperty(value = "高速-波形甑别-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String psdTrig; + /** + * 高速-波形甑别-触发周期 + */ + @TableField("PSD_PERIOD") + @ApiModelProperty(value = "高速-波形甑别-触发周期") + private String psdPeriod; + /** + * 高速-波形甑别-触发阈值 + */ + @TableField("PSD_VTH") + @ApiModelProperty(value = "高速-波形甑别-触发阈值") + private String psdVth; + /** + * 高速-波形甑别-门偏移 + */ + @TableField("PSD_OFFSET") + @ApiModelProperty(value = "高速-波形甑别-门偏移") + private String psdOffset; + /** + * 高速-波形甑别-长门 + */ + @TableField("PSD_LONG_GATE") + @ApiModelProperty(value = "高速-波形甑别-长门") + private String psdLongGate; + /** + * 高速-波形甑别-短门 + */ + @TableField("PSD_SHORT_GATE") + @ApiModelProperty(value = "高速-波形甑别-短门") + private String psdShortGate; + /** + * 时间 + */ + @TableField("CREATE_TIME") + @ApiModelProperty(value = "时间") + private String createTime; + /** + * 备注 + */ + @TableField("DESCRIPTION") + @ApiModelProperty(value = "备注") + private String description; + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java new file mode 100644 index 0000000..178a924 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器升降压操作日志 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_log") +@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") +public class DetectorLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "主键") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + private Long detectorId; + /** + * 升压时间 + */ + @ApiModelProperty(value = "升压时间") + @TableField("INCREASE_TIME") + private String increaseTime; + /** + * 降压时间 + */ + @ApiModelProperty(value = "降压时间") + @TableField("DECREASE_TIME") + private String decreaseTime; + /** + * 当前状态 + */ + @ApiModelProperty(value = "当前状态,0:空闲，1:升压，2:降压") + @TableField("STATUS") + private String status; + /** + * 通道号 + */ + @ApiModelProperty(value = "通道号") + @TableField("CHANNEL") + private String channel; + /** + * 时间 + */ + @ApiModelProperty(value = "时间") + @TableField("CREATE_TIME") + private String createTime; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + @TableField("DESCRIPTION") + private String description; + + public DetectorLog() { + } + + public DetectorLog(Long detectorId, String increaseTime, + String decreaseTime, String status, + String channel, String createTime) { + this.detectorId = detectorId; + this.increaseTime = increaseTime; + this.decreaseTime = decreaseTime; + this.status = status; + this.channel = channel; + this.createTime = createTime; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java deleted file mode 100644 index b128e3b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器升降压操作日志 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_log") -@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") -public class Log extends Model { - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "主键") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - private Long detectorId; - /** - * 升压时间 - */ - @ApiModelProperty(value = "升压时间") - @TableField("INCREASE_TIME") - private String increaseTime; - /** - * 降压时间 - */ - @ApiModelProperty(value = "降压时间") - @TableField("DECREASE_TIME") - private String decreaseTime; - /** - * 当前状态 - */ - @ApiModelProperty(value = "当前状态") - @TableField("STATUS") - private String status; - /** - * 通道号 - */ - @ApiModelProperty(value = "通道号") - @TableField("CHANNEL") - private String channel; - /** - * 时间 - */ - @ApiModelProperty(value = "时间") - @TableField("CREATE_TIME") - private String createTime; - /** - * 备注 - */ - @ApiModelProperty(value = "备注") - @TableField("DESCRIPTION") - private String description; -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java deleted file mode 100644 index f5a5336..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.service; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 探测器参数下发记录 服务类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface IConfigService extends IService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java new file mode 100644 index 0000000..69b1688 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.neutron.service; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 探测器参数下发记录 服务类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface IDetectorConfigService extends IService { + + boolean sendConfig(DetectorConfig config); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java new file mode 100644 index 0000000..ede899d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java @@ -0,0 +1,26 @@ +package com.casic.missiles.modular.neutron.service; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 探测器升降压操作日志 服务类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface IDetectorLogService extends IService { + + /** + * + * @param channel 加压通道号 + * @param status 当前状态 + * @return + */ + boolean addLog(Long detectorId,String channel,String status); + + DetectorLog getLastRecord(Long detectorId); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java deleted file mode 100644 index 357beef..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.service; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 探测器升降压操作日志 服务类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ILogService extends IService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java index cf1b357..34d7056 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java @@ -14,12 +14,12 @@ * 中子源设备初始化 * tcp控制指令表依次发送指令 1-16 */ - void deviceInit(); + void deviceInit(Long detectorId); /** * No.2 加压，开始工作 */ - void pressurize(); + void pressurize(Long detectorId); /** * No.3 解析 @@ -30,9 +30,14 @@ /** * No.4 退高压，停止工作 */ - void depress(); + void depress(Long detectorId); - void control(String command); + /** + * + * @param command 指令 + * @param detectorId 探测器id + */ + void control(String command,Long detectorId); List alarmList(Long taskId); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/ConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/ConfigServiceImpl.java deleted file mode 100644 index cbb63a7..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/ConfigServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.neutron.service.impl; - -import com.casic.missiles.modular.neutron.model.Config; -import com.casic.missiles.modular.neutron.dao.ConfigMapper; -import com.casic.missiles.modular.neutron.service.IConfigService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 探测器参数下发记录 服务实现类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Service -public class ConfigServiceImpl extends ServiceImpl implements IConfigService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorConfigServiceImpl.java new file mode 100644 index 0000000..c15e68c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorConfigServiceImpl.java @@ -0,0 +1,49 @@ +package com.casic.missiles.modular.neutron.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.neutron.dao.DetectorConfigMapper; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import com.casic.missiles.netty.InstructCode; +import com.casic.missiles.netty.NettyClient; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + *

+ * 探测器参数下发记录 服务实现类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Service +public class DetectorConfigServiceImpl extends ServiceImpl implements IDetectorConfigService { + + @Resource + private NettyClient nettyClient; + + @Override + public boolean sendConfig(DetectorConfig config) { + + //toDo:发送对应设备 + String[] codeArr = InstructCode.getInitCode(6, Float.valueOf(config.getVol6()), + Integer.valueOf(config.getRawTrig()), Integer.valueOf(config.getRawPeriod()), + Integer.valueOf(config.getRawVth()), Integer.valueOf(config.getPsdTrig()), + Integer.valueOf(config.getPsdPeriod()), Integer.valueOf(config.getPsdVth()), + Integer.valueOf(config.getPsdOffset()), Integer.valueOf(config.getPsdLongGate()), + Integer.valueOf(config.getPsdShortGate())); + + try { + for (int i = 1; i <= codeArr.length / 3; i++) { + nettyClient.send(codeArr[i * 3 - 1]); + Thread.sleep(500); + } + } catch (InterruptedException e) { + e.printStackTrace(); + return false; + } + return true; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorLogServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorLogServiceImpl.java new file mode 100644 index 0000000..bad64cd --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorLogServiceImpl.java @@ -0,0 +1,76 @@ +package com.casic.missiles.modular.neutron.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.dao.DetectorLogMapper; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + *

+ * 探测器升降压操作日志 服务实现类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Service +public class DetectorLogServiceImpl extends ServiceImpl implements IDetectorLogService { + + @Override + public boolean addLog(Long detectorId, String channel, String status) { + + return this.save(new DetectorLog(detectorId, + "start".equals(status) ? DateUtil.formatDateTime(new Date()) : "", + "stop".equals(status) ? DateUtil.formatDateTime(new Date()) : "", + "start".equals(status) ? "1" : "0", + channel, + DateUtil.formatDateTime(new Date()))); + } + + @Override + public DetectorLog getLastRecord(Long detectorId) { + DetectorLog log = new DetectorLog(); + log.setChannel("6"); + log.setStatus("0"); + log.setDetectorId(detectorId); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.isNotNull("INCREASE_TIME"); + queryWrapper.orderByDesc("CREATE_TIME"); + List increaseLogList = this.list(queryWrapper); + String increaseTime = ""; + if (null != increaseLogList && increaseLogList.size() > 0) { + DetectorLog increaseLog = increaseLogList.get(0); + increaseTime = increaseLog.getIncreaseTime(); + log.setIncreaseTime(increaseTime); + } + + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.eq("DETECTOR_ID", detectorId); + queryWrapper1.isNotNull("DECREASE_TIME"); + queryWrapper1.orderByDesc("CREATE_TIME"); + List decreaseLogList = this.list(queryWrapper1); + String decreaseTime = ""; + if (null != decreaseLogList && decreaseLogList.size() > 0) { + DetectorLog decreaseLog = decreaseLogList.get(0); + decreaseTime = decreaseLog.getDecreaseTime(); + log.setDecreaseTime(decreaseTime); + } + if (ObjectUtil.isAllNotEmpty(increaseTime, decreaseTime)) { + log.setStatus(DateUtil.parseDateTime(increaseTime).isAfter(DateUtil.parseDateTime(decreaseTime)) ? + "1" : "2"); + } else if (ObjectUtil.isNotEmpty(increaseTime)) { + log.setStatus("1"); + } else { + log.setStatus("2"); + } + return log; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java new file mode 100644 index 0000000..d20ef1a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器参数下发记录 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorConfigMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java new file mode 100644 index 0000000..5c4b005 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器升降压操作日志 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorLogMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java deleted file mode 100644 index d3aedd4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器升降压操作日志 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface LogMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml deleted file mode 100644 index 5a02cdb..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml new file mode 100644 index 0000000..806dcd8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml new file mode 100644 index 0000000..707991d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml deleted file mode 100644 index 6d3190f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java deleted file mode 100644 index 720460d..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器参数下发记录 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_config") -@ApiModel(value = "配置信息对象", description = "配置信息记录表") -public class Config extends Model { - - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "降压时间") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - - private Long detectorId; - /** - * 高压参数 - */ - @ApiModelProperty(value = "高压参数") - @TableField("VOL_6") - private String vol6; - /** - * 高速-波形采样-触发方式 - */ - @TableField("RAW_TRIG") - @ApiModelProperty(value = "高速-波形采样-触发方式") - private String rawTrig; - /** - * 高速-波形采样-触发周期 - */ - @TableField("RAW_PERIOD") - @ApiModelProperty(value = "高速-波形采样-触发周期") - private String rawPeriod; - /** - * 高速-波形采样-触发阈值 - */ - @TableField("RAW_VTH") - @ApiModelProperty(value = "高速-波形采样-触发阈值") - private String rawVth; - /** - * 高速-波形采样-采取点数 - */ - @TableField("RAW_SAMPLE") - @ApiModelProperty(value = "高速-波形采样-采取点数") - private String rawSample; - /** - * 高速-波形甑别-E最大值 - */ - @TableField("PSD_E") - @ApiModelProperty(value = "高速-波形甑别-E最大值") - private String psdE; - /** - * 高速-波形甑别-触发方式 - */ - @TableField("PSD_TRIG") - @ApiModelProperty(value = "高速-波形甑别-触发方式") - private String psdTrig; - /** - * 高速-波形甑别-触发周期 - */ - @TableField("PSD_PERIOD") - @ApiModelProperty(value = " 高速-波形甑别-触发周期") - private String psdPeriod; - /** - * 高速-波形甑别-触发阈值 - */ - @TableField("PSD_VTH") - @ApiModelProperty(value = "高速-波形甑别-触发阈值") - private String psdVth; - /** - * 高速-波形甑别-门偏移 - */ - @TableField("PSD_OFFSET") - @ApiModelProperty(value = "高速-波形甑别-门偏移") - private String psdOffset; - /** - * 高速-波形甑别-长门 - */ - @TableField("PSD_LONG_GATE") - @ApiModelProperty(value = "高速-波形甑别-长门") - private String psdLongGate; - /** - * 高速-波形甑别-短门 - */ - @TableField("PSD_SHORT_GATE") - @ApiModelProperty(value = "高速-波形甑别-短门") - private String psdShortGate; - /** - * 时间 - */ - @TableField("CREATE_TIME") - @ApiModelProperty(value = "时间") - private String createTime; - /** - * 备注 - */ - @TableField("DESCRIPTION") - @ApiModelProperty(value = "备注") - private String description; - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java new file mode 100644 index 0000000..b6e4611 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java @@ -0,0 +1,131 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器参数下发记录 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_config") +@ApiModel(value = "配置信息对象", description = "配置信息记录表") +public class DetectorConfig extends Model { + + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "降压时间") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + + private Long detectorId; + /** + * 高压参数 + */ + @ApiModelProperty(value = "高压参数,一般设置1.2V") + @TableField("VOL_6") + private String vol6; + /** + * 高速-波形采样-触发方式 + */ + @TableField("RAW_TRIG") + @ApiModelProperty(value = "高速-波形采样-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String rawTrig; + /** + * 高速-波形采样-触发周期 + */ + @TableField("RAW_PERIOD") + @ApiModelProperty(value = "高速-波形采样-触发周期") + private String rawPeriod; + /** + * 高速-波形采样-触发阈值 + */ + @TableField("RAW_VTH") + @ApiModelProperty(value = "高速-波形采样-触发阈值") + private String rawVth; + /** + * 高速-波形采样-采取点数 + */ + @TableField("RAW_SAMPLE") + @ApiModelProperty(value = "高速-波形采样-采取点数") + private String rawSample; + /** + * 高速-波形甑别-E最大值 + */ + @TableField("PSD_E") + @ApiModelProperty(value = "高速-波形甑别-E最大值") + private String psdE; + /** + * 高速-波形甑别-触发方式 + */ + @TableField("PSD_TRIG") + @ApiModelProperty(value = "高速-波形甑别-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String psdTrig; + /** + * 高速-波形甑别-触发周期 + */ + @TableField("PSD_PERIOD") + @ApiModelProperty(value = "高速-波形甑别-触发周期") + private String psdPeriod; + /** + * 高速-波形甑别-触发阈值 + */ + @TableField("PSD_VTH") + @ApiModelProperty(value = "高速-波形甑别-触发阈值") + private String psdVth; + /** + * 高速-波形甑别-门偏移 + */ + @TableField("PSD_OFFSET") + @ApiModelProperty(value = "高速-波形甑别-门偏移") + private String psdOffset; + /** + * 高速-波形甑别-长门 + */ + @TableField("PSD_LONG_GATE") + @ApiModelProperty(value = "高速-波形甑别-长门") + private String psdLongGate; + /** + * 高速-波形甑别-短门 + */ + @TableField("PSD_SHORT_GATE") + @ApiModelProperty(value = "高速-波形甑别-短门") + private String psdShortGate; + /** + * 时间 + */ + @TableField("CREATE_TIME") + @ApiModelProperty(value = "时间") + private String createTime; + /** + * 备注 + */ + @TableField("DESCRIPTION") + @ApiModelProperty(value = "备注") + private String description; + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java new file mode 100644 index 0000000..178a924 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器升降压操作日志 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_log") +@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") +public class DetectorLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "主键") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + private Long detectorId; + /** + * 升压时间 + */ + @ApiModelProperty(value = "升压时间") + @TableField("INCREASE_TIME") + private String increaseTime; + /** + * 降压时间 + */ + @ApiModelProperty(value = "降压时间") + @TableField("DECREASE_TIME") + private String decreaseTime; + /** + * 当前状态 + */ + @ApiModelProperty(value = "当前状态,0:空闲，1:升压，2:降压") + @TableField("STATUS") + private String status; + /** + * 通道号 + */ + @ApiModelProperty(value = "通道号") + @TableField("CHANNEL") + private String channel; + /** + * 时间 + */ + @ApiModelProperty(value = "时间") + @TableField("CREATE_TIME") + private String createTime; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + @TableField("DESCRIPTION") + private String description; + + public DetectorLog() { + } + + public DetectorLog(Long detectorId, String increaseTime, + String decreaseTime, String status, + String channel, String createTime) { + this.detectorId = detectorId; + this.increaseTime = increaseTime; + this.decreaseTime = decreaseTime; + this.status = status; + this.channel = channel; + this.createTime = createTime; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java deleted file mode 100644 index b128e3b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器升降压操作日志 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_log") -@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") -public class Log extends Model { - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "主键") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - private Long detectorId; - /** - * 升压时间 - */ - @ApiModelProperty(value = "升压时间") - @TableField("INCREASE_TIME") - private String increaseTime; - /** - * 降压时间 - */ - @ApiModelProperty(value = "降压时间") - @TableField("DECREASE_TIME") - private String decreaseTime; - /** - * 当前状态 - */ - @ApiModelProperty(value = "当前状态") - @TableField("STATUS") - private String status; - /** - * 通道号 - */ - @ApiModelProperty(value = "通道号") - @TableField("CHANNEL") - private String channel; - /** - * 时间 - */ - @ApiModelProperty(value = "时间") - @TableField("CREATE_TIME") - private String createTime; - /** - * 备注 - */ - @ApiModelProperty(value = "备注") - @TableField("DESCRIPTION") - private String description; -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java deleted file mode 100644 index f5a5336..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.service; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 探测器参数下发记录 服务类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface IConfigService extends IService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java new file mode 100644 index 0000000..69b1688 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.neutron.service; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 探测器参数下发记录 服务类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface IDetectorConfigService extends IService { + + boolean sendConfig(DetectorConfig config); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java new file mode 100644 index 0000000..ede899d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java @@ -0,0 +1,26 @@ +package com.casic.missiles.modular.neutron.service; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 探测器升降压操作日志 服务类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface IDetectorLogService extends IService { + + /** + * + * @param channel 加压通道号 + * @param status 当前状态 + * @return + */ + boolean addLog(Long detectorId,String channel,String status); + + DetectorLog getLastRecord(Long detectorId); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java deleted file mode 100644 index 357beef..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.service; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 探测器升降压操作日志 服务类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ILogService extends IService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java index cf1b357..34d7056 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java @@ -14,12 +14,12 @@ * 中子源设备初始化 * tcp控制指令表依次发送指令 1-16 */ - void deviceInit(); + void deviceInit(Long detectorId); /** * No.2 加压，开始工作 */ - void pressurize(); + void pressurize(Long detectorId); /** * No.3 解析 @@ -30,9 +30,14 @@ /** * No.4 退高压，停止工作 */ - void depress(); + void depress(Long detectorId); - void control(String command); + /** + * + * @param command 指令 + * @param detectorId 探测器id + */ + void control(String command,Long detectorId); List alarmList(Long taskId); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/ConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/ConfigServiceImpl.java deleted file mode 100644 index cbb63a7..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/ConfigServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.neutron.service.impl; - -import com.casic.missiles.modular.neutron.model.Config; -import com.casic.missiles.modular.neutron.dao.ConfigMapper; -import com.casic.missiles.modular.neutron.service.IConfigService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 探测器参数下发记录 服务实现类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Service -public class ConfigServiceImpl extends ServiceImpl implements IConfigService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorConfigServiceImpl.java new file mode 100644 index 0000000..c15e68c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorConfigServiceImpl.java @@ -0,0 +1,49 @@ +package com.casic.missiles.modular.neutron.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.neutron.dao.DetectorConfigMapper; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import com.casic.missiles.netty.InstructCode; +import com.casic.missiles.netty.NettyClient; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + *

+ * 探测器参数下发记录 服务实现类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Service +public class DetectorConfigServiceImpl extends ServiceImpl implements IDetectorConfigService { + + @Resource + private NettyClient nettyClient; + + @Override + public boolean sendConfig(DetectorConfig config) { + + //toDo:发送对应设备 + String[] codeArr = InstructCode.getInitCode(6, Float.valueOf(config.getVol6()), + Integer.valueOf(config.getRawTrig()), Integer.valueOf(config.getRawPeriod()), + Integer.valueOf(config.getRawVth()), Integer.valueOf(config.getPsdTrig()), + Integer.valueOf(config.getPsdPeriod()), Integer.valueOf(config.getPsdVth()), + Integer.valueOf(config.getPsdOffset()), Integer.valueOf(config.getPsdLongGate()), + Integer.valueOf(config.getPsdShortGate())); + + try { + for (int i = 1; i <= codeArr.length / 3; i++) { + nettyClient.send(codeArr[i * 3 - 1]); + Thread.sleep(500); + } + } catch (InterruptedException e) { + e.printStackTrace(); + return false; + } + return true; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorLogServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorLogServiceImpl.java new file mode 100644 index 0000000..bad64cd --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorLogServiceImpl.java @@ -0,0 +1,76 @@ +package com.casic.missiles.modular.neutron.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.dao.DetectorLogMapper; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + *

+ * 探测器升降压操作日志 服务实现类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Service +public class DetectorLogServiceImpl extends ServiceImpl implements IDetectorLogService { + + @Override + public boolean addLog(Long detectorId, String channel, String status) { + + return this.save(new DetectorLog(detectorId, + "start".equals(status) ? DateUtil.formatDateTime(new Date()) : "", + "stop".equals(status) ? DateUtil.formatDateTime(new Date()) : "", + "start".equals(status) ? "1" : "0", + channel, + DateUtil.formatDateTime(new Date()))); + } + + @Override + public DetectorLog getLastRecord(Long detectorId) { + DetectorLog log = new DetectorLog(); + log.setChannel("6"); + log.setStatus("0"); + log.setDetectorId(detectorId); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.isNotNull("INCREASE_TIME"); + queryWrapper.orderByDesc("CREATE_TIME"); + List increaseLogList = this.list(queryWrapper); + String increaseTime = ""; + if (null != increaseLogList && increaseLogList.size() > 0) { + DetectorLog increaseLog = increaseLogList.get(0); + increaseTime = increaseLog.getIncreaseTime(); + log.setIncreaseTime(increaseTime); + } + + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.eq("DETECTOR_ID", detectorId); + queryWrapper1.isNotNull("DECREASE_TIME"); + queryWrapper1.orderByDesc("CREATE_TIME"); + List decreaseLogList = this.list(queryWrapper1); + String decreaseTime = ""; + if (null != decreaseLogList && decreaseLogList.size() > 0) { + DetectorLog decreaseLog = decreaseLogList.get(0); + decreaseTime = decreaseLog.getDecreaseTime(); + log.setDecreaseTime(decreaseTime); + } + if (ObjectUtil.isAllNotEmpty(increaseTime, decreaseTime)) { + log.setStatus(DateUtil.parseDateTime(increaseTime).isAfter(DateUtil.parseDateTime(decreaseTime)) ? + "1" : "2"); + } else if (ObjectUtil.isNotEmpty(increaseTime)) { + log.setStatus("1"); + } else { + log.setStatus("2"); + } + return log; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/LogServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/LogServiceImpl.java deleted file mode 100644 index 8abe7c4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/LogServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.neutron.service.impl; - -import com.casic.missiles.modular.neutron.model.Log; -import com.casic.missiles.modular.neutron.dao.LogMapper; -import com.casic.missiles.modular.neutron.service.ILogService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 探测器升降压操作日志 服务实现类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Service -public class LogServiceImpl extends ServiceImpl implements ILogService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java new file mode 100644 index 0000000..d20ef1a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器参数下发记录 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorConfigMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java new file mode 100644 index 0000000..5c4b005 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器升降压操作日志 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorLogMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java deleted file mode 100644 index d3aedd4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器升降压操作日志 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface LogMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml deleted file mode 100644 index 5a02cdb..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml new file mode 100644 index 0000000..806dcd8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml new file mode 100644 index 0000000..707991d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml deleted file mode 100644 index 6d3190f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java deleted file mode 100644 index 720460d..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器参数下发记录 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_config") -@ApiModel(value = "配置信息对象", description = "配置信息记录表") -public class Config extends Model { - - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "降压时间") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - - private Long detectorId; - /** - * 高压参数 - */ - @ApiModelProperty(value = "高压参数") - @TableField("VOL_6") - private String vol6; - /** - * 高速-波形采样-触发方式 - */ - @TableField("RAW_TRIG") - @ApiModelProperty(value = "高速-波形采样-触发方式") - private String rawTrig; - /** - * 高速-波形采样-触发周期 - */ - @TableField("RAW_PERIOD") - @ApiModelProperty(value = "高速-波形采样-触发周期") - private String rawPeriod; - /** - * 高速-波形采样-触发阈值 - */ - @TableField("RAW_VTH") - @ApiModelProperty(value = "高速-波形采样-触发阈值") - private String rawVth; - /** - * 高速-波形采样-采取点数 - */ - @TableField("RAW_SAMPLE") - @ApiModelProperty(value = "高速-波形采样-采取点数") - private String rawSample; - /** - * 高速-波形甑别-E最大值 - */ - @TableField("PSD_E") - @ApiModelProperty(value = "高速-波形甑别-E最大值") - private String psdE; - /** - * 高速-波形甑别-触发方式 - */ - @TableField("PSD_TRIG") - @ApiModelProperty(value = "高速-波形甑别-触发方式") - private String psdTrig; - /** - * 高速-波形甑别-触发周期 - */ - @TableField("PSD_PERIOD") - @ApiModelProperty(value = " 高速-波形甑别-触发周期") - private String psdPeriod; - /** - * 高速-波形甑别-触发阈值 - */ - @TableField("PSD_VTH") - @ApiModelProperty(value = "高速-波形甑别-触发阈值") - private String psdVth; - /** - * 高速-波形甑别-门偏移 - */ - @TableField("PSD_OFFSET") - @ApiModelProperty(value = "高速-波形甑别-门偏移") - private String psdOffset; - /** - * 高速-波形甑别-长门 - */ - @TableField("PSD_LONG_GATE") - @ApiModelProperty(value = "高速-波形甑别-长门") - private String psdLongGate; - /** - * 高速-波形甑别-短门 - */ - @TableField("PSD_SHORT_GATE") - @ApiModelProperty(value = "高速-波形甑别-短门") - private String psdShortGate; - /** - * 时间 - */ - @TableField("CREATE_TIME") - @ApiModelProperty(value = "时间") - private String createTime; - /** - * 备注 - */ - @TableField("DESCRIPTION") - @ApiModelProperty(value = "备注") - private String description; - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java new file mode 100644 index 0000000..b6e4611 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java @@ -0,0 +1,131 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器参数下发记录 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_config") +@ApiModel(value = "配置信息对象", description = "配置信息记录表") +public class DetectorConfig extends Model { + + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "降压时间") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + + private Long detectorId; + /** + * 高压参数 + */ + @ApiModelProperty(value = "高压参数,一般设置1.2V") + @TableField("VOL_6") + private String vol6; + /** + * 高速-波形采样-触发方式 + */ + @TableField("RAW_TRIG") + @ApiModelProperty(value = "高速-波形采样-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String rawTrig; + /** + * 高速-波形采样-触发周期 + */ + @TableField("RAW_PERIOD") + @ApiModelProperty(value = "高速-波形采样-触发周期") + private String rawPeriod; + /** + * 高速-波形采样-触发阈值 + */ + @TableField("RAW_VTH") + @ApiModelProperty(value = "高速-波形采样-触发阈值") + private String rawVth; + /** + * 高速-波形采样-采取点数 + */ + @TableField("RAW_SAMPLE") + @ApiModelProperty(value = "高速-波形采样-采取点数") + private String rawSample; + /** + * 高速-波形甑别-E最大值 + */ + @TableField("PSD_E") + @ApiModelProperty(value = "高速-波形甑别-E最大值") + private String psdE; + /** + * 高速-波形甑别-触发方式 + */ + @TableField("PSD_TRIG") + @ApiModelProperty(value = "高速-波形甑别-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String psdTrig; + /** + * 高速-波形甑别-触发周期 + */ + @TableField("PSD_PERIOD") + @ApiModelProperty(value = "高速-波形甑别-触发周期") + private String psdPeriod; + /** + * 高速-波形甑别-触发阈值 + */ + @TableField("PSD_VTH") + @ApiModelProperty(value = "高速-波形甑别-触发阈值") + private String psdVth; + /** + * 高速-波形甑别-门偏移 + */ + @TableField("PSD_OFFSET") + @ApiModelProperty(value = "高速-波形甑别-门偏移") + private String psdOffset; + /** + * 高速-波形甑别-长门 + */ + @TableField("PSD_LONG_GATE") + @ApiModelProperty(value = "高速-波形甑别-长门") + private String psdLongGate; + /** + * 高速-波形甑别-短门 + */ + @TableField("PSD_SHORT_GATE") + @ApiModelProperty(value = "高速-波形甑别-短门") + private String psdShortGate; + /** + * 时间 + */ + @TableField("CREATE_TIME") + @ApiModelProperty(value = "时间") + private String createTime; + /** + * 备注 + */ + @TableField("DESCRIPTION") + @ApiModelProperty(value = "备注") + private String description; + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java new file mode 100644 index 0000000..178a924 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器升降压操作日志 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_log") +@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") +public class DetectorLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "主键") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + private Long detectorId; + /** + * 升压时间 + */ + @ApiModelProperty(value = "升压时间") + @TableField("INCREASE_TIME") + private String increaseTime; + /** + * 降压时间 + */ + @ApiModelProperty(value = "降压时间") + @TableField("DECREASE_TIME") + private String decreaseTime; + /** + * 当前状态 + */ + @ApiModelProperty(value = "当前状态,0:空闲，1:升压，2:降压") + @TableField("STATUS") + private String status; + /** + * 通道号 + */ + @ApiModelProperty(value = "通道号") + @TableField("CHANNEL") + private String channel; + /** + * 时间 + */ + @ApiModelProperty(value = "时间") + @TableField("CREATE_TIME") + private String createTime; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + @TableField("DESCRIPTION") + private String description; + + public DetectorLog() { + } + + public DetectorLog(Long detectorId, String increaseTime, + String decreaseTime, String status, + String channel, String createTime) { + this.detectorId = detectorId; + this.increaseTime = increaseTime; + this.decreaseTime = decreaseTime; + this.status = status; + this.channel = channel; + this.createTime = createTime; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java deleted file mode 100644 index b128e3b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器升降压操作日志 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_log") -@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") -public class Log extends Model { - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "主键") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - private Long detectorId; - /** - * 升压时间 - */ - @ApiModelProperty(value = "升压时间") - @TableField("INCREASE_TIME") - private String increaseTime; - /** - * 降压时间 - */ - @ApiModelProperty(value = "降压时间") - @TableField("DECREASE_TIME") - private String decreaseTime; - /** - * 当前状态 - */ - @ApiModelProperty(value = "当前状态") - @TableField("STATUS") - private String status; - /** - * 通道号 - */ - @ApiModelProperty(value = "通道号") - @TableField("CHANNEL") - private String channel; - /** - * 时间 - */ - @ApiModelProperty(value = "时间") - @TableField("CREATE_TIME") - private String createTime; - /** - * 备注 - */ - @ApiModelProperty(value = "备注") - @TableField("DESCRIPTION") - private String description; -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java deleted file mode 100644 index f5a5336..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.service; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 探测器参数下发记录 服务类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface IConfigService extends IService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java new file mode 100644 index 0000000..69b1688 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.neutron.service; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 探测器参数下发记录 服务类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface IDetectorConfigService extends IService { + + boolean sendConfig(DetectorConfig config); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java new file mode 100644 index 0000000..ede899d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java @@ -0,0 +1,26 @@ +package com.casic.missiles.modular.neutron.service; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 探测器升降压操作日志 服务类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface IDetectorLogService extends IService { + + /** + * + * @param channel 加压通道号 + * @param status 当前状态 + * @return + */ + boolean addLog(Long detectorId,String channel,String status); + + DetectorLog getLastRecord(Long detectorId); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java deleted file mode 100644 index 357beef..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.service; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 探测器升降压操作日志 服务类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ILogService extends IService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java index cf1b357..34d7056 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java @@ -14,12 +14,12 @@ * 中子源设备初始化 * tcp控制指令表依次发送指令 1-16 */ - void deviceInit(); + void deviceInit(Long detectorId); /** * No.2 加压，开始工作 */ - void pressurize(); + void pressurize(Long detectorId); /** * No.3 解析 @@ -30,9 +30,14 @@ /** * No.4 退高压，停止工作 */ - void depress(); + void depress(Long detectorId); - void control(String command); + /** + * + * @param command 指令 + * @param detectorId 探测器id + */ + void control(String command,Long detectorId); List alarmList(Long taskId); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/ConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/ConfigServiceImpl.java deleted file mode 100644 index cbb63a7..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/ConfigServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.neutron.service.impl; - -import com.casic.missiles.modular.neutron.model.Config; -import com.casic.missiles.modular.neutron.dao.ConfigMapper; -import com.casic.missiles.modular.neutron.service.IConfigService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 探测器参数下发记录 服务实现类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Service -public class ConfigServiceImpl extends ServiceImpl implements IConfigService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorConfigServiceImpl.java new file mode 100644 index 0000000..c15e68c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorConfigServiceImpl.java @@ -0,0 +1,49 @@ +package com.casic.missiles.modular.neutron.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.neutron.dao.DetectorConfigMapper; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import com.casic.missiles.netty.InstructCode; +import com.casic.missiles.netty.NettyClient; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + *

+ * 探测器参数下发记录 服务实现类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Service +public class DetectorConfigServiceImpl extends ServiceImpl implements IDetectorConfigService { + + @Resource + private NettyClient nettyClient; + + @Override + public boolean sendConfig(DetectorConfig config) { + + //toDo:发送对应设备 + String[] codeArr = InstructCode.getInitCode(6, Float.valueOf(config.getVol6()), + Integer.valueOf(config.getRawTrig()), Integer.valueOf(config.getRawPeriod()), + Integer.valueOf(config.getRawVth()), Integer.valueOf(config.getPsdTrig()), + Integer.valueOf(config.getPsdPeriod()), Integer.valueOf(config.getPsdVth()), + Integer.valueOf(config.getPsdOffset()), Integer.valueOf(config.getPsdLongGate()), + Integer.valueOf(config.getPsdShortGate())); + + try { + for (int i = 1; i <= codeArr.length / 3; i++) { + nettyClient.send(codeArr[i * 3 - 1]); + Thread.sleep(500); + } + } catch (InterruptedException e) { + e.printStackTrace(); + return false; + } + return true; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorLogServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorLogServiceImpl.java new file mode 100644 index 0000000..bad64cd --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorLogServiceImpl.java @@ -0,0 +1,76 @@ +package com.casic.missiles.modular.neutron.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.dao.DetectorLogMapper; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + *

+ * 探测器升降压操作日志 服务实现类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Service +public class DetectorLogServiceImpl extends ServiceImpl implements IDetectorLogService { + + @Override + public boolean addLog(Long detectorId, String channel, String status) { + + return this.save(new DetectorLog(detectorId, + "start".equals(status) ? DateUtil.formatDateTime(new Date()) : "", + "stop".equals(status) ? DateUtil.formatDateTime(new Date()) : "", + "start".equals(status) ? "1" : "0", + channel, + DateUtil.formatDateTime(new Date()))); + } + + @Override + public DetectorLog getLastRecord(Long detectorId) { + DetectorLog log = new DetectorLog(); + log.setChannel("6"); + log.setStatus("0"); + log.setDetectorId(detectorId); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.isNotNull("INCREASE_TIME"); + queryWrapper.orderByDesc("CREATE_TIME"); + List increaseLogList = this.list(queryWrapper); + String increaseTime = ""; + if (null != increaseLogList && increaseLogList.size() > 0) { + DetectorLog increaseLog = increaseLogList.get(0); + increaseTime = increaseLog.getIncreaseTime(); + log.setIncreaseTime(increaseTime); + } + + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.eq("DETECTOR_ID", detectorId); + queryWrapper1.isNotNull("DECREASE_TIME"); + queryWrapper1.orderByDesc("CREATE_TIME"); + List decreaseLogList = this.list(queryWrapper1); + String decreaseTime = ""; + if (null != decreaseLogList && decreaseLogList.size() > 0) { + DetectorLog decreaseLog = decreaseLogList.get(0); + decreaseTime = decreaseLog.getDecreaseTime(); + log.setDecreaseTime(decreaseTime); + } + if (ObjectUtil.isAllNotEmpty(increaseTime, decreaseTime)) { + log.setStatus(DateUtil.parseDateTime(increaseTime).isAfter(DateUtil.parseDateTime(decreaseTime)) ? + "1" : "2"); + } else if (ObjectUtil.isNotEmpty(increaseTime)) { + log.setStatus("1"); + } else { + log.setStatus("2"); + } + return log; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/LogServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/LogServiceImpl.java deleted file mode 100644 index 8abe7c4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/LogServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.neutron.service.impl; - -import com.casic.missiles.modular.neutron.model.Log; -import com.casic.missiles.modular.neutron.dao.LogMapper; -import com.casic.missiles.modular.neutron.service.ILogService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 探测器升降压操作日志 服务实现类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Service -public class LogServiceImpl extends ServiceImpl implements ILogService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/NeutronOptServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/NeutronOptServiceImpl.java index cc17fc7..7a12a35 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/NeutronOptServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/NeutronOptServiceImpl.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.neutron.dto.PsdAlarmDTO; import com.casic.missiles.modular.neutron.model.Psd; import com.casic.missiles.modular.neutron.model.Vol; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; import com.casic.missiles.modular.neutron.service.INeutronOptService; import com.casic.missiles.modular.neutron.service.IPsdService; import com.casic.missiles.modular.neutron.service.IVolService; @@ -19,7 +20,7 @@ @Slf4j @Service -public class NeutronOptServiceImpl implements INeutronOptService { +public class NeutronOptServiceImpl implements INeutronOptService { @Resource private NettyClient nettyClient; @@ -27,22 +28,27 @@ private IPsdService iPsdService; @Resource private IVolService iVolService; + @Resource + private IDetectorLogService iLogService; @Override - public void deviceInit() { - for (int i = 1; i <= InstructCode.InitCodeArr.length / 3; i++) { - try { + public void deviceInit(Long detectorId) { + + try { + for (int i = 1; i <= InstructCode.InitCodeArr.length / 3; i++) { nettyClient.send(InstructCode.InitCodeArr[i * 3 - 1]); Thread.sleep(500); - } catch (InterruptedException e) { - e.printStackTrace(); } + } catch (InterruptedException e) { + e.printStackTrace(); } } @Override - public void pressurize() { - nettyClient.send(InstructCode.DAC_UP); + public void pressurize(Long detectorId) { + if (nettyClient.send(InstructCode.DAC_UP)) { + iLogService.addLog(detectorId, "6", "start"); + } } @@ -56,8 +62,8 @@ psd.setIpPort(deviceIpPort.substring(1)); if (ObjectUtil.isAllNotEmpty(psd.getBaseLine(), psd.getLongGate(), psd.getQlong(), psd.getShortGate(), psd.getQshort())) { - Long Qlong = Math.abs(Long.valueOf(psd.getQlong(),16) - Long.parseLong(psd.getBaseLine(), 16) * Long.parseLong(psd.getLongGate(), 16)); - Long Qshort = Math.abs(Long.valueOf(psd.getQshort(),16) - Long.parseLong(psd.getBaseLine(), 16) * Long.parseLong(psd.getShortGate(), 16)); + Long Qlong = Math.abs(Long.valueOf(psd.getQlong(), 16) - Long.parseLong(psd.getBaseLine(), 16) * Long.parseLong(psd.getLongGate(), 16)); + Long Qshort = Math.abs(Long.valueOf(psd.getQshort(), 16) - Long.parseLong(psd.getBaseLine(), 16) * Long.parseLong(psd.getShortGate(), 16)); Double psdRate = (Qlong - Qshort) * 1.000 / Qlong; psd.setPsd(String.format("%.2f", psdRate)); } @@ -73,21 +79,23 @@ } @Override - public void depress() { - nettyClient.send(InstructCode.DAC_DOWN); + public void depress(Long detectorId) { + if (nettyClient.send(InstructCode.DAC_DOWN)) { + iLogService.addLog(detectorId, "6", "stop"); + } } @Override - public void control(String command) { + public void control(String command, Long detectorId) { switch (command) { case "init": - this.deviceInit(); + this.deviceInit(detectorId); break; case "start": - this.pressurize(); + this.pressurize(detectorId); break; case "stop": - this.depress(); + this.depress(detectorId); break; case "off": default: @@ -98,7 +106,7 @@ @Override public List alarmList(Long taskId) { - return iPsdService.getPsdAlarm(taskId); + return iPsdService.getPsdAlarm(taskId); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java new file mode 100644 index 0000000..d20ef1a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器参数下发记录 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorConfigMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java new file mode 100644 index 0000000..5c4b005 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器升降压操作日志 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorLogMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java deleted file mode 100644 index d3aedd4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器升降压操作日志 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface LogMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml deleted file mode 100644 index 5a02cdb..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml new file mode 100644 index 0000000..806dcd8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml new file mode 100644 index 0000000..707991d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml deleted file mode 100644 index 6d3190f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java deleted file mode 100644 index 720460d..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器参数下发记录 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_config") -@ApiModel(value = "配置信息对象", description = "配置信息记录表") -public class Config extends Model { - - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "降压时间") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - - private Long detectorId; - /** - * 高压参数 - */ - @ApiModelProperty(value = "高压参数") - @TableField("VOL_6") - private String vol6; - /** - * 高速-波形采样-触发方式 - */ - @TableField("RAW_TRIG") - @ApiModelProperty(value = "高速-波形采样-触发方式") - private String rawTrig; - /** - * 高速-波形采样-触发周期 - */ - @TableField("RAW_PERIOD") - @ApiModelProperty(value = "高速-波形采样-触发周期") - private String rawPeriod; - /** - * 高速-波形采样-触发阈值 - */ - @TableField("RAW_VTH") - @ApiModelProperty(value = "高速-波形采样-触发阈值") - private String rawVth; - /** - * 高速-波形采样-采取点数 - */ - @TableField("RAW_SAMPLE") - @ApiModelProperty(value = "高速-波形采样-采取点数") - private String rawSample; - /** - * 高速-波形甑别-E最大值 - */ - @TableField("PSD_E") - @ApiModelProperty(value = "高速-波形甑别-E最大值") - private String psdE; - /** - * 高速-波形甑别-触发方式 - */ - @TableField("PSD_TRIG") - @ApiModelProperty(value = "高速-波形甑别-触发方式") - private String psdTrig; - /** - * 高速-波形甑别-触发周期 - */ - @TableField("PSD_PERIOD") - @ApiModelProperty(value = " 高速-波形甑别-触发周期") - private String psdPeriod; - /** - * 高速-波形甑别-触发阈值 - */ - @TableField("PSD_VTH") - @ApiModelProperty(value = "高速-波形甑别-触发阈值") - private String psdVth; - /** - * 高速-波形甑别-门偏移 - */ - @TableField("PSD_OFFSET") - @ApiModelProperty(value = "高速-波形甑别-门偏移") - private String psdOffset; - /** - * 高速-波形甑别-长门 - */ - @TableField("PSD_LONG_GATE") - @ApiModelProperty(value = "高速-波形甑别-长门") - private String psdLongGate; - /** - * 高速-波形甑别-短门 - */ - @TableField("PSD_SHORT_GATE") - @ApiModelProperty(value = "高速-波形甑别-短门") - private String psdShortGate; - /** - * 时间 - */ - @TableField("CREATE_TIME") - @ApiModelProperty(value = "时间") - private String createTime; - /** - * 备注 - */ - @TableField("DESCRIPTION") - @ApiModelProperty(value = "备注") - private String description; - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java new file mode 100644 index 0000000..b6e4611 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java @@ -0,0 +1,131 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器参数下发记录 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_config") +@ApiModel(value = "配置信息对象", description = "配置信息记录表") +public class DetectorConfig extends Model { + + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "降压时间") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + + private Long detectorId; + /** + * 高压参数 + */ + @ApiModelProperty(value = "高压参数,一般设置1.2V") + @TableField("VOL_6") + private String vol6; + /** + * 高速-波形采样-触发方式 + */ + @TableField("RAW_TRIG") + @ApiModelProperty(value = "高速-波形采样-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String rawTrig; + /** + * 高速-波形采样-触发周期 + */ + @TableField("RAW_PERIOD") + @ApiModelProperty(value = "高速-波形采样-触发周期") + private String rawPeriod; + /** + * 高速-波形采样-触发阈值 + */ + @TableField("RAW_VTH") + @ApiModelProperty(value = "高速-波形采样-触发阈值") + private String rawVth; + /** + * 高速-波形采样-采取点数 + */ + @TableField("RAW_SAMPLE") + @ApiModelProperty(value = "高速-波形采样-采取点数") + private String rawSample; + /** + * 高速-波形甑别-E最大值 + */ + @TableField("PSD_E") + @ApiModelProperty(value = "高速-波形甑别-E最大值") + private String psdE; + /** + * 高速-波形甑别-触发方式 + */ + @TableField("PSD_TRIG") + @ApiModelProperty(value = "高速-波形甑别-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String psdTrig; + /** + * 高速-波形甑别-触发周期 + */ + @TableField("PSD_PERIOD") + @ApiModelProperty(value = "高速-波形甑别-触发周期") + private String psdPeriod; + /** + * 高速-波形甑别-触发阈值 + */ + @TableField("PSD_VTH") + @ApiModelProperty(value = "高速-波形甑别-触发阈值") + private String psdVth; + /** + * 高速-波形甑别-门偏移 + */ + @TableField("PSD_OFFSET") + @ApiModelProperty(value = "高速-波形甑别-门偏移") + private String psdOffset; + /** + * 高速-波形甑别-长门 + */ + @TableField("PSD_LONG_GATE") + @ApiModelProperty(value = "高速-波形甑别-长门") + private String psdLongGate; + /** + * 高速-波形甑别-短门 + */ + @TableField("PSD_SHORT_GATE") + @ApiModelProperty(value = "高速-波形甑别-短门") + private String psdShortGate; + /** + * 时间 + */ + @TableField("CREATE_TIME") + @ApiModelProperty(value = "时间") + private String createTime; + /** + * 备注 + */ + @TableField("DESCRIPTION") + @ApiModelProperty(value = "备注") + private String description; + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java new file mode 100644 index 0000000..178a924 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器升降压操作日志 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_log") +@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") +public class DetectorLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "主键") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + private Long detectorId; + /** + * 升压时间 + */ + @ApiModelProperty(value = "升压时间") + @TableField("INCREASE_TIME") + private String increaseTime; + /** + * 降压时间 + */ + @ApiModelProperty(value = "降压时间") + @TableField("DECREASE_TIME") + private String decreaseTime; + /** + * 当前状态 + */ + @ApiModelProperty(value = "当前状态,0:空闲，1:升压，2:降压") + @TableField("STATUS") + private String status; + /** + * 通道号 + */ + @ApiModelProperty(value = "通道号") + @TableField("CHANNEL") + private String channel; + /** + * 时间 + */ + @ApiModelProperty(value = "时间") + @TableField("CREATE_TIME") + private String createTime; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + @TableField("DESCRIPTION") + private String description; + + public DetectorLog() { + } + + public DetectorLog(Long detectorId, String increaseTime, + String decreaseTime, String status, + String channel, String createTime) { + this.detectorId = detectorId; + this.increaseTime = increaseTime; + this.decreaseTime = decreaseTime; + this.status = status; + this.channel = channel; + this.createTime = createTime; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java deleted file mode 100644 index b128e3b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器升降压操作日志 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_log") -@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") -public class Log extends Model { - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "主键") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - private Long detectorId; - /** - * 升压时间 - */ - @ApiModelProperty(value = "升压时间") - @TableField("INCREASE_TIME") - private String increaseTime; - /** - * 降压时间 - */ - @ApiModelProperty(value = "降压时间") - @TableField("DECREASE_TIME") - private String decreaseTime; - /** - * 当前状态 - */ - @ApiModelProperty(value = "当前状态") - @TableField("STATUS") - private String status; - /** - * 通道号 - */ - @ApiModelProperty(value = "通道号") - @TableField("CHANNEL") - private String channel; - /** - * 时间 - */ - @ApiModelProperty(value = "时间") - @TableField("CREATE_TIME") - private String createTime; - /** - * 备注 - */ - @ApiModelProperty(value = "备注") - @TableField("DESCRIPTION") - private String description; -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java deleted file mode 100644 index f5a5336..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.service; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 探测器参数下发记录 服务类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface IConfigService extends IService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java new file mode 100644 index 0000000..69b1688 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.neutron.service; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 探测器参数下发记录 服务类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface IDetectorConfigService extends IService { + + boolean sendConfig(DetectorConfig config); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java new file mode 100644 index 0000000..ede899d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java @@ -0,0 +1,26 @@ +package com.casic.missiles.modular.neutron.service; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 探测器升降压操作日志 服务类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface IDetectorLogService extends IService { + + /** + * + * @param channel 加压通道号 + * @param status 当前状态 + * @return + */ + boolean addLog(Long detectorId,String channel,String status); + + DetectorLog getLastRecord(Long detectorId); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java deleted file mode 100644 index 357beef..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.service; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 探测器升降压操作日志 服务类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ILogService extends IService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java index cf1b357..34d7056 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java @@ -14,12 +14,12 @@ * 中子源设备初始化 * tcp控制指令表依次发送指令 1-16 */ - void deviceInit(); + void deviceInit(Long detectorId); /** * No.2 加压，开始工作 */ - void pressurize(); + void pressurize(Long detectorId); /** * No.3 解析 @@ -30,9 +30,14 @@ /** * No.4 退高压，停止工作 */ - void depress(); + void depress(Long detectorId); - void control(String command); + /** + * + * @param command 指令 + * @param detectorId 探测器id + */ + void control(String command,Long detectorId); List alarmList(Long taskId); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/ConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/ConfigServiceImpl.java deleted file mode 100644 index cbb63a7..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/ConfigServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.neutron.service.impl; - -import com.casic.missiles.modular.neutron.model.Config; -import com.casic.missiles.modular.neutron.dao.ConfigMapper; -import com.casic.missiles.modular.neutron.service.IConfigService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 探测器参数下发记录 服务实现类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Service -public class ConfigServiceImpl extends ServiceImpl implements IConfigService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorConfigServiceImpl.java new file mode 100644 index 0000000..c15e68c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorConfigServiceImpl.java @@ -0,0 +1,49 @@ +package com.casic.missiles.modular.neutron.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.neutron.dao.DetectorConfigMapper; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import com.casic.missiles.netty.InstructCode; +import com.casic.missiles.netty.NettyClient; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + *

+ * 探测器参数下发记录 服务实现类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Service +public class DetectorConfigServiceImpl extends ServiceImpl implements IDetectorConfigService { + + @Resource + private NettyClient nettyClient; + + @Override + public boolean sendConfig(DetectorConfig config) { + + //toDo:发送对应设备 + String[] codeArr = InstructCode.getInitCode(6, Float.valueOf(config.getVol6()), + Integer.valueOf(config.getRawTrig()), Integer.valueOf(config.getRawPeriod()), + Integer.valueOf(config.getRawVth()), Integer.valueOf(config.getPsdTrig()), + Integer.valueOf(config.getPsdPeriod()), Integer.valueOf(config.getPsdVth()), + Integer.valueOf(config.getPsdOffset()), Integer.valueOf(config.getPsdLongGate()), + Integer.valueOf(config.getPsdShortGate())); + + try { + for (int i = 1; i <= codeArr.length / 3; i++) { + nettyClient.send(codeArr[i * 3 - 1]); + Thread.sleep(500); + } + } catch (InterruptedException e) { + e.printStackTrace(); + return false; + } + return true; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorLogServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorLogServiceImpl.java new file mode 100644 index 0000000..bad64cd --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorLogServiceImpl.java @@ -0,0 +1,76 @@ +package com.casic.missiles.modular.neutron.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.dao.DetectorLogMapper; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + *

+ * 探测器升降压操作日志 服务实现类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Service +public class DetectorLogServiceImpl extends ServiceImpl implements IDetectorLogService { + + @Override + public boolean addLog(Long detectorId, String channel, String status) { + + return this.save(new DetectorLog(detectorId, + "start".equals(status) ? DateUtil.formatDateTime(new Date()) : "", + "stop".equals(status) ? DateUtil.formatDateTime(new Date()) : "", + "start".equals(status) ? "1" : "0", + channel, + DateUtil.formatDateTime(new Date()))); + } + + @Override + public DetectorLog getLastRecord(Long detectorId) { + DetectorLog log = new DetectorLog(); + log.setChannel("6"); + log.setStatus("0"); + log.setDetectorId(detectorId); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.isNotNull("INCREASE_TIME"); + queryWrapper.orderByDesc("CREATE_TIME"); + List increaseLogList = this.list(queryWrapper); + String increaseTime = ""; + if (null != increaseLogList && increaseLogList.size() > 0) { + DetectorLog increaseLog = increaseLogList.get(0); + increaseTime = increaseLog.getIncreaseTime(); + log.setIncreaseTime(increaseTime); + } + + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.eq("DETECTOR_ID", detectorId); + queryWrapper1.isNotNull("DECREASE_TIME"); + queryWrapper1.orderByDesc("CREATE_TIME"); + List decreaseLogList = this.list(queryWrapper1); + String decreaseTime = ""; + if (null != decreaseLogList && decreaseLogList.size() > 0) { + DetectorLog decreaseLog = decreaseLogList.get(0); + decreaseTime = decreaseLog.getDecreaseTime(); + log.setDecreaseTime(decreaseTime); + } + if (ObjectUtil.isAllNotEmpty(increaseTime, decreaseTime)) { + log.setStatus(DateUtil.parseDateTime(increaseTime).isAfter(DateUtil.parseDateTime(decreaseTime)) ? + "1" : "2"); + } else if (ObjectUtil.isNotEmpty(increaseTime)) { + log.setStatus("1"); + } else { + log.setStatus("2"); + } + return log; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/LogServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/LogServiceImpl.java deleted file mode 100644 index 8abe7c4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/LogServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.neutron.service.impl; - -import com.casic.missiles.modular.neutron.model.Log; -import com.casic.missiles.modular.neutron.dao.LogMapper; -import com.casic.missiles.modular.neutron.service.ILogService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 探测器升降压操作日志 服务实现类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Service -public class LogServiceImpl extends ServiceImpl implements ILogService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/NeutronOptServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/NeutronOptServiceImpl.java index cc17fc7..7a12a35 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/NeutronOptServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/NeutronOptServiceImpl.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.neutron.dto.PsdAlarmDTO; import com.casic.missiles.modular.neutron.model.Psd; import com.casic.missiles.modular.neutron.model.Vol; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; import com.casic.missiles.modular.neutron.service.INeutronOptService; import com.casic.missiles.modular.neutron.service.IPsdService; import com.casic.missiles.modular.neutron.service.IVolService; @@ -19,7 +20,7 @@ @Slf4j @Service -public class NeutronOptServiceImpl implements INeutronOptService { +public class NeutronOptServiceImpl implements INeutronOptService { @Resource private NettyClient nettyClient; @@ -27,22 +28,27 @@ private IPsdService iPsdService; @Resource private IVolService iVolService; + @Resource + private IDetectorLogService iLogService; @Override - public void deviceInit() { - for (int i = 1; i <= InstructCode.InitCodeArr.length / 3; i++) { - try { + public void deviceInit(Long detectorId) { + + try { + for (int i = 1; i <= InstructCode.InitCodeArr.length / 3; i++) { nettyClient.send(InstructCode.InitCodeArr[i * 3 - 1]); Thread.sleep(500); - } catch (InterruptedException e) { - e.printStackTrace(); } + } catch (InterruptedException e) { + e.printStackTrace(); } } @Override - public void pressurize() { - nettyClient.send(InstructCode.DAC_UP); + public void pressurize(Long detectorId) { + if (nettyClient.send(InstructCode.DAC_UP)) { + iLogService.addLog(detectorId, "6", "start"); + } } @@ -56,8 +62,8 @@ psd.setIpPort(deviceIpPort.substring(1)); if (ObjectUtil.isAllNotEmpty(psd.getBaseLine(), psd.getLongGate(), psd.getQlong(), psd.getShortGate(), psd.getQshort())) { - Long Qlong = Math.abs(Long.valueOf(psd.getQlong(),16) - Long.parseLong(psd.getBaseLine(), 16) * Long.parseLong(psd.getLongGate(), 16)); - Long Qshort = Math.abs(Long.valueOf(psd.getQshort(),16) - Long.parseLong(psd.getBaseLine(), 16) * Long.parseLong(psd.getShortGate(), 16)); + Long Qlong = Math.abs(Long.valueOf(psd.getQlong(), 16) - Long.parseLong(psd.getBaseLine(), 16) * Long.parseLong(psd.getLongGate(), 16)); + Long Qshort = Math.abs(Long.valueOf(psd.getQshort(), 16) - Long.parseLong(psd.getBaseLine(), 16) * Long.parseLong(psd.getShortGate(), 16)); Double psdRate = (Qlong - Qshort) * 1.000 / Qlong; psd.setPsd(String.format("%.2f", psdRate)); } @@ -73,21 +79,23 @@ } @Override - public void depress() { - nettyClient.send(InstructCode.DAC_DOWN); + public void depress(Long detectorId) { + if (nettyClient.send(InstructCode.DAC_DOWN)) { + iLogService.addLog(detectorId, "6", "stop"); + } } @Override - public void control(String command) { + public void control(String command, Long detectorId) { switch (command) { case "init": - this.deviceInit(); + this.deviceInit(detectorId); break; case "start": - this.pressurize(); + this.pressurize(detectorId); break; case "stop": - this.depress(); + this.depress(detectorId); break; case "off": default: @@ -98,7 +106,7 @@ @Override public List alarmList(Long taskId) { - return iPsdService.getPsdAlarm(taskId); + return iPsdService.getPsdAlarm(taskId); } } diff --git a/casic-server/src/main/java/com/casic/missiles/netty/InstructCode.java b/casic-server/src/main/java/com/casic/missiles/netty/InstructCode.java index 7755979..4c4d896 100644 --- a/casic-server/src/main/java/com/casic/missiles/netty/InstructCode.java +++ b/casic-server/src/main/java/com/casic/missiles/netty/InstructCode.java @@ -6,6 +6,7 @@ public class InstructCode { /** + * 默认参数 * 设备初始化时需要依次发送1~16号指令 */ public static String[] InitCodeArr = { @@ -27,6 +28,34 @@ "16", "取消逻辑复位", "cmd set_logic_rst 0 0\n" }; + //灵活配置参数 + public static String[] getInitCode(int channelNum, float vol, + int rawTrig, int rawPeriod, + int rowVth,int psdTrig, + int psdPeriod, int psdVth, + int psdOffset, int psdLongGate, + int psdShortGate) { + String[] initCodeArr = { + "1", "设置高压", "set set_voltage " + channelNum + " " + vol + "\n", + "2", "复位adc", "cmd set_adc_delay_rst 1 0\n", + "3", "逻辑复位", "cmd set_logic_rst 1 0\n", + "4", "设置波形采样触发方式为下降沿", "cmd set_raw_trig_sel_adc2 " + rawTrig + " 0\n", + "5", "设置波形采样触发周期", "cmd set_raw_trig_period_adc2 " + rawPeriod + " 0\n", + "6", "设置波形采样触发阈值", "cmd set_raw_trig_vth_adc2 " + (rowVth + 750) * 4096 / 1500 + " 0\n", + "7", "设置波形采样点数", "cmd set_raw_sample_len_adc2 2000 0\n", + "8", "设置波形甄别触发方式", "cmd set_psd_trig_sel " + psdTrig + " 0\n", + "9", "设置波形甄别触发周期", "cmd set_psd_trig_period " + psdPeriod + " 0\n", + "10", "设置波形甄别触发阈值", "cmd set_psd_trig_vth " + (psdVth + 750) * 4096 / 1500 + " 0\n", + "11", "设置波形甄别门偏移", "cmd set_psd_gate_offset " + psdOffset / 8 + " 0\n", + "12", "设置波形甄别延迟", "cmd set_adc2_delay_num 20 0\n", + "13", "设置波形甄别长门", "cmd set_psd_long_gate " + psdLongGate / 2 + " 0\n", + "14", "设置波形甄别短门", "cmd set_psd_short_gate " + psdShortGate / 2 + " 0\n", + "15", "取消复位adc", "cmd set_adc_delay_rst 0 0\n", + "16", "取消逻辑复位", "cmd set_logic_rst 0 0\n" + }; + return initCodeArr; + } + /** * 加高压指令 */ @@ -70,7 +99,7 @@ //前16为电压值 if (j < 16) volArr[j] = ByteUtil.reverseHex(msg.substring(j * 8, (j + 1) * 8)); - //后8为高低位值 + //后8为高低位值 else volArr[j] = ByteUtil.reverseHex(msg.substring(128 + (j - 16) * 2, 128 + (j - 15) * 2)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java deleted file mode 100644 index 8ead6a6..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/ConfigController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.IConfigService; -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; - -/** - * 下发参数日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:06 - */ -@Controller -@RequestMapping("/config") -public class ConfigController extends BaseController { - - -// @Autowired -// private IConfigService configService; -// -// -// /** -// * 获取下发参数日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return configService.selectList(null); -// } -// -// /** -// * 获取下发参数日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增下发参数日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Config config) { -// configService.insert(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除下发参数日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String configId) { -// configService.deleteById(configId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("configIds") List configIds) { -// configService.deleteBatchIds(configIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改下发参数日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Config config) { -// configService.updateById(config); -// return SUCCESS_TIP; -// } -// -// /** -// * 下发参数日志详情 -// */ -// @RequestMapping(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 new file mode 100644 index 0000000..e602471 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorConfigController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 下发参数日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:06 + */ +@Controller +@RequestMapping("/config") +public class DetectorConfigController extends BaseController { + + + @Autowired + private IDetectorConfigService configService; + + + /** + * 获取下发参数日志列表 + */ + @ApiOperation("根据探测仪id获取下发参数列表") + @RequestMapping(value = "/list") + @ResponseBody + public ResponseDataDTO list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(configService.list(queryWrapper)); + } + +// /** +// * 获取下发参数日志分页列表 +// */ +// @RequestMapping(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("保存参数") + @RequestMapping(value = "/addConfig") + @ResponseBody + public ResponseDataDTO add(DetectorConfig config) { + return ResponseDataDTO.success(configService.save(config)); + } + + /** + * 下发参数 + */ + @ApiOperation("下发参数") + @RequestMapping(value = "/sendConfig") + @ResponseBody + public ResponseDataDTO sendConfig(DetectorConfig config) { + return ResponseDataDTO.success(configService.sendConfig(config)); + } +// +// /** +// * 删除下发参数日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String configId) { +// configService.deleteById(configId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("configIds") List configIds) { +// configService.deleteBatchIds(configIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改下发参数日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Config config) { +// configService.updateById(config); +// return SUCCESS_TIP; +// } +// +// /** +// * 下发参数日志详情 +// */ +// @RequestMapping(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 new file mode 100644 index 0000000..cf82b80 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/DetectorLogController.java @@ -0,0 +1,116 @@ +package com.casic.missiles.modular.neutron.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 升降压操作日志控制器 + * + * @author dev + * @Date 2023-11-15 09:48:31 + */ +@Controller +@RequestMapping("/log") +public class DetectorLogController extends BaseController { + + + @Autowired + private IDetectorLogService logService; + + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压操作列表") + public Object list(Long detectorId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.orderByDesc("CREATE_TIME"); + return ResponseDataDTO.success(logService.list(queryWrapper)); + } + + /** + * 获取升降压操作日志列表 + */ + @RequestMapping(value = "/getLastRecord") + @ResponseBody + @ApiOperation("根据探测仪id获取升降压最新记录") + public Object getLastRecord(Long detectorId) { + return ResponseDataDTO.success(logService.getLastRecord(detectorId)); + } +// +// /** +// * 获取升降压操作日志分页列表 +// */ +// @RequestMapping(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); +// } + +// /** +// * 新增升降压操作日志 +// */ +// @RequestMapping(value = "/add") +// @ResponseBody +// public Object add(Log log) { +// logService.insert(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 删除升降压操作日志 +// */ +// @RequestMapping(value = "/delete") +// @ResponseBody +// public Object delete(@RequestParam String logId) { +// logService.deleteById(logId); +// return SUCCESS_TIP; +// } +// +// /** +// * 批量删除 +// */ +// @RequestMapping(value = "/batchDelete") +// @ResponseBody +// public Object delete(@RequestParam("logIds") List logIds) { +// logService.deleteBatchIds(logIds); +// return SUCCESS_TIP; +// } +// +// /** +// * 修改升降压操作日志 +// */ +// @RequestMapping(value = "/update") +// @ResponseBody +// public Object update(Log log) { +// logService.updateById(log); +// return SUCCESS_TIP; +// } +// +// /** +// * 升降压操作日志详情 +// */ +// @RequestMapping(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/LogController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java deleted file mode 100644 index cbf66a5..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/LogController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.neutron.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.modular.neutron.service.ILogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * 升降压操作日志控制器 - * - * @author dev - * @Date 2023-11-15 09:48:31 - */ -@Controller -@RequestMapping("/log") -public class LogController extends BaseController { - - - @Autowired - private ILogService logService; - -// -// /** -// * 获取升降压操作日志列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return logService.selectList(null); -// } -// -// /** -// * 获取升降压操作日志分页列表 -// */ -// @RequestMapping(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); -// } -// /** -// * 新增升降压操作日志 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(Log log) { -// logService.insert(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除升降压操作日志 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String logId) { -// logService.deleteById(logId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("logIds") List logIds) { -// logService.deleteBatchIds(logIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改升降压操作日志 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(Log log) { -// logService.updateById(log); -// return SUCCESS_TIP; -// } -// -// /** -// * 升降压操作日志详情 -// */ -// @RequestMapping(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 f08576b..afaa5a8 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 @@ -31,9 +31,9 @@ @ApiOperation("控制指令类型（start-加压开始工作，stop-退高压，停止工作") @RequestMapping("/control") @ResponseBody - public ResponseDataDTO control(String command) { + public ResponseDataDTO control(String command,Long detectorId) { //toDo:需要加返回值 - neutronOptService.control(command); + neutronOptService.control(command,detectorId); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java deleted file mode 100644 index fc5fe1b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/ConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器参数下发记录 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ConfigMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java new file mode 100644 index 0000000..d20ef1a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorConfigMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器参数下发记录 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorConfigMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java new file mode 100644 index 0000000..5c4b005 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/DetectorLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.neutron.dao; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 探测器升降压操作日志 Mapper 接口 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface DetectorLogMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java deleted file mode 100644 index d3aedd4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/LogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.dao; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 探测器升降压操作日志 Mapper 接口 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface LogMapper extends BaseMapper { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml deleted file mode 100644 index 5a02cdb..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/ConfigMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml new file mode 100644 index 0000000..806dcd8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorConfigMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, VOL_6 AS vol6, RAW_TRIG AS rawTrig, RAW_PERIOD AS rawPeriod, RAW_VTH AS rawVth, RAW_SAMPLE AS rawSample, PSD_E AS psdE, PSD_TRIG AS psdTrig, PSD_PERIOD AS psdPeriod, PSD_VTH AS psdVth, PSD_OFFSET AS psdOffset, PSD_LONG_GATE AS psdLongGate, PSD_SHORT_GATE AS psdShortGate, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml new file mode 100644 index 0000000..707991d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/DetectorLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml deleted file mode 100644 index 6d3190f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dao/mapping/LogMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - ID AS id, DETECTOR_ID AS detectorId, INCREASE_TIME AS increaseTime, DECREASE_TIME AS decreaseTime, STATUS AS status, CHANNEL AS channel, CREATE_TIME AS createTime, DESCRIPTION AS description - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java deleted file mode 100644 index 720460d..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Config.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器参数下发记录 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_config") -@ApiModel(value = "配置信息对象", description = "配置信息记录表") -public class Config extends Model { - - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "降压时间") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - - private Long detectorId; - /** - * 高压参数 - */ - @ApiModelProperty(value = "高压参数") - @TableField("VOL_6") - private String vol6; - /** - * 高速-波形采样-触发方式 - */ - @TableField("RAW_TRIG") - @ApiModelProperty(value = "高速-波形采样-触发方式") - private String rawTrig; - /** - * 高速-波形采样-触发周期 - */ - @TableField("RAW_PERIOD") - @ApiModelProperty(value = "高速-波形采样-触发周期") - private String rawPeriod; - /** - * 高速-波形采样-触发阈值 - */ - @TableField("RAW_VTH") - @ApiModelProperty(value = "高速-波形采样-触发阈值") - private String rawVth; - /** - * 高速-波形采样-采取点数 - */ - @TableField("RAW_SAMPLE") - @ApiModelProperty(value = "高速-波形采样-采取点数") - private String rawSample; - /** - * 高速-波形甑别-E最大值 - */ - @TableField("PSD_E") - @ApiModelProperty(value = "高速-波形甑别-E最大值") - private String psdE; - /** - * 高速-波形甑别-触发方式 - */ - @TableField("PSD_TRIG") - @ApiModelProperty(value = "高速-波形甑别-触发方式") - private String psdTrig; - /** - * 高速-波形甑别-触发周期 - */ - @TableField("PSD_PERIOD") - @ApiModelProperty(value = " 高速-波形甑别-触发周期") - private String psdPeriod; - /** - * 高速-波形甑别-触发阈值 - */ - @TableField("PSD_VTH") - @ApiModelProperty(value = "高速-波形甑别-触发阈值") - private String psdVth; - /** - * 高速-波形甑别-门偏移 - */ - @TableField("PSD_OFFSET") - @ApiModelProperty(value = "高速-波形甑别-门偏移") - private String psdOffset; - /** - * 高速-波形甑别-长门 - */ - @TableField("PSD_LONG_GATE") - @ApiModelProperty(value = "高速-波形甑别-长门") - private String psdLongGate; - /** - * 高速-波形甑别-短门 - */ - @TableField("PSD_SHORT_GATE") - @ApiModelProperty(value = "高速-波形甑别-短门") - private String psdShortGate; - /** - * 时间 - */ - @TableField("CREATE_TIME") - @ApiModelProperty(value = "时间") - private String createTime; - /** - * 备注 - */ - @TableField("DESCRIPTION") - @ApiModelProperty(value = "备注") - private String description; - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java new file mode 100644 index 0000000..b6e4611 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java @@ -0,0 +1,131 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器参数下发记录 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_config") +@ApiModel(value = "配置信息对象", description = "配置信息记录表") +public class DetectorConfig extends Model { + + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "降压时间") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + + private Long detectorId; + /** + * 高压参数 + */ + @ApiModelProperty(value = "高压参数,一般设置1.2V") + @TableField("VOL_6") + private String vol6; + /** + * 高速-波形采样-触发方式 + */ + @TableField("RAW_TRIG") + @ApiModelProperty(value = "高速-波形采样-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String rawTrig; + /** + * 高速-波形采样-触发周期 + */ + @TableField("RAW_PERIOD") + @ApiModelProperty(value = "高速-波形采样-触发周期") + private String rawPeriod; + /** + * 高速-波形采样-触发阈值 + */ + @TableField("RAW_VTH") + @ApiModelProperty(value = "高速-波形采样-触发阈值") + private String rawVth; + /** + * 高速-波形采样-采取点数 + */ + @TableField("RAW_SAMPLE") + @ApiModelProperty(value = "高速-波形采样-采取点数") + private String rawSample; + /** + * 高速-波形甑别-E最大值 + */ + @TableField("PSD_E") + @ApiModelProperty(value = "高速-波形甑别-E最大值") + private String psdE; + /** + * 高速-波形甑别-触发方式 + */ + @TableField("PSD_TRIG") + @ApiModelProperty(value = "高速-波形甑别-触发方式,0|无触发\n" + + "1|周期触发\n" + + "2|上升沿触发\n" + + "3|下降沿触发\n") + private String psdTrig; + /** + * 高速-波形甑别-触发周期 + */ + @TableField("PSD_PERIOD") + @ApiModelProperty(value = "高速-波形甑别-触发周期") + private String psdPeriod; + /** + * 高速-波形甑别-触发阈值 + */ + @TableField("PSD_VTH") + @ApiModelProperty(value = "高速-波形甑别-触发阈值") + private String psdVth; + /** + * 高速-波形甑别-门偏移 + */ + @TableField("PSD_OFFSET") + @ApiModelProperty(value = "高速-波形甑别-门偏移") + private String psdOffset; + /** + * 高速-波形甑别-长门 + */ + @TableField("PSD_LONG_GATE") + @ApiModelProperty(value = "高速-波形甑别-长门") + private String psdLongGate; + /** + * 高速-波形甑别-短门 + */ + @TableField("PSD_SHORT_GATE") + @ApiModelProperty(value = "高速-波形甑别-短门") + private String psdShortGate; + /** + * 时间 + */ + @TableField("CREATE_TIME") + @ApiModelProperty(value = "时间") + private String createTime; + /** + * 备注 + */ + @TableField("DESCRIPTION") + @ApiModelProperty(value = "备注") + private String description; + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java new file mode 100644 index 0000000..178a924 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorLog.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.neutron.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 探测器升降压操作日志 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Data +@TableName("detector_log") +@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") +public class DetectorLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "主键") + @TableId("ID") + private Long id; + /** + * 探测器id + */ + @ApiModelProperty(value = "探测器id") + @TableField("DETECTOR_ID") + private Long detectorId; + /** + * 升压时间 + */ + @ApiModelProperty(value = "升压时间") + @TableField("INCREASE_TIME") + private String increaseTime; + /** + * 降压时间 + */ + @ApiModelProperty(value = "降压时间") + @TableField("DECREASE_TIME") + private String decreaseTime; + /** + * 当前状态 + */ + @ApiModelProperty(value = "当前状态,0:空闲，1:升压，2:降压") + @TableField("STATUS") + private String status; + /** + * 通道号 + */ + @ApiModelProperty(value = "通道号") + @TableField("CHANNEL") + private String channel; + /** + * 时间 + */ + @ApiModelProperty(value = "时间") + @TableField("CREATE_TIME") + private String createTime; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + @TableField("DESCRIPTION") + private String description; + + public DetectorLog() { + } + + public DetectorLog(Long detectorId, String increaseTime, + String decreaseTime, String status, + String channel, String createTime) { + this.detectorId = detectorId; + this.increaseTime = increaseTime; + this.decreaseTime = decreaseTime; + this.status = status; + this.channel = channel; + this.createTime = createTime; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java deleted file mode 100644 index b128e3b..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/model/Log.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.casic.missiles.modular.neutron.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 探测器升降压操作日志 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Data -@TableName("detector_log") -@ApiModel(value = "探测器升降压操作日志", description = "探测器升降压操作日志") -public class Log extends Model { - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ApiModelProperty(value = "主键") - @TableId("ID") - private Long id; - /** - * 探测器id - */ - @ApiModelProperty(value = "探测器id") - @TableField("DETECTOR_ID") - private Long detectorId; - /** - * 升压时间 - */ - @ApiModelProperty(value = "升压时间") - @TableField("INCREASE_TIME") - private String increaseTime; - /** - * 降压时间 - */ - @ApiModelProperty(value = "降压时间") - @TableField("DECREASE_TIME") - private String decreaseTime; - /** - * 当前状态 - */ - @ApiModelProperty(value = "当前状态") - @TableField("STATUS") - private String status; - /** - * 通道号 - */ - @ApiModelProperty(value = "通道号") - @TableField("CHANNEL") - private String channel; - /** - * 时间 - */ - @ApiModelProperty(value = "时间") - @TableField("CREATE_TIME") - private String createTime; - /** - * 备注 - */ - @ApiModelProperty(value = "备注") - @TableField("DESCRIPTION") - private String description; -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java deleted file mode 100644 index f5a5336..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IConfigService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.service; - -import com.casic.missiles.modular.neutron.model.Config; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 探测器参数下发记录 服务类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface IConfigService extends IService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java new file mode 100644 index 0000000..69b1688 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorConfigService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.neutron.service; + +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 探测器参数下发记录 服务类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface IDetectorConfigService extends IService { + + boolean sendConfig(DetectorConfig config); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java new file mode 100644 index 0000000..ede899d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IDetectorLogService.java @@ -0,0 +1,26 @@ +package com.casic.missiles.modular.neutron.service; + +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 探测器升降压操作日志 服务类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +public interface IDetectorLogService extends IService { + + /** + * + * @param channel 加压通道号 + * @param status 当前状态 + * @return + */ + boolean addLog(Long detectorId,String channel,String status); + + DetectorLog getLastRecord(Long detectorId); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java deleted file mode 100644 index 357beef..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/ILogService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.neutron.service; - -import com.casic.missiles.modular.neutron.model.Log; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 探测器升降压操作日志 服务类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -public interface ILogService extends IService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java index cf1b357..34d7056 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/INeutronOptService.java @@ -14,12 +14,12 @@ * 中子源设备初始化 * tcp控制指令表依次发送指令 1-16 */ - void deviceInit(); + void deviceInit(Long detectorId); /** * No.2 加压，开始工作 */ - void pressurize(); + void pressurize(Long detectorId); /** * No.3 解析 @@ -30,9 +30,14 @@ /** * No.4 退高压，停止工作 */ - void depress(); + void depress(Long detectorId); - void control(String command); + /** + * + * @param command 指令 + * @param detectorId 探测器id + */ + void control(String command,Long detectorId); List alarmList(Long taskId); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/ConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/ConfigServiceImpl.java deleted file mode 100644 index cbb63a7..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/ConfigServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.neutron.service.impl; - -import com.casic.missiles.modular.neutron.model.Config; -import com.casic.missiles.modular.neutron.dao.ConfigMapper; -import com.casic.missiles.modular.neutron.service.IConfigService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 探测器参数下发记录 服务实现类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Service -public class ConfigServiceImpl extends ServiceImpl implements IConfigService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorConfigServiceImpl.java new file mode 100644 index 0000000..c15e68c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorConfigServiceImpl.java @@ -0,0 +1,49 @@ +package com.casic.missiles.modular.neutron.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.neutron.dao.DetectorConfigMapper; +import com.casic.missiles.modular.neutron.model.DetectorConfig; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; +import com.casic.missiles.netty.InstructCode; +import com.casic.missiles.netty.NettyClient; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + *

+ * 探测器参数下发记录 服务实现类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Service +public class DetectorConfigServiceImpl extends ServiceImpl implements IDetectorConfigService { + + @Resource + private NettyClient nettyClient; + + @Override + public boolean sendConfig(DetectorConfig config) { + + //toDo:发送对应设备 + String[] codeArr = InstructCode.getInitCode(6, Float.valueOf(config.getVol6()), + Integer.valueOf(config.getRawTrig()), Integer.valueOf(config.getRawPeriod()), + Integer.valueOf(config.getRawVth()), Integer.valueOf(config.getPsdTrig()), + Integer.valueOf(config.getPsdPeriod()), Integer.valueOf(config.getPsdVth()), + Integer.valueOf(config.getPsdOffset()), Integer.valueOf(config.getPsdLongGate()), + Integer.valueOf(config.getPsdShortGate())); + + try { + for (int i = 1; i <= codeArr.length / 3; i++) { + nettyClient.send(codeArr[i * 3 - 1]); + Thread.sleep(500); + } + } catch (InterruptedException e) { + e.printStackTrace(); + return false; + } + return true; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorLogServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorLogServiceImpl.java new file mode 100644 index 0000000..bad64cd --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/DetectorLogServiceImpl.java @@ -0,0 +1,76 @@ +package com.casic.missiles.modular.neutron.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.modular.neutron.model.DetectorLog; +import com.casic.missiles.modular.neutron.dao.DetectorLogMapper; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + *

+ * 探测器升降压操作日志 服务实现类 + *

+ * + * @author casic203123 + * @since 2023-11-15 + */ +@Service +public class DetectorLogServiceImpl extends ServiceImpl implements IDetectorLogService { + + @Override + public boolean addLog(Long detectorId, String channel, String status) { + + return this.save(new DetectorLog(detectorId, + "start".equals(status) ? DateUtil.formatDateTime(new Date()) : "", + "stop".equals(status) ? DateUtil.formatDateTime(new Date()) : "", + "start".equals(status) ? "1" : "0", + channel, + DateUtil.formatDateTime(new Date()))); + } + + @Override + public DetectorLog getLastRecord(Long detectorId) { + DetectorLog log = new DetectorLog(); + log.setChannel("6"); + log.setStatus("0"); + log.setDetectorId(detectorId); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DETECTOR_ID", detectorId); + queryWrapper.isNotNull("INCREASE_TIME"); + queryWrapper.orderByDesc("CREATE_TIME"); + List increaseLogList = this.list(queryWrapper); + String increaseTime = ""; + if (null != increaseLogList && increaseLogList.size() > 0) { + DetectorLog increaseLog = increaseLogList.get(0); + increaseTime = increaseLog.getIncreaseTime(); + log.setIncreaseTime(increaseTime); + } + + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.eq("DETECTOR_ID", detectorId); + queryWrapper1.isNotNull("DECREASE_TIME"); + queryWrapper1.orderByDesc("CREATE_TIME"); + List decreaseLogList = this.list(queryWrapper1); + String decreaseTime = ""; + if (null != decreaseLogList && decreaseLogList.size() > 0) { + DetectorLog decreaseLog = decreaseLogList.get(0); + decreaseTime = decreaseLog.getDecreaseTime(); + log.setDecreaseTime(decreaseTime); + } + if (ObjectUtil.isAllNotEmpty(increaseTime, decreaseTime)) { + log.setStatus(DateUtil.parseDateTime(increaseTime).isAfter(DateUtil.parseDateTime(decreaseTime)) ? + "1" : "2"); + } else if (ObjectUtil.isNotEmpty(increaseTime)) { + log.setStatus("1"); + } else { + log.setStatus("2"); + } + return log; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/LogServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/LogServiceImpl.java deleted file mode 100644 index 8abe7c4..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/LogServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.neutron.service.impl; - -import com.casic.missiles.modular.neutron.model.Log; -import com.casic.missiles.modular.neutron.dao.LogMapper; -import com.casic.missiles.modular.neutron.service.ILogService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 探测器升降压操作日志 服务实现类 - *

- * - * @author casic203123 - * @since 2023-11-15 - */ -@Service -public class LogServiceImpl extends ServiceImpl implements ILogService { - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/NeutronOptServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/NeutronOptServiceImpl.java index cc17fc7..7a12a35 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/NeutronOptServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/NeutronOptServiceImpl.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.neutron.dto.PsdAlarmDTO; import com.casic.missiles.modular.neutron.model.Psd; import com.casic.missiles.modular.neutron.model.Vol; +import com.casic.missiles.modular.neutron.service.IDetectorLogService; import com.casic.missiles.modular.neutron.service.INeutronOptService; import com.casic.missiles.modular.neutron.service.IPsdService; import com.casic.missiles.modular.neutron.service.IVolService; @@ -19,7 +20,7 @@ @Slf4j @Service -public class NeutronOptServiceImpl implements INeutronOptService { +public class NeutronOptServiceImpl implements INeutronOptService { @Resource private NettyClient nettyClient; @@ -27,22 +28,27 @@ private IPsdService iPsdService; @Resource private IVolService iVolService; + @Resource + private IDetectorLogService iLogService; @Override - public void deviceInit() { - for (int i = 1; i <= InstructCode.InitCodeArr.length / 3; i++) { - try { + public void deviceInit(Long detectorId) { + + try { + for (int i = 1; i <= InstructCode.InitCodeArr.length / 3; i++) { nettyClient.send(InstructCode.InitCodeArr[i * 3 - 1]); Thread.sleep(500); - } catch (InterruptedException e) { - e.printStackTrace(); } + } catch (InterruptedException e) { + e.printStackTrace(); } } @Override - public void pressurize() { - nettyClient.send(InstructCode.DAC_UP); + public void pressurize(Long detectorId) { + if (nettyClient.send(InstructCode.DAC_UP)) { + iLogService.addLog(detectorId, "6", "start"); + } } @@ -56,8 +62,8 @@ psd.setIpPort(deviceIpPort.substring(1)); if (ObjectUtil.isAllNotEmpty(psd.getBaseLine(), psd.getLongGate(), psd.getQlong(), psd.getShortGate(), psd.getQshort())) { - Long Qlong = Math.abs(Long.valueOf(psd.getQlong(),16) - Long.parseLong(psd.getBaseLine(), 16) * Long.parseLong(psd.getLongGate(), 16)); - Long Qshort = Math.abs(Long.valueOf(psd.getQshort(),16) - Long.parseLong(psd.getBaseLine(), 16) * Long.parseLong(psd.getShortGate(), 16)); + Long Qlong = Math.abs(Long.valueOf(psd.getQlong(), 16) - Long.parseLong(psd.getBaseLine(), 16) * Long.parseLong(psd.getLongGate(), 16)); + Long Qshort = Math.abs(Long.valueOf(psd.getQshort(), 16) - Long.parseLong(psd.getBaseLine(), 16) * Long.parseLong(psd.getShortGate(), 16)); Double psdRate = (Qlong - Qshort) * 1.000 / Qlong; psd.setPsd(String.format("%.2f", psdRate)); } @@ -73,21 +79,23 @@ } @Override - public void depress() { - nettyClient.send(InstructCode.DAC_DOWN); + public void depress(Long detectorId) { + if (nettyClient.send(InstructCode.DAC_DOWN)) { + iLogService.addLog(detectorId, "6", "stop"); + } } @Override - public void control(String command) { + public void control(String command, Long detectorId) { switch (command) { case "init": - this.deviceInit(); + this.deviceInit(detectorId); break; case "start": - this.pressurize(); + this.pressurize(detectorId); break; case "stop": - this.depress(); + this.depress(detectorId); break; case "off": default: @@ -98,7 +106,7 @@ @Override public List alarmList(Long taskId) { - return iPsdService.getPsdAlarm(taskId); + return iPsdService.getPsdAlarm(taskId); } } diff --git a/casic-server/src/main/java/com/casic/missiles/netty/InstructCode.java b/casic-server/src/main/java/com/casic/missiles/netty/InstructCode.java index 7755979..4c4d896 100644 --- a/casic-server/src/main/java/com/casic/missiles/netty/InstructCode.java +++ b/casic-server/src/main/java/com/casic/missiles/netty/InstructCode.java @@ -6,6 +6,7 @@ public class InstructCode { /** + * 默认参数 * 设备初始化时需要依次发送1~16号指令 */ public static String[] InitCodeArr = { @@ -27,6 +28,34 @@ "16", "取消逻辑复位", "cmd set_logic_rst 0 0\n" }; + //灵活配置参数 + public static String[] getInitCode(int channelNum, float vol, + int rawTrig, int rawPeriod, + int rowVth,int psdTrig, + int psdPeriod, int psdVth, + int psdOffset, int psdLongGate, + int psdShortGate) { + String[] initCodeArr = { + "1", "设置高压", "set set_voltage " + channelNum + " " + vol + "\n", + "2", "复位adc", "cmd set_adc_delay_rst 1 0\n", + "3", "逻辑复位", "cmd set_logic_rst 1 0\n", + "4", "设置波形采样触发方式为下降沿", "cmd set_raw_trig_sel_adc2 " + rawTrig + " 0\n", + "5", "设置波形采样触发周期", "cmd set_raw_trig_period_adc2 " + rawPeriod + " 0\n", + "6", "设置波形采样触发阈值", "cmd set_raw_trig_vth_adc2 " + (rowVth + 750) * 4096 / 1500 + " 0\n", + "7", "设置波形采样点数", "cmd set_raw_sample_len_adc2 2000 0\n", + "8", "设置波形甄别触发方式", "cmd set_psd_trig_sel " + psdTrig + " 0\n", + "9", "设置波形甄别触发周期", "cmd set_psd_trig_period " + psdPeriod + " 0\n", + "10", "设置波形甄别触发阈值", "cmd set_psd_trig_vth " + (psdVth + 750) * 4096 / 1500 + " 0\n", + "11", "设置波形甄别门偏移", "cmd set_psd_gate_offset " + psdOffset / 8 + " 0\n", + "12", "设置波形甄别延迟", "cmd set_adc2_delay_num 20 0\n", + "13", "设置波形甄别长门", "cmd set_psd_long_gate " + psdLongGate / 2 + " 0\n", + "14", "设置波形甄别短门", "cmd set_psd_short_gate " + psdShortGate / 2 + " 0\n", + "15", "取消复位adc", "cmd set_adc_delay_rst 0 0\n", + "16", "取消逻辑复位", "cmd set_logic_rst 0 0\n" + }; + return initCodeArr; + } + /** * 加高压指令 */ @@ -70,7 +99,7 @@ //前16为电压值 if (j < 16) volArr[j] = ByteUtil.reverseHex(msg.substring(j * 8, (j + 1) * 8)); - //后8为高低位值 + //后8为高低位值 else volArr[j] = ByteUtil.reverseHex(msg.substring(128 + (j - 16) * 2, 128 + (j - 15) * 2)); } diff --git a/casic-server/src/main/java/com/casic/missiles/netty/NettyClient.java b/casic-server/src/main/java/com/casic/missiles/netty/NettyClient.java index 4e612df..db0bc0a 100644 --- a/casic-server/src/main/java/com/casic/missiles/netty/NettyClient.java +++ b/casic-server/src/main/java/com/casic/missiles/netty/NettyClient.java @@ -68,15 +68,17 @@ * * @param data 文本数据 */ - public void send(String data) { + public boolean send(String data) { try { if (mChannel.get() == null) { mChannel.set(mChannelFuture.channel()); } mChannel.get().writeAndFlush(Unpooled.copiedBuffer(data.getBytes(StandardCharsets.UTF_8))); + return true; } catch (Exception e) { log.error(this.getClass().getName().concat(".send has error"), e); } + return false; } // 客户端启动，并连上服务器端