From 7a6561913e03b3691887d49e185877c04cc615e7 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Sat, 27 Jan 2024 11:06:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=94=A8=E6=88=B7=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=BB=AA=E5=99=A8=E5=90=8E=EF=BC=8C=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5=E5=BA=8F=E5=88=97=E5=8F=B7?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E4=BB=AA=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../miniProgram/controller/WxInstrumentController.java       | 4 +++-
 .../flossom/miniProgram/service/IWxInstrumentService.java    | 2 ++
 .../miniProgram/service/impl/WxInstrumentServiceImpl.java    | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

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<WxInstrumentFileRelate> getInstrumentFileRelateByInstrumentId(Long instrumentId, Integer classify);
 
     List<WxInstrumentMode> 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) {