小程序-获取仪器列表

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentMapper.java

@@ -62,5 +62,10 @@ public interface WxInstrumentMapper {
      */
     public int deleteWxInstrumentByIds(Long id);
 
-
+    /**
+     * 根据 UserId 获取仪器列表
+     * @param userId
+     * @return
+     */
+    List<WxInstrument> selectInstrumentListByUserId(Long userId);
 }

flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml

@@ -114,7 +114,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectWxInstrumentVo"/>
         where id = #{id}
     </select>
-        
+
+    <select id="selectInstrumentListByUserId" resultMap="WxInstrumentResult" parameterType="Long">
+        SELECT
+            ins.*
+        FROM
+            wx_user_instrument ui
+            LEFT JOIN wx_instrument ins ON ui.instrument_id = ins.id
+        WHERE
+            ui.user_id = #{userId}
+            AND ui.binding_status = 0
+            AND ui.`STATUS` = 0
+        ORDER BY
+            ins.sort_no DESC,
+            ui.create_time DESC
+    </select>
+
     <insert id="insertWxInstrument" parameterType="WxInstrument" useGeneratedKeys="true" keyProperty="id">
         <selectKey keyProperty="id" resultType="Long" order="AFTER">
             SELECT LAST_INSERT_ID()

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxInstrumentController.java

@@ -1,16 +1,11 @@
 package com.flossom.miniProgram.controller;
 
 import com.flossom.common.core.domain.R;
-import com.flossom.common.core.exception.ServiceException;
-import com.flossom.common.core.utils.StringUtils;
 import com.flossom.common.core.web.controller.BaseController;
-import com.flossom.common.core.web.domain.AjaxResult;
 import com.flossom.miniProgram.service.IWxInstrumentService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 
 /**
@@ -26,6 +21,15 @@ public class WxInstrumentController extends BaseController {
     @Autowired
     private IWxInstrumentService wxInstrumentService;
 
+
+    /**
+     * 获取仪器列表
+     */
+    @GetMapping(value = "/getInstrumentInfoList")
+    public R getInstrumentInfoList() {
+        return R.ok(wxInstrumentService.getInstrumentInfoList());
+    }
+
     /**
      * 根据序列号获取仪器信息
      *

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxInstrumentService.java

@@ -1,7 +1,10 @@
 package com.flossom.miniProgram.service;
 
+import com.flossom.common.core.domain.entity.WxInstrument;
 import com.flossom.common.core.domain.entity.WxInstrumentSerial;
 
+import java.util.List;
+
 /**
  * 仪器列Service接口
  *
@@ -14,4 +17,7 @@ public interface IWxInstrumentService {
     void binding(String serial);
 
     void exchangeBinding(String serial);
+
+    List<WxInstrument> getInstrumentInfoList();
+
 }

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java

@@ -46,6 +46,10 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
     @Autowired
     private WxUserInstrumentLogMapper wxUserInstrumentLogMapper;
 
+    @Override
+    public List<WxInstrument> getInstrumentInfoList() {
+        return wxInstrumentMapper.selectInstrumentListByUserId(SecurityUtils.getLoginUser().getWxUserMember().getId());
+    }
 
     @Override
     public WxInstrumentSerial getInstrumentInfoBySerial(String serial) {