diff --git a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java index f41905e..742f985 100644 --- a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java +++ b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java @@ -241,11 +241,13 @@ public class PatrolPresetPosController extends BaseController { @GetMapping({"issueUpdate"}) public AjaxResult issueUpdate(PresetAccessModel presetAccessModel) throws Exception { + logger.info("-----------------issueUpdate presetAccessModel,{}", presetAccessModel); PatrolPresetPos patrolPresetPos = new PatrolPresetPos(); patrolPresetPos.setPatrolDeviceCode(presetAccessModel.getSerial()); patrolPresetPos.setPresetPosCode(presetAccessModel.getPreset()); patrolPresetPos.setChannelCode(presetAccessModel.getCode()); presetAccessModel.setCommand(PresetControlEnum.UPDATE); + logger.info("-----------------issueUpdate presetAccessModel {}", JSONObject.toJSONString(presetAccessModel)); this.controlPreset(presetAccessModel); this.addPresetRecord(presetAccessModel); return AjaxResult.success(); @@ -442,6 +444,11 @@ public class PatrolPresetPosController extends BaseController { ) @PostMapping public AjaxResult add(@RequestBody PatrolPresetPos patrolPresetPos) throws Exception { + if (StringUtils.isEmpty(patrolPresetPos.getPresetPosCode())) { + patrolPresetPos.setPresetPosCode("1"); + patrolPresetPos.setPresetPosName("虚拟守望预置位"); + } + logger.info("[PRESET] patrolPresetPos PresetPosCode: {},PresetPosName: {}", patrolPresetPos.getPresetPosCode(), patrolPresetPos.getPresetPosName()); logger.info("[PRESET] patrolPresetPos eqpBookId: {}, body: {}", patrolPresetPos.getEqpBookId(), patrolPresetPos); AjaxResult ajaxResult = this.basedataEqpbookService.queryById(patrolPresetPos.getEqpBookId()); JSONObject eqpBook = JSONObject.parseObject(JSONObject.toJSONString(ajaxResult)).getJSONObject("data"); @@ -495,7 +502,7 @@ public class PatrolPresetPosController extends BaseController { if (presetPosList.isEmpty()) { if (StringUtils.isEmpty(patrolPresetPos.getPresetPosCode())) { logger.info("[PRESET] 预置位编码不能为空!: {}", patrolPresetPos.getPresetPosCode()); - throw new ServiceException("预置位编码不能为空!"); +// throw new ServiceException("预置位编码不能为空!"); } else { logger.info(Color.GREEN + "[PRESET] INSERT patrolPresetPos: {}" + Color.END, patrolPresetPos); int insertResId = patrolPresetPosService.insertPatrolPresetPos(patrolPresetPos); diff --git a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/model/PresetAccessModel.java b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/model/PresetAccessModel.java index 8db1649..628f946 100644 --- a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/model/PresetAccessModel.java +++ b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/model/PresetAccessModel.java @@ -78,4 +78,18 @@ public class PresetAccessModel implements Serializable { public void setCommand(PresetControlEnum command) { this.command = command; } + + @Override + public String toString() { + return "PresetAccessModel{" + + "patrolDeviceCode='" + patrolDeviceCode + '\'' + + ", channelCode='" + channelCode + '\'' + + ", code='" + code + '\'' + + ", presetCode='" + presetCode + '\'' + + ", command=" + command + + ", preset='" + preset + '\'' + + ", serial='" + serial + '\'' + + ", name='" + name + '\'' + + '}'; + } }