diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxInstrumentController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxInstrumentController.java index a101d13..3305223 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxInstrumentController.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxInstrumentController.java @@ -56,6 +56,7 @@ public class WxInstrumentController extends BaseController { */ @PostMapping("/manualCodeBinding") public R manualCodeBinding(@NotNull(message = "请上传序列号图片") @RequestParam(value = "serialImage") MultipartFile file, + @NotBlank(message = "仪器ID不能为空") @RequestParam("instrumentId") Long instrumentId, @NotBlank(message = "请输入序列号") String serial) { String serialImage = ""; if (file != null) { @@ -66,6 +67,7 @@ public class WxInstrumentController extends BaseController { } serialImage = result.getData().getUrl(); } + wxInstrumentService.determineSerialIsSameInstrument(serial, instrumentId); wxInstrumentService.binding(serial, serialImage); return R.ok(); } @@ -76,7 +78,7 @@ public class WxInstrumentController extends BaseController { @GetMapping(value = "/scanCodeBinding") public R scanCodeBinding(@NotBlank(message = "序列号不能为空") @RequestParam("serial") String serial, @NotBlank(message = "仪器ID不能为空") @RequestParam("instrumentId") Long instrumentId) { - return R.ok(wxInstrumentService.scanCodeBinding(serial, instrumentId)); + return R.ok(wxInstrumentService.determineSerialIsSameInstrument(serial, instrumentId)); } /** diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxInstrumentService.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxInstrumentService.java index b463097..c2e7e3b 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxInstrumentService.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxInstrumentService.java @@ -27,4 +27,6 @@ public interface IWxInstrumentService { List getInstrumentFileRelateByInstrumentId(Long instrumentId, Integer classify); List getInstrumentModeByInstrumentId(Long instrumentId); + + WxInstrumentSerial determineSerialIsSameInstrument(String serial, Long instrumentId); } diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java index 907c7ea..12beff7 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java @@ -355,8 +355,11 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { return wxInstrumentModeMapper.selectWxInstrumentModeList(wxInstrumentMode); } + /** + * 判断序列号对应的仪器,与instrumentId是否一致 + */ @Override - public WxInstrumentSerial scanCodeBinding(String serial, Long instrumentId) { + public WxInstrumentSerial determineSerialIsSameInstrument(String serial, Long instrumentId) { /* 1、获取序列号信息 */ WxInstrumentSerial wxInstrumentSerial = getInstrumentInfoBySerial(serial); if (wxInstrumentSerial.getInstrumentId() == instrumentId) {