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 selectInstrumentListByUserId(Long userId); + List selectBindingInstrumentListByUserId(Long userId); + + List 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 ins.* FROM @@ -130,6 +130,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ui.create_time DESC + + 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 getInstrumentInfoList(); + List bindingInstrumentList(); + + List 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 getInstrumentInfoList() { - return wxInstrumentMapper.selectInstrumentListByUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); + public List bindingInstrumentList() { + return wxInstrumentMapper.selectBindingInstrumentListByUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); + } + + @Override + public List unbindingInstrumentInfoList() { + return wxInstrumentMapper.selectUnbindingInstrumentListByUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); } @Override