From e7775f19798b8c849fcf7c6a685892ea66450da2 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Tue, 23 Jan 2024 16:43:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F-=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E6=B2=A1=E6=9C=89=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E7=9A=84=E4=BB=AA=E5=99=A8=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/mapper/WxInstrumentMapper.java       |  4 +++-
 .../resources/mapper/WxInstrumentMapper.xml   | 21 ++++++++++++++++++-
 .../controller/WxInstrumentController.java    | 16 ++++++++++----
 .../service/IWxInstrumentService.java         |  4 +++-
 .../service/impl/WxInstrumentServiceImpl.java |  9 ++++++--
 5 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentMapper.java
index 010e956..d95e50f 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentMapper.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentMapper.java
@@ -67,5 +67,7 @@ public interface WxInstrumentMapper {
      * @param userId
      * @return
      */
-    List<WxInstrument> selectInstrumentListByUserId(Long userId);
+    List<WxInstrument> selectBindingInstrumentListByUserId(Long userId);
+
+    List<WxInstrument> selectUnbindingInstrumentListByUserId(Long userId);
 }
diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml
index 0f54d48..a288dfa 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml
@@ -115,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-    <select id="selectInstrumentListByUserId" resultMap="WxInstrumentResult" parameterType="Long">
+    <select id="selectBindingInstrumentListByUserId" resultMap="WxInstrumentResult" parameterType="Long">
         SELECT
             ins.*
         FROM
@@ -130,6 +130,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ui.create_time DESC
     </select>
 
+    <select id="selectUnbindingInstrumentListByUserId" resultMap="WxInstrumentResult" parameterType="Long">
+        SELECT
+            ins.*
+        FROM
+            wx_instrument ins
+        WHERE
+            ins.id NOT IN (
+                SELECT
+                    ui.instrument_id
+                FROM
+                    wx_user_instrument ui
+                WHERE
+                    ui.user_id = #{userId}
+                    AND ui.binding_status = 0
+                    AND ui.`STATUS` = 0
+            )
+        ORDER BY ins.sort_no DESC
+    </select>
+
     <insert id="insertWxInstrument" parameterType="WxInstrument" useGeneratedKeys="true" keyProperty="id">
         <selectKey keyProperty="id" resultType="Long" order="AFTER">
             SELECT LAST_INSERT_ID()
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 86dcb4c..423524c 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
@@ -23,11 +23,19 @@ public class WxInstrumentController extends BaseController {
 
 
     /**
-     * 获取仪器列表
+     * 获取已绑定的仪器列表
      */
-    @GetMapping(value = "/getInstrumentInfoList")
-    public R getInstrumentInfoList() {
-        return R.ok(wxInstrumentService.getInstrumentInfoList());
+    @GetMapping(value = "/bindingInstrumentList")
+    public R bindingInstrumentList() {
+        return R.ok(wxInstrumentService.bindingInstrumentList());
+    }
+
+    /**
+     * 获取未绑定的仪器列表
+     */
+    @GetMapping(value = "/unbindingInstrumentInfoList")
+    public R unbindingInstrumentInfoList() {
+        return R.ok(wxInstrumentService.unbindingInstrumentInfoList());
     }
 
     /**
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 2fd1b11..d99f26d 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
@@ -18,6 +18,8 @@ public interface IWxInstrumentService {
 
     void exchangeBinding(String serial);
 
-    List<WxInstrument> getInstrumentInfoList();
+    List<WxInstrument> bindingInstrumentList();
+
+    List<WxInstrument>  unbindingInstrumentInfoList();
 
 }
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 1ae52e1..c5fa8cf 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
@@ -47,8 +47,13 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
     private WxUserInstrumentLogMapper wxUserInstrumentLogMapper;
 
     @Override
-    public List<WxInstrument> getInstrumentInfoList() {
-        return wxInstrumentMapper.selectInstrumentListByUserId(SecurityUtils.getLoginUser().getWxUserMember().getId());
+    public List<WxInstrument> bindingInstrumentList() {
+        return wxInstrumentMapper.selectBindingInstrumentListByUserId(SecurityUtils.getLoginUser().getWxUserMember().getId());
+    }
+
+    @Override
+    public List<WxInstrument> unbindingInstrumentInfoList() {
+        return wxInstrumentMapper.selectUnbindingInstrumentListByUserId(SecurityUtils.getLoginUser().getWxUserMember().getId());
     }
 
     @Override